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"
       }

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";
-    };
   };
 }

hosts/temperance/programs.nix

@@ -7,6 +7,7 @@ in {
       anki
       asciinema
       beets
+      brave
       bubblewrap
       cachix
       calc

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}"
     '';

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}"
     '';

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' \

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; [
+  #   environment.systemPackages =  [
-    quickshell.packages.x86_64-linux.default
+  #     qt6.qtimageformats # amog
-    qt6.qtimageformats
+  #     qt6.qt5compat # shader fx
-    qt6.qt5compat
+  #     (quickshell.packages.x86_64-linux.default.override {
-    qt6.qtmultimedia
+  #       withJemalloc = true;
-    qt6.qtdeclarative
+  #       withQtSvg = true;
-  ];
+  #       withX11 = true;
-
+  #       withPipewire = true;
-  # taken from outfoxxed.
+  #       withPam = true;
-  qt.enable = true;
+  #       withHyprland = true;
+  #     })
+  #     pamtester # lockscreen
+  #     grim
+  #     imagemagick # screenshot
+  #   ];
 }

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

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}" \
     '';