feat: improve fonts

flake.lock

@@ -5,14 +5,15 @@
         "flake-parts": "flake-parts",
         "nixpkgs": [
           "nixpkgs"
-        ]
+        ],
+        "systems": "systems"
       },
       "locked": {
-        "lastModified": 1713259062,
+        "lastModified": 1717576207,
-        "narHash": "sha256-WTO84hUL8IlNuHDK2yOCeJ38EewFzGt5E0kzBjNWxa8=",
+        "narHash": "sha256-LU6d1xX7jN1zt10YU7Oym07MtzVfziSmUEznGFdbuaw=",
         "owner": "Kirottu",
         "repo": "anyrun",
-        "rev": "f9d30e34fa4ccb2797c6becec37e8bcff6585d39",
+        "rev": "7aabad8d5bb7d1bffae903ce86427b888ab824b4",
         "type": "github"
       },
       "original": {
@@ -30,11 +31,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713532798,
+        "lastModified": 1717408969,
-        "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",
+        "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",
+        "rev": "1ebbe68d57457c8cae98145410b164b5477761f4",
         "type": "github"
       },
       "original": {
@@ -81,11 +82,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1696343447,
+        "lastModified": 1717285511,
-        "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=",
+        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4",
+        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
         "type": "github"
       },
       "original": {
@@ -102,11 +103,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715865404,
+        "lastModified": 1717285511,
-        "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=",
+        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9",
+        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
         "type": "github"
       },
       "original": {
@@ -115,24 +116,9 @@
         "type": "github"
       }
     },
-    "flake-root": {
-      "locked": {
-        "lastModified": 1713493429,
-        "narHash": "sha256-ztz8JQkI08tjKnsTpfLqzWoKFQF4JGu2LRz8bkdnYUk=",
-        "owner": "srid",
-        "repo": "flake-root",
-        "rev": "bc748b93b86ee76e2032eecda33440ceb2532fcd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "srid",
-        "repo": "flake-root",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1701680307,
@@ -148,11 +134,38 @@
         "type": "github"
       }
     },
+    "git-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1717664902,
+        "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
           "nixvim",
-          "pre-commit-hooks",
+          "git-hooks",
           "nixpkgs"
         ]
       },
