diff --git a/flake.lock b/flake.lock index d50f848..46f08ee 100644 --- a/flake.lock +++ b/flake.lock @@ -739,26 +739,6 @@ "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", @@ -766,7 +746,6 @@ "impermanence": "impermanence", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs_2", - "quickshell": "quickshell", "schizofox": "schizofox", "systems": "systems_3" } diff --git a/flake.nix b/flake.nix index c9192dc..2b6fa56 100644 --- a/flake.nix +++ b/flake.nix @@ -61,12 +61,5 @@ }; 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/hosts/temperance/programs.nix b/hosts/temperance/programs.nix index f38dabb..6089d35 100644 --- a/hosts/temperance/programs.nix +++ b/hosts/temperance/programs.nix @@ -7,6 +7,7 @@ in { anki asciinema beets + brave bubblewrap cachix calc diff --git a/modules/programs/gui/foot.nix b/modules/programs/gui/foot.nix index 5568d7b..8aed3ea 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]; - nativeBuildInputs = [pkgs.makeWrapper]; + buildInputs = [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 886b43f..df1d29b 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]; - nativeBuildInputs = [pkgs.makeWrapper]; + buildInputs = [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 52eba30..4bbdc0e 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]; - nativeBuildInputs = [pkgs.makeWrapper]; + buildInputs = [pkgs.makeWrapper]; postBuild = '' wrapProgram $out/bin/mako --add-flags "\ --font 'Lexend 11' \ diff --git a/modules/style/quickshell/module.nix b/modules/style/quickshell/module.nix index 1c5de33..be5fc94 100644 --- a/modules/style/quickshell/module.nix +++ b/modules/style/quickshell/module.nix @@ -5,16 +5,22 @@ pkgs, ... }: let - inherit (inputs) quickshell; + # inherit (inputs) quickshell; + # inherit (lib.generators) toKeyValue; in { - environment.systemPackages = with pkgs; [ - quickshell.packages.x86_64-linux.default - qt6.qtimageformats - qt6.qt5compat - qt6.qtmultimedia - qt6.qtdeclarative - ]; - - # taken from outfoxxed. - qt.enable = true; + # 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 + # ]; } diff --git a/packages/helix.nix b/packages/helix.nix index 3971282..e07c6e3 100644 --- a/packages/helix.nix +++ b/packages/helix.nix @@ -26,7 +26,6 @@ shellcheck, shfmt, superhtml, - kdePackages, taplo, tinymist, typescript-language-server, @@ -138,7 +137,7 @@ } { name = "nix"; - language-servers = ["nil"]; + language-servers = ["nixd" "nil"]; } { name = "qml"; @@ -242,8 +241,12 @@ nil = { command = getExe nil; + }; + + nixd = { + command = getExe nixd; # alejandro - config.nil.formatting.command = ["${getExe alejandra}" "-q"]; + config.nixd.formatting.command = ["${getExe alejandra}" "-q"]; }; typescript-language-server = { @@ -263,11 +266,6 @@ 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 = { @@ -311,7 +309,7 @@ # typst lsp vscode-langservers-extracted ]; - nativeBuildInputs = [makeWrapper]; + buildInputs = [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 c6dd285..94dbc91 100644 --- a/packages/shell/default.nix +++ b/packages/shell/default.nix @@ -25,7 +25,7 @@ in (pkgs.symlinkJoin { name = "fish"; paths = [custom-fish] ++ packages; - nativeBuildInputs = [pkgs.makeWrapper]; + buildInputs = [pkgs.makeWrapper]; postBuild = '' wrapProgram $out/bin/fish --set STARSHIP_CONFIG "${toml.generate "starship.toml" starship-config}" \ '';