style: switch to Catppuccin and JetbrainsMono

flake.lock

@@ -254,11 +254,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1746902926,
+        "lastModified": 1747742635,
-        "narHash": "sha256-PNZeR2LT4NuP+5IMQUGvXvzKvqs35JuFMZLQgnyOLYA=",
+        "narHash": "sha256-fZNk+9hibQkULxY8c+ETnFQQopA2WRdPEXdwmjleXys=",
         "owner": "helix-editor",
         "repo": "helix",
-        "rev": "63a1a94d924edc3fadb9ca632a37d71abe6a202c",
+        "rev": "3a6c9747b8de3350c38ba504916233d9d4c33c5c",
         "type": "github"
       },
       "original": {
@@ -393,11 +393,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1746981380,
+        "lastModified": 1747610850,
-        "narHash": "sha256-DtbrvHzKF4diOJWx1FB5wIh8SCSk1Iq5pkA7mh3JAJc=",
+        "narHash": "sha256-b41pc9J8b9fxRFHBQRKoTXZHpAsKW5eJbNsTMris2Mo=",
         "owner": "hyprwm",
         "repo": "hyprland",
-        "rev": "04124988e8b4a9cdfc5995388ebfaad0005b4b31",
+        "rev": "eb3b38d40baca5c05ddbc1507b3d3f02a0ccb164",
         "type": "github"
       },
       "original": {
@@ -605,11 +605,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1746809399,
+        "lastModified": 1747056319,
-        "narHash": "sha256-rMYfYaUpKuyMpDnodIfgFOnj6Wn0duItZvG4kQODcZo=",
+        "narHash": "sha256-qSKcBaISBozadtPq6BomnD+wIYTZIkiua3UuHLaD52c=",
         "owner": "nix-community",
         "repo": "lanzaboote",
-        "rev": "8f27abb5e623d83db4988ee3e864df48181e7c30",
+        "rev": "2e425f3da6ce7f5b34fa6eaf7a2a7f78dbabcc85",
         "type": "github"
       },
       "original": {
@@ -709,11 +709,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1746904237,
+        "lastModified": 1747542820,
-        "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",
+        "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",
+        "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
         "type": "github"
       },
       "original": {
@@ -749,11 +749,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746537231,
+        "lastModified": 1747372754,
-        "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",
+        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",
+        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
         "type": "github"
       },
       "original": {
@@ -795,11 +795,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747013431,
+        "lastModified": 1747638064,
-        "narHash": "sha256-gCQprMblYaezaC/vkqeIXeayJvzgg5UMEY/kb/Ivp/k=",
+        "narHash": "sha256-juEWrS6mOnlU5hva6sewhlRxTFc3cV8bV2Tt3xyTlcg=",
         "ref": "refs/heads/master",
-        "rev": "ca26210cc48bf48a42ad820e25fa884cc122b7b4",
+        "rev": "02e06ea5774eeb3af982a483e5c7e949d276eafc",
-        "revCount": 508,
+        "revCount": 535,
         "type": "git",
         "url": "https://git.outfoxxed.me/outfoxxed/quickshell"
       },
@@ -851,11 +851,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746671794,
+        "lastModified": 1747017456,
-        "narHash": "sha256-V+mpk2frYIEm85iYf+KPDmCGG3zBRAEhbv0E3lHdG2U=",
+        "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "ceec434b8741c66bb8df5db70d7e629a9d9c598f",
+        "rev": "5b07506ae89b025b14de91f697eba23b48654c52",
         "type": "github"
       },
       "original": {
@@ -918,11 +918,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1747458668,
+        "lastModified": 1747578749,
-        "narHash": "sha256-5/PsESjQUuEbPTd+8rHHUItN/cW9USFJAm6y5yksTDQ=",
+        "narHash": "sha256-MR8NuCe3Xq2MNLPdKE3+4VVw2e+UlwwDTM3U3RMJRig=",
         "owner": "notashelf",
         "repo": "superfreq",
-        "rev": "6ef0a60002cd95861e3b30e74b62d89bf7f7b905",
+        "rev": "6bdbc7e0ecd06866b940765942c6abe2fbad5ec7",
         "type": "github"
       },
       "original": {

modules/style/colors.nix

@@ -35,7 +35,7 @@ in {
       name = mkOption {
         type = nullOr (enum ["Catppuccin Mocha" "Zenburn" "Black Metal Venom" "Gruvbox"]);
         description = "The colorscheme that should be used globally to theme your system.";
-        default = "Black Metal Venom";
+        default = "Catppuccin Mocha";
       };
 
       slug = mkOption {

modules/style/fonts.nix

@@ -25,6 +25,7 @@ in {
           "Fira Code Nerd Font"
           "Symbols Nerd Font"
           "Noto Color Emoji"
+          "JetbrainsMono Nerd Font"
         ];
       in
         mapAttrs (_: fonts: fonts ++ common) {

packages/helix/default.nix

@@ -14,6 +14,7 @@
   formats,
   gdb,
   golangci-lint-langserver,
+  deadnix,
   gopls,
   lazygit,
   lib,
@@ -141,6 +142,7 @@
       # typst lsp
       vscode-langservers-extracted
 
+      deadnix
       # zig language server
       zls
     ];

packages/helix/languages.nix

@@ -17,9 +17,10 @@
   typescript-language-server,
   vscode-langservers-extracted,
   simple-completion-language-server,
+  zls,
   ...
 }: let
-  inherit (lib.meta) getExe;
+  inherit (lib.meta) getExe getExe';
 
   toml = formats.toml {};
 
@@ -102,6 +103,10 @@
         auto-format = true;
         language-servers = ["clangd"];
       }
+      {
+        name = "zig";
+        auto-format = true;
+      }
       {
         name = "c";
         debugger = {
@@ -154,7 +159,7 @@
       };
 
       deno-lsp = {
-        command = lib.getExe deno;
+        command = getExe deno;
         args = ["lsp"];
         environment.NO_COLOR = "1";
         config.deno = {
@@ -201,7 +206,7 @@
       };
 
       typescript-language-server = {
-        command = lib.getExe typescript-language-server;
+        command = getExe typescript-language-server;
         args = ["--stdio"];
         config = {
           typescript-language-server.source = {
@@ -214,12 +219,12 @@
         };
       };
       ruff = {
-        command = lib.getExe ruff;
+        command = getExe ruff;
         args = ["server"];
       };
 
       qmlls = {
-        command = lib.getExe' kdePackages.qtdeclarative "qmlls";
+        command = getExe' kdePackages.qtdeclarative "qmlls";
         args = ["-E"];
       };
       basedpyright.command = "${basedpyright}/bin/basedpyright-langserver";
@@ -233,6 +238,16 @@
           scss.validate.enable = true;
         };
       };
+      zls = {
+        command = getExe zls;
+        config = {
+          enable_build_on_save = true;
+          build_on_save_args = ["check" "-fincremental" "--watch"];
+          enable_autofix = false;
+          warn_style = true;
+          highlight_global_var_declarations = true;
+        };
+      };
     };
   };
 in

packages/shell/aliases.nix

@@ -1,8 +1,8 @@
 {pkgs, ...}: let
   inherit (pkgs.lib) getExe;
 in {
-  ls = "${getExe pkgs.eza} --icons";
+  ls = "${getExe pkgs.eza} --icons=never";
-  la = "${getExe pkgs.eza} --icons -lha --git";
+  la = "${getExe pkgs.eza} --icons=never -lha --git";
 
   g = "git";
   n = "nix";