@@ -177,11 +190,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716457508,
+        "lastModified": 1717931644,
-        "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
+        "narHash": "sha256-Sz8Wh9cAiD5FhL8UWvZxBfnvxETSCVZlqWSYWaCPyu0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
+        "rev": "3d65009effd77cb0d6e7520b68b039836a7606cf",
         "type": "github"
       },
       "original": {
@@ -198,11 +211,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716448020,
+        "lastModified": 1717525419,
-        "narHash": "sha256-u1ddoBOILtLVX4NYzqSZ9Qaqusql1M4reLd1fs554hY=",
+        "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "25dedb0d52c20448f6a63cc346df1adbd6ef417e",
+        "rev": "a7117efb3725e6197dd95424136f79147aa35e5b",
         "type": "github"
       },
       "original": {
@@ -214,7 +227,7 @@
     "matugen": {
       "inputs": {
         "nixpkgs": "nixpkgs",
-        "systems": "systems"
+        "systems": "systems_2"
       },
       "locked": {
         "lastModified": 1716548249,
@@ -239,11 +252,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1716329735,
+        "lastModified": 1716993688,
-        "narHash": "sha256-ap51w+VqG21vuzyQ04WrhI2YbWHd3UGz0e7dc/QQmoA=",
+        "narHash": "sha256-vo5k2wQekfeoq/2aleQkBN41dQiQHNTniZeVONWiWLs=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "eac4f25028c1975a939c8f8fba95c12f8a25e01c",
+        "rev": "c0d5b8c54d6828516c97f6be9f2d00c63a363df4",
         "type": "github"
       },
       "original": {
@@ -270,11 +283,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1716330097,
+        "lastModified": 1717786204,
-        "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
+        "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
+        "rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
         "type": "github"
       },
       "original": {
@@ -289,21 +302,20 @@
         "devshell": "devshell",
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts_2",
-        "flake-root": "flake-root",
+        "git-hooks": "git-hooks",
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "pre-commit-hooks": "pre-commit-hooks",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1716501867,
+        "lastModified": 1718028681,
-        "narHash": "sha256-4ytMzHH3E3TTBnNv7w+v0JH+nln0kgAR8ODIC7oPuZk=",
+        "narHash": "sha256-C27X1vnsxKaKd1dCUU/u3LU+3DiA3Jo/ApvDiDNPIrI=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "56aaef010ad9afae1730337e8ce71060fbcaa542",
+        "rev": "33a32c94176feebd3ff5259ce418b989b428d5ae",
         "type": "github"
       },
       "original": {
@@ -314,11 +326,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1716543979,
+        "lastModified": 1718034680,
-        "narHash": "sha256-uGp1xBxjPL2ACagXOkazhYtE4WujXwXUI6nKiXrlEZ0=",
+        "narHash": "sha256-i6+D11kYXTF6WbGdVCDzModgpIdQKJZiro7k+xhKIls=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "8d56a7c71dd362321002041a704978e3dc23e51f",
+        "rev": "e614348f2248692fad52c28dad7ee04fbc51df51",
         "type": "github"
       },
       "original": {
@@ -327,33 +339,6 @@
         "type": "github"
       }
     },
-    "pre-commit-hooks": {
-      "inputs": {
-        "flake-compat": "flake-compat_2",
-        "gitignore": "gitignore",
-        "nixpkgs": [
-          "nixvim",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixvim",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1716213921,
-        "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "anyrun": "anyrun",
@@ -380,6 +365,21 @@
       }
     },
     "systems_2": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "systems_3": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -402,11 +402,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715940852,
+        "lastModified": 1717850719,
-        "narHash": "sha256-wJqHMg/K6X3JGAE9YLM0LsuKrKb4XiBeVaoeMNlReZg=",
+        "narHash": "sha256-npYqVg+Wk4oxnWrnVG7416fpfrlRhp/lQ6wQ4DHI8YE=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "2fba33a182602b9d49f0b2440513e5ee091d838b",
+        "rev": "4fc1c45a5f50169f9f29f6a98a438fb910b834ed",
         "type": "github"
       },
       "original": {

modules/home-manager/desktops/hyprland/kitty.nix

@@ -5,9 +5,10 @@
   extraConfig = ''
     symbol_map U+23FB-U+23FE,U+2665,U+26A1,U+2B58,U+E000-U+E00A,U+E0A0-U+E0A3,U+E0B0-U+E0D4,U+E200-U+E2A9,U+E300-U+E3E3,U+E5FA-U+E6AA,U+E700-U+E7C5,U+EA60-U+EBEB,U+F000-U+F2E0,U+F300-U+F32F,U+F400-U+F4A9,U+F500-U+F8FF,U+F0001-U+F1AF0 Symbols Nerd Font Mono
 
-    font_size 13
+    font_size 12.75
   '';
   settings = {
     window_padding_width = 10;
+    text_composition_strategy = "1.0 0";
   };
 }

modules/home-manager/programs/neovide.nix

@@ -1,13 +1,23 @@
 { pkgs, ... }:
 {
-  home.packages = [ pkgs.neovide ];
+  home.packages = [
+    (pkgs.neovide.overrideAttrs {
+      src = pkgs.fetchFromGitHub {
+        owner = "neovide";
+        repo = "neovide";
+        rev = "1db63d93b18cc1eb5ac5b3e67b3ca63505f10800";
+        hash = "sha256-iBGDxOro1yd98d5XPIw824dapuHDimuP27f/nKbh6qo=";
+      };
+    })
+  ];
   xdg.configFile."neovide/config.toml".source = (pkgs.formats.toml { }).generate "neovide" {
     maximized = false;
     fork = true;
     font = {
       normal = [ "FiraCode Nerd Font" ];
-      size = 13;
+      size = 12.75;
       edging = "subpixelantialias";
+      hinting = "full";
       features."FiraCode Nerd Font" = [
         "+zero"
         "+onum"
@@ -15,15 +25,21 @@
         "+cv19"
         "+cv23"
         "+ss09"
+        "+cv26"
         "+ss06"
-        "+ss07"
         "+ss10"
       ];
     };
   };
   programs.nixvim = {
-    extraConfigLua = # lua
+    globals = {
-      "if vim.g.neovide then vim.opt.linespace = -1 end";
+      neovide_text_gamma = 0.0;
-    globals.neovide_cursor_vfx_mode = "pixiedust";
+      neovide_text_contrast = 0.0;
+      neovide_position_animation_length = 0.3;
+      neovide_remember_window_size = false;
+      neovide_hide_mouse_when_typing = true;
+      experimental_layer_grouping = true;
+      neovide_cursor_vfx_mode = "pixiedust";
+    };
   };
 }

modules/home-manager/programs/nixvim/default.nix

@@ -37,6 +37,7 @@
     lazygit.enable = true;
     mergetool.enable = true;
     trouble.enable = true;
+    undotree.enable = true;
     base = {
       completion.enable = true;
       diagnostics.enable = true;

modules/home-manager/programs/nixvim/presets/auto-format.nix

@@ -16,20 +16,20 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    userCommands.${cfg.commandName} = {
+    userCommands.${cfg.commandName}.command.__raw = # lua
-      command = {
+      ''
-        __raw = # lua
+        function(args)
-          ''
+          if args.bang then
-            function(args)
+            vim.b.${cfg.varName} = not vim.b.${cfg.varName}
-              if args.bang then
+          else
-                vim.b.${cfg.varName} = not vim.b.${cfg.varName}
+            vim.g.${cfg.varName} = not vim.g.${cfg.varName}
-              else
+          end
-                vim.g.${cfg.varName} = not vim.g.${cfg.varName}
+          local lualine, lib = pcall(require, 'lualine')
-              end
+          if lualine then
-            end
+            lib.refresh()
-          '';
+          end
-      };
+        end
-    };
+      '';
 
     keymaps = [
       {

modules/home-manager/programs/nixvim/presets/auto-save.nix

@@ -47,18 +47,20 @@ in
 
     userCommands.${cfg.commandName} = {
       bang = true;
-      command = {
+      command.__raw = # lua
-        __raw = # lua
+        ''
-          ''
+          function(args)
-            function(args)
+            if args.bang then
-              if args.bang then
+              vim.b.${cfg.varName} = not vim.b.${cfg.varName}
-                vim.b.${cfg.varName} = not vim.b.${cfg.varName}
+            else
-              else
+              vim.g.${cfg.varName} = not vim.g.${cfg.varName}
-                vim.g.${cfg.varName} = not vim.g.${cfg.varName}
-              end
             end
-          '';
+            local lualine, lib = pcall(require, 'lualine')
-      };
+            if lualine then
+              lib.refresh()
+            end
+          end
+        '';
     };
 
     keymaps = [
@@ -85,11 +87,12 @@ in
         };
       };
 
-      neo-tree.eventHandlers.window_before_open = ''
+      neo-tree.eventHandlers.window_before_open = # lua
-        function()
+        ''
-          AutoSave()
+          function()
-        end
+            AutoSave()
-      '';
+          end
+        '';
 
       lualine.sections.lualine_x = lib.mkOrder 700 [
         "(vim.g.${cfg.varName} or vim.b.${cfg.varName}) and '󱙃' or nil"

modules/home-manager/programs/nixvim/presets/base/diagnostics.nix

@@ -13,7 +13,7 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    extraConfigLua = # lua
+    extraConfigLuaPre = # lua
       ''
         require("actions-preview").setup({})
 
@@ -42,16 +42,15 @@ in
         key = "<leader>sa";
         mode = "n";
         options.silent = true;
-        lua = true;
+        action.__raw = # lua
-        action = # lua
           "require('actions-preview').code_actions";
       }
       {
         key = "<leader>sx";
         mode = "n";
         options.silent = true;
-        lua = true;
+        action.__raw = # lua
-        action = "vim.lsp.buf.format";
+          "vim.lsp.buf.format";
       }
       {
         key = "<leader>sR";
@@ -63,8 +62,8 @@ in
         key = "<leader>sn";
         mode = "n";
         options.silent = true;
-        action = "vim.lsp.buf.hover";
+        action.__raw = # lua
-        lua = true;
+          "vim.lsp.buf.hover";
       }
     ];
     plugins = {

modules/home-manager/programs/nixvim/presets/base/status-line.nix

@@ -24,8 +24,8 @@ in
         enable = true;
         globalstatus = true;
         sectionSeparators = {
-          left = "";
+          left = ""; # "";
-          right = "";
+          right = ""; # "";
         };
         componentSeparators = {
           left = "┊";
@@ -36,8 +36,8 @@ in
             {
               name = "mode";
               separator = {
-                right = "";
+                right = ""; # "";
-                left = "";
+                left = ""; # "";
               };
               icon = "";
             }
@@ -47,8 +47,8 @@ in
             {
               name = "location";
               separator = {
-                right = "";
+                right = ""; # "";
-                left = "";
+                left = ""; # "";
               };
             }
           ];

modules/home-manager/programs/nixvim/presets/languages/angular.nix

@@ -21,8 +21,8 @@ in
               "--ngProbeLocations"
               ""
             ];
-            on_new_config = {
+            on_new_config.__raw = # lua
-              __raw = ''
+              ''
                 function(new_config, new_root_dir)
                   new_config.cmd = {
                     new_root_dir .. "/node_modules/@angular/language-server/bin/ngserver",
@@ -34,7 +34,6 @@ in
                   }
                 end
               '';
-            };
             filetypes = [
               "typescript"
               "html"
@@ -43,15 +42,14 @@ in
               "angular"
               "html.angular"
             ];
-            on_attach = {
+            on_attach.__raw = # lua
-              __raw = ''
+              ''
                 function(client, bufnr)
                   if vim.bo[bufnr].filetype == "html" then
                     vim.bo[bufnr].filetype = "angular"
                   end
                 end
               '';
-            };
           };
         }
       ];

