nvim stuff

profiles/base/home-manager/default.nix

@@ -1,16 +1,18 @@
 {
   imports = [
-    ./home-manager/atuin.nix
-    ./home-manager/bat.nix
-    ./home-manager/eza.nix
-    ./home-manager/fish.nix
-    ./home-manager/git.nix
-    ./home-manager/jujutsu.nix
-    ./home-manager/neovim
-    ./home-manager/ssh.nix
-    ./home-manager/starship.nix
-    ./home-manager/zellij.nix
-    ./home-manager/zoxide.nix
-    ./home-manager/zsh.nix
+    ./atuin.nix
+    ./bat.nix
+    ./eza.nix
+    ./fish.nix
+    ./git.nix
+    ./jujutsu.nix
+    ./neovim
+    ./ssh.nix
+    ./starship.nix
+    ./zellij.nix
+    ./zoxide.nix
+    ./zsh.nix
   ];
+
+  programs.home-manager.enable = true;
 }

profiles/base/home-manager/neovim/default.nix

@@ -1,10 +1,8 @@
-{ nixvim, ... }:
-
 {
   imports = [
-    nixvim.homeManagerModules.nixvim
     ./options.nix
-    ./plugins
+    ./plugins/oil.nix
+    ./plugins/which-key.nix
   ];
 
   home.shellAliases.v = "nvim";
@@ -12,12 +10,15 @@
   programs.nixvim = {
     enable = true;
     defaultEditor = true;
-
-    nixpkgs.useGlobalPackages = true;
-
-    viAlias = true;
-    vimAlias = true;
-
     luaLoader.enable = true;
+
+    colorschemes.catppuccin = {
+      enable = true;
+      settings = {
+        flavour = "latte";
+      };
+    };
+
+    clipboard.register = "unnamedplus";
   };
 }

profiles/base/home-manager/neovim/options.nix

@@ -1,5 +1 @@
-{
-  programs.nixvim = {
-    colorschemes.catppuccin.enable = true;
-  };
-}
+{ }

profiles/base/home-manager/neovim/plugins/default.nix

@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./oil.nix
-  ];
-}

profiles/base/home-manager/neovim/plugins/which-key.nix

@@ -0,0 +1,5 @@
+{
+  programs.nixvim.plugins.which-key = {
+    enable = true;
+  };
+}

profiles/base/home-manager/zellij.nix

@@ -1,3 +1,4 @@
+{ pkgs, ... }:
 {
   programs.zellij = {
     enable = true;
@@ -5,6 +6,7 @@
     settings = {
       theme = "catppuccin-latte";
       default_layout = "compact";
+      default_shell = "${pkgs.fish}/bin/fish";
       show_startup_tips = false;
       show_release_notes = false;
     };

profiles/base/packages.nix

@@ -13,7 +13,6 @@ with pkgs;
   jq
   killall
   libfido2
-  neovim
   nerd-fonts.iosevka
   nixfmt
   nodejs_24

profiles/darwin/default.nix

@@ -33,15 +33,16 @@
         ...
       }:
       {
-        _module.args = { inherit user nixvim; };
+        _module.args = { inherit user; };
         imports = [
+          nixvim.homeModules.nixvim
           ../base/home-manager
           ./home-manager/ghostty.nix
         ];
         fonts.fontconfig.enable = true;
         home = {
           packages = pkgs.callPackage ./packages.nix { } ++ pkgs.callPackage ../base/packages.nix { };
-          stateVersion = "23.11";
+          stateVersion = "24.05";
         };
       };
   };

profiles/nixos/default.nix

@@ -3,6 +3,7 @@
   pkgs,
   lib,
   home-manager,
+  nixvim,
   user,
   ...
 }:
@@ -24,8 +25,6 @@ in
     extraGroups = [
       "wheel"
       "sudo"
-      "audio"
-      "video"
       "network"
       "systemd-journal"
     ];
@@ -44,7 +43,8 @@ in
       {
         _module.args = { inherit user; };
         imports = [
-          ../base/home-manager.nix
+          nixvim.homeModules.nixvim
+          ../base/home-manager
         ];
         home = {
           packages = pkgs.callPackage ./packages.nix { };