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