From 57a0a84398c62cbd2af35307cdf7749e25b6e7c2 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Wed, 16 Apr 2025 22:34:25 +0200 Subject: [PATCH 1/4] wrapped programs: switch to nativeBuildInputs --- modules/programs/gui/foot.nix | 2 +- modules/programs/tui/btop.nix | 2 +- modules/services/mako/module.nix | 2 +- packages/helix.nix | 2 +- packages/shell/default.nix | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/programs/gui/foot.nix b/modules/programs/gui/foot.nix index 8aed3ea..5568d7b 100644 --- a/modules/programs/gui/foot.nix +++ b/modules/programs/gui/foot.nix @@ -118,7 +118,7 @@ foot-wrapped = pkgs.symlinkJoin { name = "foot-wrapped"; paths = [pkgs.foot]; - buildInputs = [pkgs.makeWrapper]; + nativeBuildInputs = [pkgs.makeWrapper]; postBuild = '' wrapProgram $out/bin/foot --add-flags "--config=${foot-config} --working-directory=/home/${username}" ''; diff --git a/modules/programs/tui/btop.nix b/modules/programs/tui/btop.nix index df1d29b..886b43f 100644 --- a/modules/programs/tui/btop.nix +++ b/modules/programs/tui/btop.nix @@ -27,7 +27,7 @@ btop-wrapped = pkgs.symlinkJoin { name = "btop-wrapped"; paths = [pkgs.btop]; - buildInputs = [pkgs.makeWrapper]; + nativeBuildInputs = [pkgs.makeWrapper]; postBuild = '' wrapProgram $out/bin/btop --set XDG_CONFIG_HOME "${btop-settings}" ''; diff --git a/modules/services/mako/module.nix b/modules/services/mako/module.nix index 4bbdc0e..52eba30 100644 --- a/modules/services/mako/module.nix +++ b/modules/services/mako/module.nix @@ -2,7 +2,7 @@ mako-wrapped = pkgs.symlinkJoin { name = "mako-wrapped"; paths = [pkgs.mako]; - buildInputs = [pkgs.makeWrapper]; + nativeBuildInputs = [pkgs.makeWrapper]; postBuild = '' wrapProgram $out/bin/mako --add-flags "\ --font 'Lexend 11' \ diff --git a/packages/helix.nix b/packages/helix.nix index e07c6e3..2e0e111 100644 --- a/packages/helix.nix +++ b/packages/helix.nix @@ -309,7 +309,7 @@ # typst lsp vscode-langservers-extracted ]; - buildInputs = [makeWrapper]; + nativeBuildInputs = [makeWrapper]; postBuild = '' mkdir -p $out/config/helix cp "${toml.generate "config.toml" helix-config}" $out/config/helix/config.toml diff --git a/packages/shell/default.nix b/packages/shell/default.nix index 94dbc91..c6dd285 100644 --- a/packages/shell/default.nix +++ b/packages/shell/default.nix @@ -25,7 +25,7 @@ in (pkgs.symlinkJoin { name = "fish"; paths = [custom-fish] ++ packages; - buildInputs = [pkgs.makeWrapper]; + nativeBuildInputs = [pkgs.makeWrapper]; postBuild = '' wrapProgram $out/bin/fish --set STARSHIP_CONFIG "${toml.generate "starship.toml" starship-config}" \ ''; From e311a8759e8e684a7077d945c9380f51b36f233f Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Wed, 16 Apr 2025 22:34:25 +0200 Subject: [PATCH 2/4] flake: quickshell: init --- flake.lock | 21 +++++++++++++++++++++ flake.nix | 7 +++++++ modules/style/quickshell/module.nix | 28 +++++++++++----------------- 3 files changed, 39 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 46f08ee..d50f848 100644 --- a/flake.lock +++ b/flake.lock @@ -739,6 +739,26 @@ "type": "github" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1745709547, + "narHash": "sha256-xfP/NVZomh+L2ka0omPkhA9mB+4PJXGPMCv/bh+G4YA=", + "ref": "refs/heads/master", + "rev": "67524f9d8e4ac5e09ea4427e11f2284e6a6f93fe", + "revCount": 506, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, "root": { "inputs": { "helix": "helix", @@ -746,6 +766,7 @@ "impermanence": "impermanence", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs_2", + "quickshell": "quickshell", "schizofox": "schizofox", "systems": "systems_3" } diff --git a/flake.nix b/flake.nix index 2b6fa56..c9192dc 100644 --- a/flake.nix +++ b/flake.nix @@ -61,5 +61,12 @@ }; helix.url = "github:helix-editor/helix"; + + quickshell = { + url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + # THIS IS IMPORTANT + # Mismatched system dependencies will lead to crashes and other issues. + inputs.nixpkgs.follows = "nixpkgs"; + }; }; } diff --git a/modules/style/quickshell/module.nix b/modules/style/quickshell/module.nix index be5fc94..1c5de33 100644 --- a/modules/style/quickshell/module.nix +++ b/modules/style/quickshell/module.nix @@ -5,22 +5,16 @@ pkgs, ... }: let - # inherit (inputs) quickshell; - # inherit (lib.generators) toKeyValue; + inherit (inputs) quickshell; in { - # environment.systemPackages = [ - # qt6.qtimageformats # amog - # qt6.qt5compat # shader fx - # (quickshell.packages.x86_64-linux.default.override { - # withJemalloc = true; - # withQtSvg = true; - # withX11 = true; - # withPipewire = true; - # withPam = true; - # withHyprland = true; - # }) - # pamtester # lockscreen - # grim - # imagemagick # screenshot - # ]; + environment.systemPackages = with pkgs; [ + quickshell.packages.x86_64-linux.default + qt6.qtimageformats + qt6.qt5compat + qt6.qtmultimedia + qt6.qtdeclarative + ]; + + # taken from outfoxxed. + qt.enable = true; } From 3174b8a07ec5bd6e6231a96f249873467591b8fc Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Wed, 16 Apr 2025 22:34:25 +0200 Subject: [PATCH 3/4] temperance/programs.nix: remove brave --- hosts/temperance/programs.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/hosts/temperance/programs.nix b/hosts/temperance/programs.nix index 6089d35..f38dabb 100644 --- a/hosts/temperance/programs.nix +++ b/hosts/temperance/programs.nix @@ -7,7 +7,6 @@ in { anki asciinema beets - brave bubblewrap cachix calc From f5477289c4375b8780dcc3829c01b1c86f6cd697 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Wed, 16 Apr 2025 22:34:25 +0200 Subject: [PATCH 4/4] helix: config: remove nixd, ad qmlls config --- packages/helix.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/helix.nix b/packages/helix.nix index 2e0e111..3971282 100644 --- a/packages/helix.nix +++ b/packages/helix.nix @@ -26,6 +26,7 @@ shellcheck, shfmt, superhtml, + kdePackages, taplo, tinymist, typescript-language-server, @@ -137,7 +138,7 @@ } { name = "nix"; - language-servers = ["nixd" "nil"]; + language-servers = ["nil"]; } { name = "qml"; @@ -241,12 +242,8 @@ nil = { command = getExe nil; - }; - - nixd = { - command = getExe nixd; # alejandro - config.nixd.formatting.command = ["${getExe alejandra}" "-q"]; + config.nil.formatting.command = ["${getExe alejandra}" "-q"]; }; typescript-language-server = { @@ -266,6 +263,11 @@ command = lib.getExe ruff; args = ["server"]; }; + + qmlls = { + command = lib.getExe' kdePackages.qtdeclarative "qmlls"; + args = ["-E"]; + }; basedpyright.command = "${basedpyright}/bin/basedpyright-langserver"; vscode-css-language-server = {