diff --git a/flake.lock b/flake.lock index 3cc6a81..810611d 100644 --- a/flake.lock +++ b/flake.lock @@ -907,26 +907,6 @@ "type": "github" } }, - "quickshell": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1779430452, - "narHash": "sha256-zTslhsxLqUlRTML506iougTGzyR38Fzhzn7t4KDEuuE=", - "owner": "outfoxxed", - "repo": "quickshell", - "rev": "4b4fca3224ab977dc515ac0bb78d00b3dfa71e00", - "type": "github" - }, - "original": { - "owner": "outfoxxed", - "repo": "quickshell", - "type": "github" - } - }, "root": { "inputs": { "disko": "disko", @@ -943,7 +923,6 @@ "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "noctalia": "noctalia", - "quickshell": "quickshell", "services-flake": "services-flake", "sops-nix": "sops-nix", "stylix": "stylix", diff --git a/flake.nix b/flake.nix index be96337..c3081f8 100644 --- a/flake.nix +++ b/flake.nix @@ -34,15 +34,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - quickshell = { - url = "github:outfoxxed/quickshell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - noctalia = { url = "github:noctalia-dev/noctalia-shell"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.quickshell.follows = "quickshell"; }; # Editor diff --git a/modules/applications/noctalia/system.nix b/modules/applications/noctalia/system.nix index 6dec66e..4713cda 100644 --- a/modules/applications/noctalia/system.nix +++ b/modules/applications/noctalia/system.nix @@ -15,7 +15,7 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ - inputs.noctalia.packages.${system}.default + inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default ]; }; } diff --git a/modules/applications/swayidle.nix b/modules/applications/swayidle.nix index 7477b3f..d51ff73 100644 --- a/modules/applications/swayidle.nix +++ b/modules/applications/swayidle.nix @@ -8,7 +8,7 @@ let cfg = config.my.applications.swayidle; - noctaliaPkg = inputs.noctalia.packages.${pkgs.system}.default; + noctaliaPkg = inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default; noctalia = lib.getExe noctaliaPkg; bash = lib.getExe pkgs.bash;