modules/home-manager/programs/nixvim/presets/languages/js.nix

@@ -15,21 +15,24 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    extraConfigLua = lib.mkIf cfg.npm ''
+    extraConfigLua =
-      require("cmp-npm").setup({})
+      lib.mkIf cfg.npm # lua
-    '';
+        ''
+          require("cmp-npm").setup({})
+        '';
     plugins = {
       lspkind = lib.mkIf cfg.npm {
-        cmp.after = ''
+        cmp.after = # lua
-          function(entry, vim_item, kind)
+          ''
-            if entry.source.name == "npm" then
+            function(entry, vim_item, kind)
-              kind.kind = ""
+              if entry.source.name == "npm" then
-              kind.kind_hl_group = "CmpItemKindNpm"
+                kind.kind = ""
+                kind.kind_hl_group = "CmpItemKindNpm"
+              end
+              kind.kind = kind.kind .. " "
+              return kind
             end
-            kind.kind = kind.kind .. " "
+          '';
-            return kind
-          end
-        '';
       };
       cmp.settings.sources = lib.mkIf cfg.npm [
         {

modules/home-manager/programs/nixvim/presets/languages/nix.nix

@@ -15,7 +15,7 @@ in
   config = lib.mkIf cfg.enable {
     plugins = {
       conform-nvim.formattersByFt.nix = [ "nixfmt" ];
-      lsp.servers.nil_ls.enable = true;
+      lsp.servers.nil-ls.enable = true;
       nix.enable = true;
     };
     extraPackages = [ pkgs.nixfmt-rfc-style ];

modules/home-manager/programs/nixvim/presets/lazygit.nix

@@ -42,16 +42,12 @@ in
         end
       '';
 
-    userCommands.${cfg.commandName} = {
+    userCommands.${cfg.commandName}.command.__raw = # lua
-      command = {
+      ''
-        __raw = # lua
+        function()
-          ''
+          LazygitTerminal:toggle()
-            function()
+        end
-              LazygitTerminal:toggle()
+      '';
-            end
-          '';
-      };
-    };
 
     keymaps = [
       {

modules/home-manager/programs/nixvim/presets/trouble.nix

@@ -12,36 +12,31 @@ in
       {
         key = "<leader>xx";
         mode = "n";
-        lua = true;
+        action.__raw = # lua
-        action = # lua
           "require('trouble').toggle";
       }
       {
         key = "<leader>xw";
         mode = "n";
-        lua = true;
+        action.__raw = # lua
-        action = # lua
           "function() require('trouble').toggle('workspace_diagnostics') end";
       }
       {
         key = "<leader>xd";
         mode = "n";
-        lua = true;
+        action.__raw = # lua
-        action = # lua
           "function() require('trouble').toggle('document_diagnostics') end";
       }
       {
         key = "<leader>xq";
         mode = "n";
-        lua = true;
+        action.__raw = # lua
-        action = # lua
           "function() require('trouble').toggle('quickfix') end";
       }
       {
         key = "<leader>xl";
         mode = "n";
-        lua = true;
+        action.__raw = # lua
-        action = # lua
           "function() require('trouble').toggle('loclist') end";
       }
     ];

modules/home-manager/programs/nixvim/presets/undotree.nix

@@ -9,10 +9,8 @@ in
 
   config = lib.mkIf cfg.enable {
     opts = {
-      undodir = {
+      undodir.__raw = # lua
-        __raw = # lua
+        "os.getenv('HOME') .. '/.config/nvim/undodir'";
-          "os.getenv('HOME') .. '/.config/nvim/undodir'";
-      };
       undofile = true;
     };
     plugins = {

modules/home-manager/theme/md3-evo.nix

@@ -257,9 +257,13 @@ in
         {
           event = [ "Signal" ];
           pattern = [ "SIGUSR1" ];
-          command = "colorscheme md3-evo";
+          command = # vim
+            "colorscheme md3-evo";
+          nested = true;
         }
       ];
+      plugins.lualine.theme.__raw = # lua
+        "function() return vim.g.lualine_theme end";
     };
 
     gtk = {

modules/home-manager/theme/nvim.vim

@@ -1,4 +1,8 @@
-set background=dark
+hi clear
+if exists("syntax_on")
+  syntax reset
+endif
+let g:colors_name="md3-evo"
 
 let g:neovide_transparency = {{custom.transparency}}
 let g:neovide_padding_top = {{custom.padding}}
@@ -9,15 +13,6 @@ let g:neovide_floating_blur_amount_x = {{custom.blur}}
 let g:neovide_floating_blur_amount_y = {{custom.blur}}
 let g:neovide_floating_shadow = 0
 
-if exists("g:neovide")
-  hi Normal guibg={{colors.surface.default.hex}} guifg={{colors.on_surface.default.hex}}
-  set pumblend=0
-  set winblend=0
-else
-  hi Normal ctermbg=NONE guibg=NONE guifg={{colors.on_surface.default.hex}}
-  set noshowmode
-end
-
 let g:terminal_color_0 = "{{colors.surface.default.hex}}"
 let g:terminal_color_1 = "{{colors.red.default.hex}}"
 let g:terminal_color_2 = "{{colors.green.default.hex}}"
@@ -37,173 +32,184 @@ let g:terminal_color_14 = "{{colors.cyan.default.hex}}"
 let g:terminal_color_15 = "{{colors.on_surface_variant.default.hex}}"
 set termguicolors
 
-hi Pmenu ctermbg=none guibg=none guifg={{colors.on_surface.default.hex}}
+set background=dark
-hi PmenuSel guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
-hi CursorColumn guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
-hi CursorLine guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
-hi WildMenu guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
-hi MoreMsg guifg={{colors.primary.default.hex}}
-hi Question guifg={{colors.secondary.default.hex}}
 
-hi Title guifg={{colors.primary.default.hex}}
+if exists("g:neovide")
-hi FloatTitle guifg={{colors.primary.default.hex}}
+  hi! Normal guibg={{colors.surface.default.hex}} guifg={{colors.on_surface.default.hex}}
-hi Visual guifg={{colors.on_primary.default.hex}} guibg={{colors.primary.default.hex}}
+  set pumblend=0
+  set winblend=0
+else
+  hi! Normal ctermbg=NONE guibg=NONE guifg={{colors.on_surface.default.hex}}
+end
 
-hi Folded guibg={{colors.secondary.default.hex}} guifg={{colors.on_secondary.default.hex}}
+hi! Pmenu ctermbg=none guibg=none guifg={{colors.on_surface.default.hex}}
-hi FoldColumn guibg={{colors.secondary.default.hex}} guifg={{colors.on_secondary.default.hex}}
+hi! PmenuSel guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
+hi! CursorColumn guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
+hi! CursorLine guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
+hi! WildMenu guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
+hi! MoreMsg guifg={{colors.primary.default.hex}}
+hi! Question guifg={{colors.secondary.default.hex}}
 
-hi Conceal guibg={{colors.secondary_container.default.hex}} guifg={{colors.on_secondary_container.default.hex}}
+hi! Title guifg={{colors.primary.default.hex}}
+hi! FloatTitle guifg={{colors.primary.default.hex}}
+hi! Visual guifg={{colors.on_primary.default.hex}} guibg={{colors.primary.default.hex}}
 
-hi TabLine guibg={{colors.primary_container.default.hex}} guifg={{colors.on_primary_container.default.hex}}
+hi! Folded guibg={{colors.secondary.default.hex}} guifg={{colors.on_secondary.default.hex}}
-hi TabLineFill guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
+hi! FoldColumn guibg={{colors.secondary.default.hex}} guifg={{colors.on_secondary.default.hex}}
 
-hi SpecialKey guifg={{colors.primary.default.hex}}
+hi! Conceal guibg={{colors.secondary_container.default.hex}} guifg={{colors.on_secondary_container.default.hex}}
-hi Directory guifg={{colors.primary.default.hex}}
-hi Search guifg={{colors.on_tertiary.default.hex}} guibg={{colors.tertiary.default.hex}}
 
-hi CmpItemKindCopilot guifg={{colors.cyan.default.hex}}
+hi! TabLine guibg={{colors.primary_container.default.hex}} guifg={{colors.on_primary_container.default.hex}}
-hi CmpItemKindNpm guifg={{colors.red.default.hex}}
+hi! TabLineFill guibg={{colors.primary.default.hex}} guifg={{colors.on_primary.default.hex}}
 
-hi Error guibg={{colors.danger_container.default.hex}} guifg={{colors.on_danger_container.default.hex}}
+hi! SpecialKey guifg={{colors.primary.default.hex}}
-hi ErrorMsg guibg={{colors.danger_container.default.hex}} guifg={{colors.on_danger_container.default.hex}}
+hi! Directory guifg={{colors.primary.default.hex}}
-hi WarningMsg guibg={{colors.warning_container.default.hex}} guifg={{colors.on_warning_container.default.hex}}
+hi! Search guifg={{colors.on_tertiary.default.hex}} guibg={{colors.tertiary.default.hex}}
-hi NvimInternalError guibg={{colors.danger.default.hex}} guifg={{colors.on_danger.default.hex}}
 
-hi DiagnosticError guifg={{colors.danger.default.hex}}
+hi! CmpItemKindCopilot guifg={{colors.cyan.default.hex}}
-hi DiagnosticWarn guifg={{colors.warning.default.hex}}
+hi! CmpItemKindNpm guifg={{colors.red.default.hex}}
-hi DiagnosticInfo guifg={{colors.info.default.hex}}
-hi DiagnosticHint guifg={{colors.outline.default.hex}}
-hi DiagnosticOk guifg={{colors.success.default.hex}}
 
-hi RedrawDebugNormal guibg={{colors.surface_variant.default.hex}} guifg={{colors.on_surface_variant.default.hex}}
+hi! Error guibg={{colors.danger_container.default.hex}} guifg={{colors.on_danger_container.default.hex}}
-hi RedrawDebugClear guibg={{colors.warning.default.hex}} guifg={{colors.on_warning.default.hex}}
+hi! ErrorMsg guibg={{colors.danger_container.default.hex}} guifg={{colors.on_danger_container.default.hex}}
-hi RedrawDebugComposed guibg={{colors.success.default.hex}} guifg={{colors.on_success.default.hex}}
+hi! WarningMsg guibg={{colors.warning_container.default.hex}} guifg={{colors.on_warning_container.default.hex}}
-hi RedrawDebugRecompose guibg={{colors.danger.default.hex}} guifg={{colors.on_danger.default.hex}}
+hi! NvimInternalError guibg={{colors.danger.default.hex}} guifg={{colors.on_danger.default.hex}}
 
-hi DiagnosticUnderlineError gui=undercurl guisp={{colors.danger.default.hex}}
+hi! DiagnosticError guifg={{colors.danger.default.hex}}
-hi DiagnosticUnderlineWarn gui=undercurl guisp={{colors.warning.default.hex}}
+hi! DiagnosticWarn guifg={{colors.warning.default.hex}}
-hi DiagnosticUnderlineInfo gui=undercurl guisp={{colors.info.default.hex}}
+hi! DiagnosticInfo guifg={{colors.info.default.hex}}
-hi DiagnosticUnderlineHint gui=undercurl guisp={{colors.outline.default.hex}}
+hi! DiagnosticHint guifg={{colors.outline.default.hex}}
-hi DiagnosticUnderlineOk gui=undercurl guisp={{colors.success.default.hex}}
+hi! DiagnosticOk guifg={{colors.success.default.hex}}
-hi DiagnosticDeprecated gui=strikethrough guisp={{colors.danger.default.hex}}
 
-hi SpellBad gui=undercurl guisp={{colors.success.default.hex}}
+hi! RedrawDebugNormal guibg={{colors.surface_variant.default.hex}} guifg={{colors.on_surface_variant.default.hex}}
-hi SpellCap gui=undercurl guisp={{colors.success.default.hex}}
+hi! RedrawDebugClear guibg={{colors.warning.default.hex}} guifg={{colors.on_warning.default.hex}}
-hi SpellRare gui=undercurl guisp={{colors.success.default.hex}}
+hi! RedrawDebugComposed guibg={{colors.success.default.hex}} guifg={{colors.on_success.default.hex}}
-hi SpellLocal gui=undercurl guisp={{colors.success.default.hex}}
+hi! RedrawDebugRecompose guibg={{colors.danger.default.hex}} guifg={{colors.on_danger.default.hex}}
 
-hi DiffAdd guibg={{colors.green_container.default.hex}} guifg={{colors.on_green_container.default.hex}}
+hi! DiagnosticUnderlineError gui=undercurl guisp={{colors.danger.default.hex}}
-hi DiffChange guibg={{colors.yellow_container.default.hex}} guifg={{colors.on_yellow_container.default.hex}}
+hi! DiagnosticUnderlineWarn gui=undercurl guisp={{colors.warning.default.hex}}
-hi DiffDelete guibg={{colors.red_container.default.hex}} guifg={{colors.on_red_container.default.hex}}
+hi! DiagnosticUnderlineInfo gui=undercurl guisp={{colors.info.default.hex}}
-hi DiffText guibg={{colors.blue_container.default.hex}} guifg={{colors.on_blue_container.default.hex}}
+hi! DiagnosticUnderlineHint gui=undercurl guisp={{colors.outline.default.hex}}
+hi! DiagnosticUnderlineOk gui=undercurl guisp={{colors.success.default.hex}}
+hi! DiagnosticDeprecated gui=strikethrough guisp={{colors.danger.default.hex}}
 
-hi NeoTreeGitAdded guifg={{colors.green.default.hex}}
+hi! SpellBad gui=undercurl guisp={{colors.success.default.hex}}
-hi NeoTreeGitDeleted guifg={{colors.red.default.hex}}
+hi! SpellCap gui=undercurl guisp={{colors.success.default.hex}}
-hi NeoTreeGitModified guifg={{colors.yellow.default.hex}}
+hi! SpellRare gui=undercurl guisp={{colors.success.default.hex}}
-hi NeoTreeGitConflict guifg={{colors.danger.default.hex}}
+hi! SpellLocal gui=undercurl guisp={{colors.success.default.hex}}
-hi NeoTreeGitUntracked guifg={{colors.blue.default.hex}}
 
-hi NonText guifg={{colors.outline_variant.default.hex}}
+hi! DiffAdd guibg={{colors.green_container.default.hex}} guifg={{colors.on_green_container.default.hex}}
-hi LineNr guifg={{colors.outline_variant.default.hex}}
+hi! DiffChange guibg={{colors.yellow_container.default.hex}} guifg={{colors.on_yellow_container.default.hex}}
-hi CursorLineNr guifg={{colors.on_surface.default.hex}}
+hi! DiffDelete guibg={{colors.red_container.default.hex}} guifg={{colors.on_red_container.default.hex}}
-hi SignColumn guibg=none guifg={{colors.on_surface.default.hex}}
+hi! DiffText guibg={{colors.blue_container.default.hex}} guifg={{colors.on_blue_container.default.hex}}
 
-hi IblScope guifg={{colors.on_surface.default.hex}}
+hi! NeoTreeGitAdded guifg={{colors.green.default.hex}}
-hi @ibl.scope.char.1 guifg={{colors.on_surface.default.hex}}
+hi! NeoTreeGitDeleted guifg={{colors.red.default.hex}}
-hi @ibl.scope.underline.1 guisp={{colors.on_surface.default.hex}}
+hi! NeoTreeGitModified guifg={{colors.yellow.default.hex}}
+hi! NeoTreeGitConflict guifg={{colors.danger.default.hex}}
+hi! NeoTreeGitUntracked guifg={{colors.blue.default.hex}}
 
-hi Comment guifg={{colors.outline.default.hex}}
+hi! NonText guifg={{colors.outline_variant.default.hex}}
-hi Todo guibg={{colors.yellow_container.default.hex}} guifg={{colors.on_yellow_container.default.hex}}
+hi! LineNr guifg={{colors.outline_variant.default.hex}}
-hi def link @comment.todo Todo
+hi! CursorLineNr guifg={{colors.on_surface.default.hex}}
-hi def link @comment.error Error
+hi! SignColumn guibg=none guifg={{colors.on_surface.default.hex}}
 
-hi String guifg={{colors.strings.default.hex}}
+hi! IblScope guifg={{colors.on_surface.default.hex}}
+hi! @ibl.scope.char.1 guifg={{colors.on_surface.default.hex}}
+hi! @ibl.scope.underline.1 guisp={{colors.on_surface.default.hex}}
 
-hi Identifier guifg={{colors.on_surface.default.hex}}
+hi! Comment guifg={{colors.outline.default.hex}}
-hi Statement gui=bold guifg={{colors.on_surface.default.hex}}
+hi! Todo guibg={{colors.yellow_container.default.hex}} guifg={{colors.on_yellow_container.default.hex}}
-hi def link Operator Normal
+hi! link @comment.todo Todo
-hi @conditional.ternary guifg={{colors.on_surface.default.hex}}
+hi! link @comment.error Error
-hi def link @keyword.conditional.ternary Operator
-hi def link Delimiter Normal
-hi def link @lsp.mod.local Normal
-hi def link @parameter Identifier
 
-hi @lsp.mod.defaultLibrary gui=bold
+hi! String guifg={{colors.strings.default.hex}}
-hi @lsp.mod.readonly gui=italic
 
-hi Constant guifg={{colors.constants.default.hex}}
+hi! Identifier guifg={{colors.on_surface.default.hex}}
-hi def link @variable Constant
+hi! @variable guifg={{colors.on_surface.default.hex}}
+hi! Operator guifg={{colors.on_surface.default.hex}}
+hi! Delimiter guifg={{colors.on_surface.default.hex}}
+hi! Statement gui=bold guifg={{colors.on_surface.default.hex}}
+hi! link Operator Normal
+hi! @conditional.ternary guifg={{colors.on_surface.default.hex}}
+hi! link @keyword.conditional.ternary Operator
+hi! link Delimiter Normal
+hi! link @lsp.mod.local Normal
+hi! link @parameter Identifier
 
-hi @property guifg={{colors.properties.default.hex}}
+hi! @lsp.mod.defaultLibrary gui=bold
-hi def link @field @property
+hi! @lsp.mod.readonly gui=italic
-hi def link @label.json @property
-hi def link @label.jsonc @label.json
-hi def link @property.typescript @property
-hi def link @lsp.type.property @property
-hi def link @attribute @property
-hi def link @tag.attribute @property
 
-hi def link @lsp.type.variable Constant
+hi! Constant guifg={{colors.constants.default.hex}}
-hi def link @lsp.typemod.variable.local Identifier
 
-hi Keyword guifg={{colors.keywords.default.hex}}
+hi! @property guifg={{colors.properties.default.hex}}
-hi Special guifg={{colors.keywords.default.hex}}
+hi! link @field @property
-hi def link Character Keyword
+hi! link @variable.member @property
-hi def link Boolean Keyword
+hi! link @label.json @property
-hi def link Repeat Keyword
+hi! link @label.jsonc @label.json
-hi def link Label Keyword
+hi! link @property.typescript @property
-hi def link Exception Keyword
+hi! link @lsp.type.property @property
-hi def link Include Keyword
+hi! link @attribute @property
-hi def link Conditional Keyword
+hi! link @tag.attribute @property
-hi def link @type.builtin Keyword
 
-hi Number guifg={{colors.numbers.default.hex}}
+hi! link @lsp.type.variable Constant
-hi Function guifg={{colors.functions.default.hex}}
+hi! link @lsp.typemod.variable.local Identifier
 
-hi Structure guifg={{colors.structures.default.hex}}
+hi! Keyword guifg={{colors.keywords.default.hex}}
-hi def link PreProc Structure
+hi! Special guifg={{colors.keywords.default.hex}}
-hi def link Tag Structure
+hi! link Character Keyword
-hi def link @attribute.typescript Structure
+hi! link Boolean Keyword
+hi! link Repeat Keyword
+hi! link Label Keyword
+hi! link Exception Keyword
+hi! link Include Keyword
+hi! link Conditional Keyword
+hi! link @type.builtin Keyword
 
-hi Type gui=none guifg={{colors.types.default.hex}}
+hi! Number guifg={{colors.numbers.default.hex}}
-hi def link @lsp.type.interface Type
+hi! Function guifg={{colors.functions.default.hex}}
 
-hi IlluminatedWordText gui=none guibg={{colors.surface_container_highest.default.hex}}
+hi! Structure guifg={{colors.structures.default.hex}}
-hi IlluminatedWordRead gui=none guibg={{colors.surface_container_highest.default.hex}}
+hi! link PreProc Structure
-hi IlluminatedWordWrite gui=none guibg={{colors.surface_container_highest.default.hex}}
+hi! link Tag Structure
-hi MatchParen gui=none guibg={{colors.surface_container_highest.default.hex}}
+hi! link @attribute.typescript Structure
 
-:lua require('lualine').setup({options = {theme = {
+hi! Type gui=none guifg={{colors.types.default.hex}}
-  \  insert = {
+hi! link @lsp.type.interface Type
-  \    a = {fg = "{{colors.on_green.default.hex}}", bg = "{{colors.green.default.hex}}", gui = "bold"},
+
-  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
+hi! IlluminatedWordText gui=none guibg={{colors.surface_container_highest.default.hex}}
-  \    c = {fg = "{{colors.on_surface.default.hex}}", bg = "{{colors.surface.default.hex}}"},
+hi! IlluminatedWordRead gui=none guibg={{colors.surface_container_highest.default.hex}}
+hi! IlluminatedWordWrite gui=none guibg={{colors.surface_container_highest.default.hex}}
+hi! MatchParen gui=none guibg={{colors.surface_container_highest.default.hex}}
+
+let g:lualine_theme = {
+  \  "insert": {
+  \    "a": {"fg": "{{colors.on_green.default.hex}}", "bg": "{{colors.green.default.hex}}", "gui": "bold"},
+  \    "b": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}"},
+  \    "c": {"fg": "{{colors.on_surface.default.hex}}", "bg": "{{colors.surface.default.hex}}"},
   \  },
-  \  normal = {
+  \  "normal": {
-  \    a = {fg = "{{colors.on_primary.default.hex}}", bg = "{{colors.primary.default.hex}}", gui = "bold"},
+  \    "a": {"fg": "{{colors.on_primary.default.hex}}", "bg": "{{colors.primary.default.hex}}", "gui": "bold"},
-  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
+  \    "b": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}"},
-  \    c = {fg = "{{colors.on_surface.default.hex}}", bg = "{{colors.surface.default.hex}}"},
+  \    "c": {"fg": "{{colors.on_surface.default.hex}}", "bg": "{{colors.surface.default.hex}}"},
   \  },
-  \  command = {
+  \  "command": {
-  \    a = {fg = "{{colors.on_tertiary.default.hex}}", bg = "{{colors.tertiary.default.hex}}", gui = "bold"},
+  \    "a": {"fg": "{{colors.on_tertiary.default.hex}}", "bg": "{{colors.tertiary.default.hex}}", "gui": "bold"},
-  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
+  \    "b": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}"},
-  \    c = {fg = "{{colors.on_surface.default.hex}}", bg = "{{colors.surface.default.hex}}"},
+  \    "c": {"fg": "{{colors.on_surface.default.hex}}", "bg": "{{colors.surface.default.hex}}"},
   \  },
-  \  visual = {
+  \  "visual": {
-  \    a = {fg = "{{colors.on_magenta.default.hex}}", bg = "{{colors.magenta.default.hex}}", gui = "bold"},
+  \    "a": {"fg": "{{colors.on_magenta.default.hex}}", "bg": "{{colors.magenta.default.hex}}", "gui": "bold"},
-  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
+  \    "b": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}"},
-  \    c = {fg = "{{colors.on_surface.default.hex}}", bg = "{{colors.surface.default.hex}}"},
+  \    "c": {"fg": "{{colors.on_surface.default.hex}}", "bg": "{{colors.surface.default.hex}}"},
   \  },
-  \  replace = {
+  \  "replace": {
-  \    a = {fg = "{{colors.on_red.default.hex}}", bg = "{{colors.red.default.hex}}", gui = "bold"},
+  \    "a": {"fg": "{{colors.on_red.default.hex}}", "bg": "{{colors.red.default.hex}}", "gui": "bold"},
-  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
+  \    "b": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}"},
-  \    c = {fg = "{{colors.on_surface.default.hex}}", bg = "{{colors.surface.default.hex}}"},
+  \    "c": {"fg": "{{colors.on_surface.default.hex}}", "bg": "{{colors.surface.default.hex}}"},
   \  },
-  \  inactive = {
+  \  "inactive": {
-  \    a = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}", gui = "bold"},
+  \    "a": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}", "gui": "bold"},
-  \    b = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
+  \    "b": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}"},
-  \    c = {fg = "{{colors.on_surface_variant.default.hex}}", bg = "{{colors.surface_variant.default.hex}}"},
+  \    "c": {"fg": "{{colors.on_surface_variant.default.hex}}", "bg": "{{colors.surface_variant.default.hex}}"},
   \  },
-  \} } })
+  \}
-
-lua require('nvim-web-devicons').refresh()

modules/nixos/fonts/fira-code.nix

@@ -22,8 +22,8 @@ in
         "cv19"
         "cv23"
         "ss09"
+        "cv26"
         "ss06"
-        "ss07"
         "ss10"
       ];
     };