Disable autoEnablement of nixvim target for stylix

home-manager/common/software/cli/nixvim-base.nix

@@ -1,244 +1,244 @@
 { inputs, pkgs, lib, theme, ... }: {
-    imports = [
+  imports = [
-        inputs.nixvim.homeManagerModules.nixvim
+    inputs.nixvim.homeManagerModules.nixvim
-    ] ++ lib.optional (builtins.isString theme) ../../../../stylix/${theme}/home-manager/nixvim.nix;
+  ] ++ lib.optional (builtins.isString theme) ../../../../stylix/${theme}/home-manager/nixvim.nix;
 
-    # https://github.com/nix-community/nixvim
+  # https://github.com/nix-community/nixvim
 
-    # Docs:
+  # Docs:
-    # https://nix-community.github.io/nixvim/
+  # https://nix-community.github.io/nixvim/
-    programs.nixvim = {
+  programs.nixvim = {
-        enable = true;
+    enable = true;
-        viAlias = true;
+    viAlias = true;
-        vimAlias = true;
+    vimAlias = true;
 
-        globals.mapleader = " ";
+    globals.mapleader = " ";
-        globals.maplocalleader = " ";
+    globals.maplocalleader = " ";
 
-        options = {
+    options = {
-            number = true;
+      number = true;
-            shiftwidth = 2;
+      shiftwidth = 2;
-            breakindent = true;
+      breakindent = true;
-            colorcolumn = "100";
+      #  colorcolumn = "100";
-            showmode = false;
+      showmode = false;
-            termguicolors = true;
-        };
-
-        keymaps = let
-            map = mode: key: action: { mode = mode; key = key; action = action; };
-            nmap = key: action: map [ "n" ] key action;
-            nvmap = key: action: map [ "n" "v" ] key action;
-            imap = key: action: map [ "i" ] key action;
-            desc = d: { options.desc = d; };
-            silent = { options.silent = true; };
-            expr = { options.expr = true; };
-        in [
-            # Unmap keys that aren't useful, or that we want to use for different things
-            (nvmap "<Space>" "<Nop>" // silent)
-            (nvmap "<Cr>" "<Nop>" // silent)
-            (nvmap "s" "<Nop>" // silent)
-            # Redo
-            (nmap "R" "<C-r>")
-            # Copy and paste
-            (nvmap "<leader>y" "\"+y" // desc "Cop[y] to clipboard")
-            (nvmap "<leader>p" "\"+p" // desc "[P]aste from clipboard")
-            # Jump to start/end of line
-            (nvmap "H" "0")
-            (nvmap "L" "$")
-            # Navigate up and down word wrapped text as if it were not word wrapped
-            (nmap "k" "v:count == 0 ? 'gk' : 'k'" // silent // expr)
-            (nmap "j" "v:count == 0 ? 'gj' : 'j'" // silent // expr)
-            # Center cursor when jumping foward or back
-            (nmap "<C-o>" "<C-o>zz")
-            (nmap "<C-i>" "<C-i>zz")
-        
-            # Insert Mode
-
-            # Normal Mode
-            # NVimTree
-            (nmap "<leader>n" "<Nop>" // desc "[N]vimTree")
-            (nmap "<leader>nf" ":NvimTreeFocus<CR>"    // desc "[F]ocus NvimTree")
-            (nmap "<leader>nt" ":NvimTreeToggle<CR>"   // desc "[T]oggle NvimTree")
-            (nmap "<leader>ns" ":NvimTreeFindFile<CR>" // desc "[S]earch NvimTree")
-            (nmap "<leader>nc" ":NvimTreeClose<CR>"    // desc "[C]lose NvimTree")
-            # ToggleTerm
-            (nmap "<leader>TT" ":ToggleTerm<CR>" // desc "[T]oggle Terminal")
-            # Fugitive
-            (nmap "<leader>gc" ":Git commit -a<CR>" // desc "[C]ommit" )
-            (nmap "<leader>gp" ":Git push<CR>" // desc "Git [p]ush")
-            (nmap "<leader>gP" ":Git pull<CR>" // desc "[P]ull")
-            # Trouble 
-            (nmap "<leader>tt" ":TroubleToggle<CR>" // desc "[T]oggle")
-            (nmap "<leader>tc" ":TroubleClose<CR>" // desc "[C]lose")
-
-            # Window Management
-            (nmap "<leader>wh"  ":wincmd h<CR>" // desc "Move left")
-            (nmap "<leader>wl"  ":wincmd l<CR>" // desc "Move right")
-            (nmap "<leader>wj"  ":wincmd j<CR>" // desc "Move down")
-            (nmap "<leader>wk"  ":wincmd k<CR>" // desc "Move up")
-            (nmap "<leader>wn"  ":wincmd w<CR>" // desc "Move to next")
-            (nmap "<leader>wN"  ":wincmd p<CR>" // desc "Move to previous")
-            (nmap "<leader>wc"  ":wincmd c<CR>" // desc "[C]lose active window")
-            (nmap "<leader>woh" ":wincmd n<CR>" // desc "Open [H]orizontal window")
-            (nmap "<leader>wov" ":wincmd v<CR>" // desc "Open [V]ertical window")
-            # resize window
-            (nmap "<leader>wrh" ":resize " // desc "Resize Horizontal")
-            (nmap "<leader>wrv" ":vertical resize " // desc "Resize Vertical")
-            # Buffer Management
-            (nmap "<leader>bn" ":bnext<CR>"   // desc "Next buffer")
-            (nmap "<leader>bN" ":bNext<CR>"   // desc "Previous buffer")
-            (nmap "<leader>bc" ":bdelete<CR>" // desc "[c]lose buffer")
-        ];
-
-        plugins = {
-            # auto bracket completion 
-            nvim-autopairs.enable = true;
-            # Parser generator tool
-            treesitter.enable = true;
-            # Snippet engine for neovim
-            luasnip.enable = true;
-            # winbar that uses nvim-navic in order to get LSP context from your language server.
-            barbecue.enable = true;
-            # Nix language syntax highlighting / file type associations
-            nix.enable = true;
-            # Run nix develop / shell without exiting vim 
-            nix-develop.enable = true;
-            # tab bar like Firefox or Chrome
-            bufferline.enable = true;
-            # Automatic indent
-            intellitab.enable = true;
-            #  Highlight all entries of the currently selected word
-            illuminate.enable = true;
-            # sidebar file browser
-            nvim-tree.enable = true;
-            # Gutter information for git modifications
-            gitsigns.enable = true;
-            # Terminal in vim
-            toggleterm.enable = true;
-            # Rainbow matching {} [] () 's
-            rainbow-delimiters.enable = true;
-            # Colorize hex colors inline
-            nvim-colorizer.enable = true;
-            # git plugin for vim
-            fugitive.enable = true;
-            # Alerts / CodActions 
-            trouble.enable = true;
-
-            # Popup to show shortcuts
-            which-key = {
-                enable = true;
-                registrations = {
-                    "<leader>b" = "Manage buffers...";
-                    "<leader>c" = "Colorscheme...";
-                    "<leader>g" = "Git Options...";
-                    "<leader>l" = "LSP Options...";
-                    "<leader>n" = "NvimTree...";
-                    "<leader>t" = "Trouble...";
-                    "<leader>T" = "ToggleTerm...";
-                    "<leader>w" = "Manage Windows...";
-                    "<leader>wo" = "Open New...";
-                    "<leader>wr" = "Resize...";
-                };
-            };
-
-            # Airline / Powerline alternative
-            lualine = {
-                enable = true;
-                componentSeparators = {
-                    left = "«";
-                    right = "»";
-                };
-            };
-
-            telescope = {
-                enable = true;
-                extensions.fzf-native.enable = true;
-                keymaps = {
-                    "<leader><leader>" = {
-                        action = "find_files";
-                        desc = "Search files by name";
-                    };
-                    "<leader>s" = {
-                        action = "live_grep";
-                        desc = "Search by live grep";
-                    };
-                    "<leader>bl" = {
-                        action = "buffers";
-                        desc = "[L]list open [B]uffers";
-                    };
-                    "<leader>h" = {
-                        action = "help_tags";
-                        desc = "Search [H]elp";
-                    };
-                    "<leader>W" = {
-                        action = "grep_string";
-                        desc = "Search for [W]ord under cursor";
-                    };
-                    "<leader>gs" = {
-                        action = "git_status";
-                        desc = "Search [G]it [S]tatus";
-                    };
-                    "<leader>gl" = {
-                      action = "git_commits";
-                      desc = "View [G]it [L]ogs";
-                    };
-                    "<leader>r" = {
-                        action = "oldfiles";
-                        desc = "Search [R]ecently opened files by name";
-                    };
-                    "<leader>cs" = {
-                        action = "colorscheme";
-                        desc = "Change [C]olor[s]cheme";
-                    };
-                };
-            };
-
-            nvim-cmp = {
-                enable = true;
-                autoEnableSources = true;
-                mapping = {
-                    "<C-Space>" = "cmp.mapping.complete()";
-                    "<C-d>" = "cmp.mapping.scroll_docs(-4)";
-                    "<C-e>" = "cmp.mapping.close()";
-                    "<C-f>" = "cmp.mapping.scroll_docs(4)";
-                    "<CR>" = "cmp.mapping.confirm({ select = true })";
-                    "<S-Tab>" = {
-                        action = "cmp.mapping.select_prev_item()";
-                        modes = [
-                        "i"
-                        "s"
-                        ];
-                    };
-                    "<Tab>" = {
-                        action = "cmp.mapping.select_next_item()";
-                        modes = [
-                        "i"
-                        "s"
-                        ];
-                    };
-                };
-                sources = [
-                    { name = "nvim_lua"; }
-                    { name = "nvim_lsp"; }
-                    { name = "path";     }
-                    { name = "buffer";   }
-                ];
-            };
-        };
-
-        colorschemes = {
-            tokyonight.enable = true;
-            gruvbox.enable = true;
-            catppuccin.enable = true;
-            dracula.enable = true;
-            oxocarbon.enable = true;
-            
-        };
-        extraPlugins = with pkgs.vimPlugins; [
-            everforest
-            onehalf
-            rose-pine
-            melange-nvim
-        ];
     };
+
+    keymaps = let
+      map = mode: key: action: { mode = mode; key = key; action = action; };
+      nmap = key: action: map [ "n" ] key action;
+      nvmap = key: action: map [ "n" "v" ] key action;
+      imap = key: action: map [ "i" ] key action;
+      desc = d: { options.desc = d; };
+      silent = { options.silent = true; };
+      expr = { options.expr = true; };
+    in [
+      # Unmap keys that aren't useful, or that we want to use for different things
+      (nvmap "<Space>" "<Nop>" // silent)
+      (nvmap "<Cr>" "<Nop>" // silent)
+      (nvmap "s" "<Nop>" // silent)
+      # Redo
+      (nmap "R" "<C-r>")
+      # Copy and paste
+      (nvmap "<leader>y" "\"+y" // desc "Cop[y] to clipboard")
+      (nvmap "<leader>p" "\"+p" // desc "[P]aste from clipboard")
+      # Jump to start/end of line
+      (nvmap "H" "0")
+      (nvmap "L" "$")
+      # Navigate up and down word wrapped text as if it were not word wrapped
+      (nmap "k" "v:count == 0 ? 'gk' : 'k'" // silent // expr)
+      (nmap "j" "v:count == 0 ? 'gj' : 'j'" // silent // expr)
+      # Center cursor when jumping foward or back
+      (nmap "<C-o>" "<C-o>zz")
+      (nmap "<C-i>" "<C-i>zz")
+      # Insert Mode
+
+      # Normal Mode
+      # NVimTree
+      (nmap "<leader>n" "<Nop>" // desc "[N]vimTree")
+      (nmap "<leader>nf" ":NvimTreeFocus<CR>"  // desc "[F]ocus NvimTree")
+      (nmap "<leader>nt" ":NvimTreeToggle<CR>"   // desc "[T]oggle NvimTree")
+      (nmap "<leader>ns" ":NvimTreeFindFile<CR>" // desc "[S]earch NvimTree")
+      (nmap "<leader>nc" ":NvimTreeClose<CR>"  // desc "[C]lose NvimTree")
+      # ToggleTerm
+      (nmap "<leader>TT" ":ToggleTerm<CR>" // desc "[T]oggle Terminal")
+      # Fugitive
+      (nmap "<leader>gc" ":Git commit -a<CR>" // desc "[C]ommit" )
+      (nmap "<leader>gp" ":Git push<CR>" // desc "Git [p]ush")
+      (nmap "<leader>gP" ":Git pull<CR>" // desc "[P]ull")
+      # Trouble 
+      (nmap "<leader>tt" ":TroubleToggle<CR>" // desc "[T]oggle")
+      (nmap "<leader>tc" ":TroubleClose<CR>" // desc "[C]lose")
+
+      # Window Management
+      (nmap "<leader>wh"  ":wincmd h<CR>" // desc "Move left")
+      (nmap "<leader>wl"  ":wincmd l<CR>" // desc "Move right")
+      (nmap "<leader>wj"  ":wincmd j<CR>" // desc "Move down")
+      (nmap "<leader>wk"  ":wincmd k<CR>" // desc "Move up")
+      (nmap "<leader>wn"  ":wincmd w<CR>" // desc "Move to next")
+      (nmap "<leader>wN"  ":wincmd p<CR>" // desc "Move to previous")
+      (nmap "<leader>wc"  ":wincmd c<CR>" // desc "[C]lose active window")
+      (nmap "<leader>woh" ":wincmd n<CR>" // desc "Open [H]orizontal window")
+      (nmap "<leader>wov" ":wincmd v<CR>" // desc "Open [V]ertical window")
+      # resize window
+      (nmap "<leader>wrh" ":resize " // desc "Resize Horizontal")
+      (nmap "<leader>wrv" ":vertical resize " // desc "Resize Vertical")
+      # Buffer Management
+      (nmap "<leader>bn" ":bnext<CR>"   // desc "Next buffer")
+      (nmap "<leader>bN" ":bNext<CR>"   // desc "Previous buffer")
+      (nmap "<leader>bc" ":bdelete<CR>" // desc "[c]lose buffer")
+    ];
+
+    plugins = {
+      # auto bracket completion 
+      nvim-autopairs.enable = true;
+      # Parser generator tool
+      treesitter.enable = true;
+      # Snippet engine for neovim
+      luasnip.enable = true;
+      # winbar that uses nvim-navic in order to get LSP context from your language server.
+      barbecue.enable = true;
+      # Nix language syntax highlighting / file type associations
+      nix.enable = true;
+      # Run nix develop / shell without exiting vim 
+      nix-develop.enable = true;
+      # tab bar like Firefox or Chrome
+      bufferline.enable = true;
+      # Automatic indent
+      intellitab.enable = true;
+      #  Highlight all entries of the currently selected word
+      illuminate.enable = true;
+      # sidebar file browser
+      nvim-tree.enable = true;
+      # Gutter information for git modifications
+      gitsigns.enable = true;
+      # Terminal in vim
+      toggleterm.enable = true;
+      # Rainbow matching {} [] () 's
+      rainbow-delimiters.enable = true;
+      # Colorize hex colors inline
+      nvim-colorizer.enable = true;
+      # git plugin for vim
+      fugitive.enable = true;
+      # Alerts / CodActions 
+      trouble.enable = true;
+      # Indentation guides 
+      indent-blankline.enable = true;
+
+      # Popup to show shortcuts
+      which-key = {
+        enable = true;
+        registrations = {
+          "<leader>b" = "Manage buffers...";
+          "<leader>c" = "Colorscheme...";
+          "<leader>g" = "Git Options...";
+          "<leader>l" = "LSP Options...";
+          "<leader>n" = "NvimTree...";
+          "<leader>t" = "Trouble...";
+          "<leader>T" = "ToggleTerm...";
+          "<leader>w" = "Manage Windows...";
+          "<leader>wo" = "Open New...";
+          "<leader>wr" = "Resize...";
+        };
+      };
+
+      # Airline / Powerline alternative
+      lualine = {
+        enable = true;
+        componentSeparators = {
+          left = "«";
+          right = "»";
+        };
+      };
+
+      telescope = {
+        enable = true;
+        extensions.fzf-native.enable = true;
+        keymaps = {
+          "<leader><leader>" = {
+            action = "find_files";
+            desc = "Search files by name";
+          };
+          "<leader>s" = {
+            action = "live_grep";
+            desc = "Search by live grep";
+          };
+          "<leader>bl" = {
+            action = "buffers";
+            desc = "[L]list open [B]uffers";
+          };
+          "<leader>h" = {
+            action = "help_tags";
+            desc = "Search [H]elp";
+          };
+          "<leader>W" = {
+            action = "grep_string";
+            desc = "Search for [W]ord under cursor";
+          };
+          "<leader>gs" = {
+            action = "git_status";
+            desc = "Search [G]it [S]tatus";
+          };
+          "<leader>gl" = {
+            action = "git_commits";
+            desc = "View [G]it [L]ogs";
+          };
+          "<leader>r" = {
+            action = "oldfiles";
+            desc = "Search [R]ecently opened files by name";
+          };
+          "<leader>cs" = {
+            action = "colorscheme";
+            desc = "Change [C]olor[s]cheme";
+          };
+        };
+      };
+
+      nvim-cmp = {
+        enable = true;
+        autoEnableSources = true;
+        mapping = {
+          "<C-Space>" = "cmp.mapping.complete()";
+          "<C-d>" = "cmp.mapping.scroll_docs(-4)";
+          "<C-e>" = "cmp.mapping.close()";
+          "<C-f>" = "cmp.mapping.scroll_docs(4)";
+          "<CR>" = "cmp.mapping.confirm({ select = true })";
+          "<S-Tab>" = {
+            action = "cmp.mapping.select_prev_item()";
+            modes = [
+            "i"
+            "s"
+            ];
+          };
+          "<Tab>" = {
+            action = "cmp.mapping.select_next_item()";
+            modes = [
+            "i"
+            "s"
+            ];
+          };
+        };
+        sources = [
+          { name = "nvim_lua"; }
+          { name = "nvim_lsp"; }
+          { name = "path";   }
+          { name = "buffer";   }
+        ];
+      };
+    };
+
+    colorschemes = {
+      tokyonight.enable = true;
+      gruvbox.enable = true;
+      catppuccin.enable = true;
+      dracula.enable = true;
+      oxocarbon.enable = true;
+      
+    };
+    extraPlugins = with pkgs.vimPlugins; [
+      everforest
+      onehalf
+      rose-pine
+      melange-nvim
+    ];
+  };
 }

home-manager/common/software/cli/starship.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, stylix, ... }:
+{ config, lib, ... }:
 let 
   orangeColor = "#${config.lib.stylix.colors.base0C}";
   yellowColor = "#${config.lib.stylix.colors.base0A}";
@@ -99,4 +99,4 @@ in
       };
     };
   };
-}
+}

shell.nix

@@ -1,4 +1,4 @@
-{ pkgs, sops-nix, deploy-rs, system,  ... }: {
+{ pkgs, sops-nix,  ... }: {
   default = pkgs.mkShell {
     NIX_CONFIG = "experimental-features = nix-command flakes";
     # imports all files ending in .asc/.gpg
@@ -9,14 +9,11 @@
     
     nativeBuildInputs = [
       pkgs.nix
-      # pkgs.home-manager
       pkgs.git
       pkgs.vim
-      # pkgs.alejandra
+      pkgs.nixfmt
-      # pkgs.nixfmt
       pkgs.ssh-to-pgp
       (pkgs.callPackage sops-nix {}).sops-import-keys-hook
-      # deploy-rs.packages.${system}.deploy-rs
     ];
   };
-}
+}

stylix/green/home-manager/nixvim.nix

@@ -1,3 +1,4 @@
 { lib, ... }: {
-    programs.nixvim.colorscheme = lib.mkForce "everforest";
+  programs.nixvim.colorscheme = lib.mkForce "everforest";
-}
+  stylix.targets.nixvim.enable = false;
+}

stylix/gruvbox/home-manager/nixvim.nix

@@ -1,3 +1,4 @@
 { lib, ... }: {
-    programs.nixvim.colorscheme = lib.mkForce "gruvbox";
+  programs.nixvim.colorscheme = lib.mkForce "gruvbox";
-}
+  stylix.targets.nixvim.enable = false;
+}

stylix/sakura-day/home-manager/nixvim.nix

@@ -1,3 +1,4 @@
 { lib, ... }: {
-    programs.nixvim.colorscheme = lib.mkForce "rose-pine-dawn";
+  programs.nixvim.colorscheme = lib.mkForce "rose-pine-dawn";
+  stylix.targets.nixvim.enable = false;
 }

stylix/sakura-night/home-manager/nixvim.nix

@@ -1,3 +1,4 @@
 { lib, ... }: {
-    programs.nixvim.colorscheme = lib.mkForce "rose-pine-moon";
+  programs.nixvim.colorscheme = lib.mkForce "rose-pine-moon";
+  stylix.targets.nixvim.enable = false;
 }

stylix/stylix/default.nix

@@ -1,4 +1,4 @@
-{lib, inputs, pkgs, gpu, system, theme, ...}: {
+{pkgs, ...}: {
     # Themes https://github.com/tinted-theming/base16-schemes
   stylix  = {
     image = /etc/nixos/git/docs/icons/nixos/white.png;
@@ -6,4 +6,4 @@
     base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml";
     autoEnable = true;
   };
-}
+}

stylix/stylix/home-manager/nixvim.nix

@@ -1,3 +1,4 @@
 { lib, ... }: {
-    programs.nixvim.colorscheme = lib.mkForce "tokyonight-storm";
+  programs.nixvim.colorscheme = lib.mkForce "tokyonight";
+  stylix.targets.nixvim.enable = false;
 }

stylix/tokyo-day/home-manager/nixvim.nix

@@ -1,3 +1,4 @@
 { lib, ... }: {
-    programs.nixvim.colorscheme = lib.mkForce "tokyonight-day";
+  programs.nixvim.colorscheme = lib.mkForce "tokyonight-day";
-}
+  stylix.targets.nixvim.enable = false;
+}

stylix/tokyo-night/home-manager/nixvim.nix

@@ -1,3 +1,4 @@
 { lib, ... }: {
-    programs.nixvim.colorscheme = lib.mkForce "tokyonight-night";
+  programs.nixvim.colorscheme = lib.mkForce "tokyonight-night";
-}
+  stylix.targets.nixvim.enable = false;
+}