diff --git a/flake.lock b/flake.lock index 018c533..749aafc 100644 --- a/flake.lock +++ b/flake.lock @@ -347,12 +347,33 @@ "type": "github" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1752701746, + "narHash": "sha256-OVqrNbAzMaVOBxdoLqbZyn0vOq9/XwcWVPVKJbHwz5Q=", + "ref": "refs/heads/master", + "rev": "986749cdb9ca9078b66297d60bbf21d48e33a6cf", + "revCount": 639, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, "root": { "inputs": { "determinate": "determinate", "impermanence": "impermanence", "lanzaboote": "lanzaboote", "nixpkgs": "nixpkgs_2", + "quickshell": "quickshell", "rust-overlay": "rust-overlay_2", "systems": "systems", "watt": "watt" diff --git a/flake.nix b/flake.nix index 064b3c7..2962416 100644 --- a/flake.nix +++ b/flake.nix @@ -53,6 +53,14 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + quickshell = { + # add ?ref= to track a tag + 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"; + }; # secure booting lanzaboote = { url = "github:nix-community/lanzaboote"; diff --git a/modules/style/quickshell/quickshell.mod.nix b/modules/style/quickshell/quickshell.mod.nix index c0635cc..3c41f20 100644 --- a/modules/style/quickshell/quickshell.mod.nix +++ b/modules/style/quickshell/quickshell.mod.nix @@ -1,5 +1,6 @@ { config, + inputs, lib, pkgs, ... @@ -13,7 +14,7 @@ in { config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ - quickshell + inputs.quickshell.packages.${pkgs.stdenv.system}.quickshell qt6.qtimageformats qt6.qt5compat qt6.qtmultimedia