Merge branch 'nvim-module'

home/default.nix

@@ -5,7 +5,6 @@
   home = {
     username = "xun";
     homeDirectory = "/home/xun";
-    stateVersion = "23.11";
     extraOutputsToInstall = ["doc" "devdoc"];
   };
 

home/editors/nvim.nix

@@ -1,13 +1,14 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  home.packages = [
-    inputs.small-nvim.packages.${pkgs.system}.neovim
+{inputs, ...}: {
+  imports = [
+    inputs.small-nvim.homeManagerModules.small-nvim
   ];
 
-  home.sessionVariables = {
-    EDITOR = "nvim";
+  xun.small-nvim = {
+    enable = true;
+    colorscheme = {
+      name = "dayfox";
+      package = "EdenEast/nightfox.nvim";
+    };
+    wakatime.enable = false;
   };
 }

home/profiles/default.nix

@@ -7,6 +7,19 @@
   # get these into the module system
   extraSpecialArgs = {inherit inputs self;};
   homeImports = {
+    "xun@kidney" = [
+      ../.
+      ./kidney
+      inputs.nix-index-database.hmModules.nix-index
+      {
+        programs.nix-index = {
+          enableBashIntegration = false;
+          enableFishIntegration = false;
+          enableZshIntegration = false;
+        };
+        home.stateVersion = "24.05";
+      }
+    ];
     "xun@nixdesk" = [
       ../.
       ./nixdesk
@@ -19,12 +32,14 @@
           enableFishIntegration = false;
           enableZshIntegration = false;
         };
+        home.stateVersion = "23.11";
       }
     ];
     "xun@hopper" = [
       ../.
       ./hopper
       inputs.sops-nix.homeManagerModules.sops
+      {home.stateVersion = "23.11";}
     ];
   };
 

home/profiles/kidney/default.nix

@@ -0,0 +1,18 @@
+{inputs, ...}: {
+  imports = [
+    inputs.small-nvim.homeManagerModules.small-nvim
+    ../../terminal/shell/zsh.nix
+    ../../terminal/programs
+    ../../terminal/programs/lazygit.nix
+    ../../develop
+  ];
+
+  xun.small-nvim = {
+    enable = true;
+    colorscheme = {
+      name = "dawnfox";
+      package = "EdenEast/nightfox.nvim";
+    };
+    wakatime.enable = false;
+  };
+}

home/profiles/nixdesk/default.nix

@@ -1,5 +1,6 @@
-{
+{inputs, ...}: {
   imports = [
+    inputs.small-nvim.homeManagerModules.small-nvim
     ./kanshi.nix
     ./defaults.nix
 
@@ -10,7 +11,6 @@
     ../../terminal/programs/irssi.nix
     ../../terminal/programs/lazygit.nix
     ../../terminal/programs/beets.nix
-    ../../editors/nvim.nix
     ../../editors/emacs.nix
     ../../editors/vscode.nix
     ../../editors/jetbrains
@@ -58,4 +58,12 @@
     ../../services/system/polkit-agent.nix
     ../../services/system/udiskie.nix # although i dont need this for usb memory, it is quite convenient for flashing qmk
   ];
+  xun.small-nvim = {
+    enable = true;
+    colorscheme = {
+      name = "carbonfox";
+      package = "EdenEast/nightfox.nvim";
+    };
+    wakatime.enable = true;
+  };
 }

home/terminal/programs/git.nix

@@ -11,7 +11,10 @@
       signByDefault = true;
     };
 
-    extraConfig.gpg.format = "ssh";
+    extraConfig = {
+      gpg.format = "ssh";
+      push.autoSetupRemote = true;
+    };
 
     userEmail = "xunuwu@gmail.com";
     userName = "xunuwu";