feat(nvim): nixify theming (and add 'vscode' theme)

dots/.config/nvim/after/plugin/vscode.nvim.lua

@@ -0,0 +1,14 @@
+local function overrides()
+  local colors = require("vscode.colors").get_colors()
+  vim.api.nvim_set_hl(0, "NormalFloat", { bg = colors.vscLeftDark })
+  vim.api.nvim_set_hl(0, "FloatBorder", { fg = colors.vscSplitDark, bg = colors.vscLeftDark })
+end
+
+vim.api.nvim_create_autocmd("ColorScheme", {
+  pattern = "vscode",
+  callback = overrides,
+})
+
+if vim.g.colors_name == "vscode" then
+  overrides()
+end

dots/.config/nvim/after/plugin/zenbones.lua

@@ -1 +0,0 @@
-vim.cmd("colorscheme zenwritten")

dots/.config/nvim/flake.nix

@@ -71,8 +71,12 @@
       categoryDefinitions =
         {
           pkgs,
+          categories,
           ...
         }:
+        let
+          themes = import ./themes.nix pkgs;
+        in
         {
           lspsAndRuntimeDeps = with pkgs; {
             general = [
@@ -113,76 +117,78 @@
           };
 
           startupPlugins = {
-            general = with pkgs.vimPlugins; [
+            general =
-              ## plug
+              with pkgs.vimPlugins;
-              vim-plug
+              [
-              vim-sandwich
+                ## plug
-              context_filetype-vim
+                vim-plug
-              editorconfig-vim
+                vim-sandwich
-              vim-snippets
+                context_filetype-vim
-              unicode-vim
+                editorconfig-vim
-              vim-css-color
+                vim-snippets
-              quarto-nvim
+                unicode-vim
-              vimtex
+                vim-css-color
-              wiki-vim
+                quarto-nvim
-              vim-pandoc
+                vimtex
-              vim-pandoc-syntax
+                wiki-vim
-              # TODO: ferrine/md-img-paste.vim
+                vim-pandoc
-              # TODO: supercollider/scvim
+                vim-pandoc-syntax
-              # TODO: tidalcycles/vim-tidal
+                # TODO: ferrine/md-img-paste.vim
-              vim-glsl
+                # TODO: supercollider/scvim
-              # TODO: timtro/glslView-nvim
+                # TODO: tidalcycles/vim-tidal
-              # TODO: sirtaj/vim-openscad
+                vim-glsl
-              jupytext-nvim
+                # TODO: timtro/glslView-nvim
-              vim-openscad
+                # TODO: sirtaj/vim-openscad
-              ## paq
+                jupytext-nvim
-              eyeliner-nvim
+                vim-openscad
-              fzf-lua
+                ## paq
-              ltex_extra-nvim
+                eyeliner-nvim
-              nvim-lspconfig
+                fzf-lua
-              lsp_lines-nvim
+                ltex_extra-nvim
-              lsp-progress-nvim
+                nvim-lspconfig
-              neodev-nvim
+                lsp_lines-nvim
-              SchemaStore-nvim
+                lsp-progress-nvim
-              nvim-lint
+                neodev-nvim
-              conform-nvim
+                SchemaStore-nvim
-              luasnip
+                nvim-lint
-              cmp_luasnip
+                conform-nvim
-              nvim-cmp
+                luasnip
-              cmp-nvim-lsp
+                cmp_luasnip
-              cmp-buffer
+                nvim-cmp
-              cmp-path
+                cmp-nvim-lsp
-              plenary-nvim
+                cmp-buffer
-              nui-nvim
+                cmp-path
-              trouble-nvim
+                plenary-nvim
-              pkgs.neovimPlugins.shipwright-nvim
+                nui-nvim
-              lush-nvim
+                trouble-nvim
-              zenbones-nvim
+                lush-nvim
-              nvim-treesitter.withAllGrammars
+                pkgs.neovimPlugins.shipwright-nvim
-              nvim-treesitter-textobjects
+                nvim-treesitter.withAllGrammars
-              # nvim-treesitter-context
+                nvim-treesitter-textobjects
-              nvim-ts-context-commentstring
+                # nvim-treesitter-context
-              # theHamsta/crazy-node-movement
+                nvim-ts-context-commentstring
-              treesj
+                # theHamsta/crazy-node-movement
-              sniprun
+                treesj
-              gitsigns-nvim
+                sniprun
-              nvim-highlight-colors
+                gitsigns-nvim
-              pkgs.neovimPlugins.tailwind-fold-nvim
+                nvim-highlight-colors
-              auto-session
+                pkgs.neovimPlugins.tailwind-fold-nvim
-              nvim-dbee
+                auto-session
-              image-nvim
+                nvim-dbee
-              pkgs.neovimPlugins.beancount-nvim
+                image-nvim
-              pkgs.neovimPlugins.nvimkit-nvim
+                pkgs.neovimPlugins.beancount-nvim
-              codecompanion-nvim
+                pkgs.neovimPlugins.nvimkit-nvim
-              copilot-lua
+                codecompanion-nvim
-              copilot-cmp
+                copilot-lua
-              helm-ls-nvim
+                copilot-cmp
-              kitty-scrollback-nvim
+                helm-ls-nvim
-              fidget-nvim
+                kitty-scrollback-nvim
-              rustaceanvim
+                fidget-nvim
-              # pkgs.neovimPlugins.m-taskwarrior-d-nvim
+                rustaceanvim
-              claude-code-nvim
+                # pkgs.neovimPlugins.m-taskwarrior-d-nvim
-            ];
+                claude-code-nvim
+              ]
+              ++ themes.${categories.colorscheme or "zenwritten"};
           };
 
           optionalPlugins = {
@@ -207,6 +213,7 @@
           };
           categories = {
             general = true;
+            colorscheme = "zenwritten";
           };
         };
       };

