hosts/desktop1/configuration.nix

@@ -9,9 +9,6 @@
       ../../modules/nix/pipewire.nix
       ../../modules/nix/locales.nix
       ../../modules/nix/nvidia.nix
-      ../../modules/nix/grub.nix
-      ../../modules/nix/nvf.nix
-      ../../modules/nix/nh.nix
     ];
 
   home-manager = {
@@ -26,6 +23,11 @@
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
+  boot.loader.grub.enable = true;
+  boot.loader.grub.efiSupport = true;
+  boot.loader.grub.device = "nodev";
+  boot.loader.efi.canTouchEfiVariables = true;
+
   boot.loader.grub.extraEntries = ''
     menuentry "Archlinux" {
       insmod part_gpt
@@ -158,4 +160,36 @@
   programs.firefox.enable = true;
 
   programs.zsh.enable = true;
+
+  programs.nh = {
+    enable = true;
+    clean.enable = true;
+    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;
+      };
+    };
+  };
 }

modules/nix/grub.nix

@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-{
-  boot.loader.grub.enable = true;
-  boot.loader.grub.efiSupport = true;
-  boot.loader.grub.device = "nodev";
-  boot.loader.efi.canTouchEfiVariables = true;
-}

modules/nix/nh.nix

@@ -1,9 +0,0 @@
-{ config, lib, pkgs, ...}:
-{
-programs.nh = {
-    enable = true;
-    clean.enable = true;
-    clean.extraArgs = "--keep-since 30d --keep 10";
-    flake = "/home/smayzy/nix-config";
-  };
-}

modules/nix/nvf.nix

@@ -1,27 +0,0 @@
-{ 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;
-      };
-    };
-  };
-}