diff --git a/hosts/desktop1/configuration.nix b/hosts/desktop1/configuration.nix
index cb95a9a..ea9ca5b 100644
--- a/hosts/desktop1/configuration.nix
+++ b/hosts/desktop1/configuration.nix
@@ -9,6 +9,8 @@
       ../../modules/nix/pipewire.nix
       ../../modules/nix/locales.nix
       ../../modules/nix/nvidia.nix
+      ../../modules/nix/grub.nix
+      ../../modules/nix/nvf.nix
     ];
 
   home-manager = {
@@ -162,29 +164,4 @@
     clean.extraArgs = "--keep-since 30d --keep 10";
     flake = "/home/smayzy/nix-config";
   };
-
-  programs.nvf = {
-    enable = true;
-    settings = {
-      vim = {
-        viAlias = false;
-        vimAlias = true;
-        lsp = {
-          enable = true;
-        };
-        languages = {
-          nix.enable = true;
-          clang.enable = true;
-          rust.enable = true;
-        };
-	theme = {
-	  enable = true;
-	  name = lib.mkDefault "dracula";
-	};
-	statusline.lualine.enable = true;
-	telescope.enable = true;
-	autocomplete.nvim-cmp.enable = true;
-      };
-    };
-  };
 }
diff --git a/modules/nix/nvf.nix b/modules/nix/nvf.nix
new file mode 100644
index 0000000..3e20837
--- /dev/null
+++ b/modules/nix/nvf.nix
@@ -0,0 +1,27 @@
+{ config, lib, pkgs, ... }:
+{
+programs.nvf = {
+    enable = true;
+    settings = {
+      vim = {
+        viAlias = false;
+        vimAlias = true;
+        lsp = {
+          enable = true;
+        };
+        languages = {
+          nix.enable = true;
+          clang.enable = true;
+          rust.enable = true;
+        };
+	theme = {
+	 enable = true;
+	 name = lib.mkDefault "dracula";
+	};
+	statusline.lualine.enable = true;
+	telescope.enable = true;
+	autocomplete.nvim-cmp.enable = true;
+      };
+    };
+  };
+}