Handle nixvim as modules+profiles

flake.nix

@@ -120,6 +120,7 @@
           colors = colors.homeManagerModules.colorScheme;
           impermanence = impermanence.nixosModules.home-manager.impermanence;
         };
+      nixvim = self.nixvimModules // {profiles = {...}: {imports = profiles.nixvim;};};
     };
     # All attributes to add to lib in modules
     extraLib = {
@@ -149,6 +150,7 @@
     profiles = {
       nixos = importProfiles ./profiles/nixos;
       hm = importProfiles ./profiles/hm;
+      nixvim = importProfiles ./profiles/nixvim;
     };
 
     pkgImport = system: unfree: pkgs:
@@ -229,6 +231,13 @@
     in
       pathsToImportedAttrs modulesPaths;
 
+    nixvimModules = let
+      modulesDir = ./modules/nixvim;
+      fullPath = name: modulesDir + "/${name}";
+      modulesPaths = map fullPath (attrNames (readVisible modulesDir));
+    in
+      pathsToImportedAttrs modulesPaths;
+
     nixosConfigurations = builtins.mapAttrs (_: config:
       lib.nixosSystem {
         inherit (config) modules;

hosts/default.nix

@@ -13,7 +13,11 @@
 
       home-manager.useGlobalPkgs = true;
       home-manager.useUserPackages = true;
-      home-manager.sharedModules = builtins.attrValues modules.hm;
+      home-manager.sharedModules = (builtins.attrValues modules.hm) ++ [{
+        programs.nixvim = { ... }: {
+          imports = builtins.attrValues modules.nixvim;
+        };
+      }];
 
       networking.hostName = hostName;
       nix.nixPath = let

profiles/hm/programs/neovim/profiles/core.nix → profiles/hm/programs/neovim/config.nix

@@ -6,23 +6,21 @@
 }: let
   tab = 2;
 in {
-  imports = [
-    ./telescope.nix
-    ./treesitter.nix
-    ./windows.nix
-    ./projects.nix
-    ./comments.nix
-    ./escape.nix
-    ./notify.nix
-    ./gitgutter.nix
-    ./lsp.nix
-    ./direnv.nix
-    ./cmp.nix
-  ];
-
   colorScheme.nixvimIntegration = true;
 
   programs.nixvim = {
+    profiles.telescope.enable = true;
+    profiles.treesitter.enable = true;
+    profiles.windows.enable = true;
+    profiles.projects.enable = true;
+    profiles.comments.enable = true;
+    profiles.escape.enable = true;
+    profiles.notify.enable = true;
+    profiles.gitgutter.enable = true;
+    profiles.lsp.enable = true;
+    profiles.direnv.enable = true;
+    profiles.cmp.enable = true;
+
     #  __  __ _
     # |  \/  (_)___ __
     # | |\/| | (_-</ _|

profiles/hm/programs/neovim/default.nix

@@ -6,10 +6,7 @@
 }: {
   imports = [
     # Profiles
-    ./profiles/core.nix
-
-    # HM Plugins
-    ./plugins/nix-colors.nix
+    ./config.nix
   ];
 
   home.packages = [
@@ -18,13 +15,6 @@
     pkgs.fzy
   ];
 
-  # The functional syntax is necessary because of https://github.com/NixOS/nixpkgs/issues/70638
-  programs.nixvim = {...}: {
-    enable = true;
-    imports = [
-      # Nixvim plugins
-      ./plugins/which-keys.nix
-    ];
-  };
+  programs.nixvim.enable = true;
   # programs.neovim.package = pkgs.neovim-nightly;
 }