From fb300098728a5b6bfaaebdccd117bcd374c303b0 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Tue, 13 May 2025 22:46:50 +0200 Subject: [PATCH 1/5] flake.lock: bump inputs --- flake.lock | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/flake.lock b/flake.lock index 35727b3..bee0bec 100644 --- a/flake.lock +++ b/flake.lock @@ -254,11 +254,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1746902926, - "narHash": "sha256-PNZeR2LT4NuP+5IMQUGvXvzKvqs35JuFMZLQgnyOLYA=", + "lastModified": 1747742635, + "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, - "narHash": "sha256-DtbrvHzKF4diOJWx1FB5wIh8SCSk1Iq5pkA7mh3JAJc=", + "lastModified": 1747610850, + "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, - "narHash": "sha256-rMYfYaUpKuyMpDnodIfgFOnj6Wn0duItZvG4kQODcZo=", + "lastModified": 1747056319, + "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, - "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=", + "lastModified": 1747542820, + "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956", + "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", "type": "github" }, "original": { @@ -749,11 +749,11 @@ ] }, "locked": { - "lastModified": 1746537231, - "narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "fa466640195d38ec97cf0493d6d6882bc4d14969", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -795,11 +795,11 @@ ] }, "locked": { - "lastModified": 1747013431, - "narHash": "sha256-gCQprMblYaezaC/vkqeIXeayJvzgg5UMEY/kb/Ivp/k=", + "lastModified": 1747638064, + "narHash": "sha256-juEWrS6mOnlU5hva6sewhlRxTFc3cV8bV2Tt3xyTlcg=", "ref": "refs/heads/master", - "rev": "ca26210cc48bf48a42ad820e25fa884cc122b7b4", - "revCount": 508, + "rev": "02e06ea5774eeb3af982a483e5c7e949d276eafc", + "revCount": 535, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, @@ -851,11 +851,11 @@ ] }, "locked": { - "lastModified": 1746671794, - "narHash": "sha256-V+mpk2frYIEm85iYf+KPDmCGG3zBRAEhbv0E3lHdG2U=", + "lastModified": 1747017456, + "narHash": "sha256-C/U12fcO+HEF071b5mK65lt4XtAIZyJSSJAg9hdlvTk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ceec434b8741c66bb8df5db70d7e629a9d9c598f", + "rev": "5b07506ae89b025b14de91f697eba23b48654c52", "type": "github" }, "original": { @@ -918,11 +918,11 @@ ] }, "locked": { - "lastModified": 1747458668, - "narHash": "sha256-5/PsESjQUuEbPTd+8rHHUItN/cW9USFJAm6y5yksTDQ=", + "lastModified": 1747578749, + "narHash": "sha256-MR8NuCe3Xq2MNLPdKE3+4VVw2e+UlwwDTM3U3RMJRig=", "owner": "notashelf", "repo": "superfreq", - "rev": "6ef0a60002cd95861e3b30e74b62d89bf7f7b905", + "rev": "6bdbc7e0ecd06866b940765942c6abe2fbad5ec7", "type": "github" }, "original": { From a6972fc6f33b0e608977d3b55b22d4d5fe0f7eb5 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 21 May 2025 00:20:42 +0200 Subject: [PATCH 2/5] helix: add deadnix --- packages/helix/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/helix/default.nix b/packages/helix/default.nix index fcb2e40..1d1e8a0 100644 --- a/packages/helix/default.nix +++ b/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 ]; From 4cea4192a15e207ed495d0171e603cdec845a1ac Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 21 May 2025 00:20:59 +0200 Subject: [PATCH 3/5] aliases.nix: make ls show no icons --- packages/shell/aliases.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/shell/aliases.nix b/packages/shell/aliases.nix index de33835..13bedee 100644 --- a/packages/shell/aliases.nix +++ b/packages/shell/aliases.nix @@ -1,8 +1,8 @@ {pkgs, ...}: let inherit (pkgs.lib) getExe; in { - ls = "${getExe pkgs.eza} --icons"; - la = "${getExe pkgs.eza} --icons -lha --git"; + ls = "${getExe pkgs.eza} --icons=never"; + la = "${getExe pkgs.eza} --icons=never -lha --git"; g = "git"; n = "nix"; From 641baa4989767daaae7c4ad20c8321a261d64707 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 21 May 2025 00:21:11 +0200 Subject: [PATCH 4/5] helix: languages: cleanup --- packages/helix/languages.nix | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/packages/helix/languages.nix b/packages/helix/languages.nix index 501f536..39fec6b 100644 --- a/packages/helix/languages.nix +++ b/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 From 86e8bb500a3fe3f28c716dd2a9ff20020734f431 Mon Sep 17 00:00:00 2001 From: Bloxx12 Date: Wed, 21 May 2025 00:21:24 +0200 Subject: [PATCH 5/5] style: switch to Catppuccin and JetbrainsMono --- modules/style/colors.nix | 2 +- modules/style/fonts.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/style/colors.nix b/modules/style/colors.nix index 800bfc0..8b6dcd9 100644 --- a/modules/style/colors.nix +++ b/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 { diff --git a/modules/style/fonts.nix b/modules/style/fonts.nix index 46bad17..0fe60fb 100644 --- a/modules/style/fonts.nix +++ b/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) {