diff --git a/flake.nix b/flake.nix
index 077878c..11206cf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,8 @@
 {
-  inputs.nixpkgs.url = "nixpkgs/nixos-unstable";
-  inputs.impermanence.url = "github:nix-community/impermanence";
+  inputs = {
+    nixpkgs.url = "nixpkgs/nixos-unstable";
+    impermanence.url = "github:nix-community/impermanence";
+  };
 
   outputs =
     {
diff --git a/modules/baseline.nix b/modules/baseline.nix
index a26d4ac..1f41918 100644
--- a/modules/baseline.nix
+++ b/modules/baseline.nix
@@ -50,10 +50,10 @@
 
   nix = {
     nixPath = [ "nixpkgs=flake:nixpkgs" ];
-    extraOptions = ''
-      experimental-features = nix-command flakes
-      keep-build-log = false
-    '';
+    settings = {
+      experimental-features = "nix-command flakes";
+      keep-build-log = false;
+    };
   };
 
   services = {
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index a279ccc..62d30f7 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -54,7 +54,7 @@ with lib;
     '';
 
     fonts.packages = [
-      (pkgs.nerdfonts.override { fonts = [ "DejaVuSansMono" ]; })
+      pkgs.nerd-fonts.dejavu-sans-mono
     ];
 
     environment.systemPackages = with pkgs; [