wip: modularize home-manager

flake.nix

@@ -63,6 +63,7 @@
             home-manager.users.xin = import ./home/${user}/${host};
             home-manager.extraSpecialArgs = { inherit inputs system; };
           }
+          self.homeManagerModules
         ];
       };
       mkNixos = { system, modules, specialArgs ? {}}: nixpkgs.lib.nixosSystem {

home/xin/calcite/default.nix

@@ -34,4 +34,11 @@
     thunderbird
     remmina
   ];
+
+  # custom-hm = {
+  #   fish = { enable = true; };
+  #   git = { enable = true; };
+  #   neovim = { enable = true; };
+  #   zellij = { enable = true; };
+  # };
 }

home/xin/common/default.nix

@@ -1,10 +1,5 @@
-{ pkgs, ... }: {
+{ inputs, pkgs, ... }: {
-  imports = [
+  imports = [ ];
-    ./fish.nix
-    ./git.nix
-    ./zellij.nix
-    ./vim.nix
-  ];
 
   home.packages = with pkgs; [
     dig

home/xin/common/fish.nix

@@ -1,37 +0,0 @@
-{ pkgs, ... }: {
-  programs.fish = {
-    enable = true;
-    plugins = with pkgs; [
-      {
-        name = "pisces";
-        src = fishPlugins.pisces.src;
-      }
-      {
-        name = "done";
-        src = fishPlugins.done.src;
-      }
-      {
-        name = "hydro";
-        src = fishPlugins.hydro.src;
-      }
-    ];
-    interactiveShellInit = ''
-      fish_config theme choose 'ayu Dark'
-      fish_config prompt choose arrow
-      ${pkgs.nix-your-shell}/bin/nix-your-shell fish | source
-      function fish_right_prompt
-        if test -n "$IN_NIX_SHELL"
-          echo -n "<nix-shell>"
-        else if test $SHLVL -ge 3
-          echo -n "<🚀lv$SHLVL>"
-        end
-      end
-      function fish_command_not_found
-        ${pkgs.comma}/bin/comma $argv
-      end
-    '';
-    functions = {
-      gitignore = "curl -sL https://www.gitignore.io/api/$argv";
-    };
-  };
-}

home/xin/common/git.nix

@@ -1,13 +0,0 @@
-{
-  programs.git = {
-    enable = true;
-    delta.enable = true;
-    userName = "Xinyang Li";
-    userEmail = "lixinyang411@gmail.com";
-    aliases = {
-      graph = "log --all --oneline --graph --decorate";
-      s = "status";
-      d = "diff";
-    };
-  };
-}

home/xin/common/vim.nix

@@ -1,32 +0,0 @@
-{ pkgs, ... }: {
-  programs.neovim = {
-    enable = true;
-    vimAlias = true;
-    vimdiffAlias = true;
-    plugins = with pkgs.vimPlugins; [
-      nvim-treesitter.withAllGrammars
-      dracula-nvim
-    ];
-    extraConfig = ''
-    set nocompatible
-  
-    syntax on
-    set number
-    set relativenumber
-    set shortmess+=I
-    set laststatus=2
-
-    set ignorecase
-    set smartcase
-    set list
-    set listchars=tab:→·
-    set tabstop=4
-    set shiftwidth=4
-    set expandtab
-
-    set mouse+=a
-
-    colorscheme dracula
-    '';
-};
-}

home/xin/common/zellij.nix

@@ -1,28 +0,0 @@
-{
-  programs.zellij = {
-    enable = true;
-    settings = {
-      default_shell = "fish";
-      keybinds = {
-        unbind = [
-          "Ctrl p"
-          "Ctrl n"
-        ];
-      };
-      theme = "dracula";
-      themes.dracula = {
-        fg = [ 248 248 242 ];
-        bg = [ 40 42 54 ];
-        black = [ 0 0 0 ];
-        red = [ 255 85 85 ];
-        green = [ 80 250 123 ];
-        yellow = [ 241 250 140 ];
-        blue = [ 98 114 164 ];
-        magenta = [ 255 121 198 ];
-        cyan = [ 139 233 253 ];
-        white = [ 255 255 255 ];
-        orange = [ 255 184 108 ];
-      };
-    };
-  };
-}

machines/calcite/configuration.nix

@@ -189,7 +189,6 @@
     gnomeExtensions.paperwm
     gnomeExtensions.search-light
     gnomeExtensions.tray-icons-reloaded
-    gnomeExtensions.gsconnect
     gnome.gnome-tweaks
     gthumb
 

modules/home-manager/default.nix

@@ -1,3 +1,10 @@
+{ config, pkgs, ... }:
 {
-
+  imports = [
+    ./fish.nix
+    ./git.nix
+    ./tmux.nix
+    ./vim.nix
+    ./zellij.nix
+  ];
 }

modules/home-manager/fish.nix

@@ -0,0 +1,72 @@
+{ config, pkgs, lib, ... }: 
+
+with lib;
+
+let
+  cfg = config.custom-hm.fish;
+in
+{
+  options = {
+    enable = mkEnableOption "fish";
+    plugins = mkOption {
+      type = types.listOf types.str;
+      default = [ "pisces" "done" "hydro" ];
+    };
+    functions = {
+      enable = mkOption {
+        type = types.bool;
+        default = true;
+      };
+    };
+    alias = {
+      enable = mkOption {
+        type = types.bool;
+        default = true;
+      };
+    };
+  };
+
+  config = {
+    programs.fish = mkIf cfg.enable {
+      enable = true;
+      plugins = with pkgs; filter (
+        e: hasAttr e.name builtins.listToAttrs # { "xxx" = true; }
+           (map (p: { name = p; value = true; }) cfg.plugins) # { name = "xxx"; value = true; }
+        ) [
+        {
+          name = "pisces";
+          src = fishPlugins.pisces.src;
+        }
+        {
+          name = "done";
+          src = fishPlugins.done.src;
+        }
+        {
+          name = "hydro";
+          src = fishPlugins.hydro.src;
+        }
+      ];
+      interactiveShellInit = let
+        extraInit = if cfg.functions.enable then ''
+          ${pkgs.nix-your-shell}/bin/nix-your-shell fish | source
+          function fish_right_prompt
+            if test -n "$IN_NIX_SHELL"
+              echo -n "<nix-shell>"
+            else if test $SHLVL -ge 3
+              echo -n "<🚀lv$SHLVL>"
+            end
+          end
+          function fish_command_not_found
+            ${pkgs.comma}/bin/comma $argv
+          end
+        '' else "";
+      in ''
+        fish_config theme choose 'ayu Dark'
+        fish_config prompt choose arrow
+      '' + extraInit;
+      functions = mkIf cfg.functions.enable {
+        gitignore = "curl -sL https://www.gitignore.io/api/$argv";
+      };
+    };
+  };
+}

modules/home-manager/git.nix

@@ -0,0 +1,26 @@
+{ config, pkgs, lib, ... }: 
+
+with lib;
+
+let
+  cfg = config.custom-hm.git;
+in
+{
+  options = {
+    enable = mkEnableOption "Enable git configuration";
+  };
+  config = {
+    programs.git = {
+      enable = true;
+      delta.enable = true;
+      userName = "Xinyang Li";
+      userEmail = "lixinyang411@gmail.com";
+      aliases = {
+        graph = "log --all --oneline --graph --decorate";
+        a = "add";
+        d = "diff";
+        s = "status";
+      };
+    };
+  };
+}

modules/home-manager/tmux.nix

@@ -0,0 +1 @@
+{}

modules/home-manager/vim.nix

@@ -0,0 +1,43 @@
+{ config, pkgs, lib, ... }: 
+
+with lib;
+
+let
+  cfg = config.custom-hm.neovim;
+in
+{
+  options = {
+    enable = mkEnableOption "neovim configurations";
+  };
+  config = mkIf cfg.enable {
+    programs.neovim = {
+      enable = true;
+      vimAlias = true;
+      vimdiffAlias = true;
+      plugins = with pkgs.vimPlugins; [
+        catppuccin-nvim
+      ];
+      extraConfig = ''
+      set nocompatible
+    
+      syntax on
+      set number
+      set relativenumber
+      set shortmess+=I
+      set laststatus=2
+
+      set ignorecase
+      set smartcase
+      set list
+      set listchars=tab:→·
+      set tabstop=4
+      set shiftwidth=4
+      set expandtab
+
+      set mouse+=a
+
+      colorscheme catppuccin-macchiato
+      '';
+    };
+  };
+}

modules/home-manager/zellij.nix

@@ -0,0 +1,40 @@
+{ config, pkgs, lib, ... }: 
+
+with lib;
+
+let
+  cfg = config.custom-hm.zellij;
+in
+{
+  options = {
+    enable = mkEnableOption "zellij configurations";
+  };
+  config = {
+    programs.zellij = mkIf cfg.enable {
+      enable = true;
+      settings = {
+        default_shell = "fish";
+        keybinds = {
+          unbind = [
+            "Ctrl p"
+            "Ctrl n"
+          ];
+        };
+        theme = "catppuccin-macchiato";
+        themes.dracula = {
+          fg = [ 248 248 242 ];
+          bg = [ 40 42 54 ];
+          black = [ 0 0 0 ];
+          red = [ 255 85 85 ];
+          green = [ 80 250 123 ];
+          yellow = [ 241 250 140 ];
+          blue = [ 98 114 164 ];
+          magenta = [ 255 121 198 ];
+          cyan = [ 139 233 253 ];
+          white = [ 255 255 255 ];
+          orange = [ 255 184 108 ];
+        };
+      };
+    };
+  };
+}