dots/.config/nvim/init.lua

@@ -16,5 +16,4 @@ require("diagnostic")
 require("utils")
 require("zk")
 require("reload")
-
+require("theme")
-vim.opt.background = "dark"

dots/.config/nvim/lua/theme.lua

@@ -0,0 +1,8 @@
+vim.opt.background = "dark"
+
+if vim.g.vscode then
+  return
+end
+
+vim.g.zenwritten_compat = 1
+vim.cmd.colorscheme(require("nixCatsUtils").getCatOrDefault("colorscheme", "zenwritten"))

dots/.config/nvim/themes.nix

@@ -0,0 +1,4 @@
+pkgs: {
+  vscode = [ pkgs.vimPlugins.vscode-nvim ];
+  zenwritten = [ pkgs.vimPlugins.zenbones-nvim ];
+}

home/hosts/work/default.nix

@@ -70,7 +70,10 @@
   music.enable = true;
   my.dconf.enable = true;
   my.stylix.enable = true;
-  nvim.enable = true;
+  nvim = {
+    enable = true;
+    colorscheme = "vscode";
+  };
   pandoc.enable = true;
   shell.enable = true;
   taskwarrior.enable = true;

home/modules/nvim/default.nix

@@ -1,15 +1,28 @@
 {
-  config,
-  lib,
-  pkgs,
   inputs,
+  pkgs,
+  lib,
+  config,
   ...
 }:
 
+let
+  themes = import "${inputs.nvim}/themes.nix" pkgs;
+  plugins = themes.${config.nvim.colorscheme};
+in
 {
-  options.nvim.enable = lib.mkEnableOption "nvim";
+  imports = [ inputs.nvim.homeModules.default ];
+
+  options.nvim.colorscheme = lib.mkOption {
+    type = lib.types.enum (lib.attrNames themes);
+    default = "zenwritten";
+  };
 
   config = lib.mkIf config.nvim.enable {
+    nvim.packageDefinitions.merge.nvim = _: {
+      categories.colorscheme = config.nvim.colorscheme;
+    };
+
     home = {
       sessionVariables = {
         EDITOR = "nvim";
@@ -19,10 +32,15 @@
         PAGER = "nvimpager";
         MANWIDTH = "80";
       };
-      packages = with pkgs; [
+      packages = with pkgs; [ nvimpager ];
-        inputs.nvim.packages.${pkgs.stdenv.hostPlatform.system}.nvim
-        nvimpager
-      ];
     };
+
+    xdg.configFile."nvimpager/init.lua".text = ''
+      vim.opt.clipboard = "unnamedplus"
+      vim.opt.background = "dark"
+      vim.g.zenwritten_compat = 1
+      ${lib.concatMapStringsSep "\n" (plugin: ''vim.opt.runtimepath:append("${plugin}")'') plugins}
+      vim.cmd.colorscheme("${config.nvim.colorscheme}")
+    '';
   };
 }