diff --git a/configuration/modules/dots/quick_shell/settings.nix b/configuration/modules/dots/quick_shell/settings.nix index f867b13..23a90ec 100644 --- a/configuration/modules/dots/quick_shell/settings.nix +++ b/configuration/modules/dots/quick_shell/settings.nix @@ -1,7 +1,12 @@ -{pkgs, ...}: let +{ + pkgs, + inputs, + ... +}: let qs_config = pkgs.callPackage ./quick_config/quick.nix {}; + quick_shell = inputs.quickshell.packages.${pkgs.system}.default; in { - environment.systemPackages = [pkgs.quickshell]; + environment.systemPackages = [quick_shell]; systemd.user.services.quickshell = { description = "quickshell desktop shell"; @@ -10,7 +15,7 @@ in { after = ["graphical-session.target"]; serviceConfig = { - ExecStart = "${pkgs.quickshell}/bin/qs -c ${qs_config}"; + ExecStart = "${quick_shell}/bin/qs -c ${qs_config}"; Restart = "on-failure"; RestartSec = 3; }; diff --git a/flake.lock b/flake.lock index 6a60971..4bae760 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1769776025, - "narHash": "sha256-70a1kVC08AMTvPc7iqQsJbbD4Y1fukakMVudz4oY9SM=", + "lastModified": 1771756436, + "narHash": "sha256-Tl2I0YXdhSTufGqAaD1ySh8x+cvVsEI1mJyJg12lxhI=", "owner": "nix-community", "repo": "home-manager", - "rev": "0fba737f8d5571d41467f3d99a878e11b8c0f0f0", + "rev": "5bd3589390b431a63072868a90c0f24771ff4cbb", "type": "github" }, "original": { @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1768434960, - "narHash": "sha256-cJbFn17oyg6qAraLr+NVeNJrXsrzJdrudkzI4H2iTcg=", + "lastModified": 1771102945, + "narHash": "sha256-e5NfW8NhC3qChR8bHVni/asrig/ZFzd1wzpq+cEE/tg=", "owner": "nix-community", "repo": "home-manager", - "rev": "b4d88c9ac42ae1a745283f6547701da43b6e9f9b", + "rev": "ff5e5d882c51f9a032479595cbab40fd04f56399", "type": "github" }, "original": { @@ -127,11 +127,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1769714858, - "narHash": "sha256-IHHAKi8yMonZZmVHUQxew1V9UfLBG8Um9PLbNPx3OA4=", + "lastModified": 1771638124, + "narHash": "sha256-rIF69lE48tBvOMFiIyserOa0MF3SXh1ZiRqv7WqlUew=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "dfbb02586582d5332d0c06653583b9d743bce081", + "rev": "a1dac2b08c329af22200104c3c4b18de5ded6034", "type": "github" }, "original": { @@ -160,11 +160,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1769577126, - "narHash": "sha256-v9vz9Rj4MGwPuhGELdvpRKl2HH+xvkgat6VwL0L86Fg=", + "lastModified": 1771305475, + "narHash": "sha256-lqweVTwHhYc+9T33cysp38gVwxaibGJHriOPZXWyhCY=", "owner": "YaLTeR", "repo": "niri", - "rev": "f30db163b5748e8cf95c05aba77d0d3736f40543", + "rev": "a2a52911757cb3b497db9407592f9b4c439571ea", "type": "github" }, "original": { @@ -175,11 +175,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1769461804, - "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=", + "lastModified": 1771369470, + "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d", + "rev": "0182a361324364ae3f436a63005877674cf45efb", "type": "github" }, "original": { @@ -191,11 +191,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1769598131, - "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", + "lastModified": 1771574726, + "narHash": "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", + "rev": "c217913993d6c6f6805c3b1a3bda5e639adfde6d", "type": "github" }, "original": { @@ -231,12 +231,33 @@ "type": "github" } }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1771737105, + "narHash": "sha256-3qZaw7FT34ci8EqsaW1WOgPUCfrY5/iQozKGsd6tnxA=", + "ref": "refs/heads/master", + "rev": "e7cd1e9982426fdcc617910597ab3d8f71346e4f", + "revCount": 737, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, "root": { "inputs": { "home-manager": "home-manager", "niri-flake": "niri-flake", "nixpkgs": "nixpkgs", "nvf": "nvf", + "quickshell": "quickshell", "zen-browser": "zen-browser" } }, @@ -275,11 +296,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1769713942, - "narHash": "sha256-0BtCSO2qzYK/akRDsERqRVLknCYD3FYErc+szreSHUo=", + "lastModified": 1771195969, + "narHash": "sha256-BUE41HjLIGPjq3U8VXPjf8asH8GaMI7FYdgrIHKFMXA=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "37ec78ee26e158b71f42e113e0e7dd9d5eb6bdb0", + "rev": "536bd32efc935bf876d6de385ec18a1b715c9358", "type": "github" }, "original": { @@ -296,11 +317,11 @@ ] }, "locked": { - "lastModified": 1769748063, - "narHash": "sha256-H5XCtJMS3RQKHeaS+axX7CAJ0WwuTUYGy4uzLFSm0Xc=", + "lastModified": 1771780910, + "narHash": "sha256-ZUhVc1d9y3blRPgHsptd/zBZNxfDr1muC2pibujSJDI=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "efdd1e683da9412f515b9bd42c37861978c2fd3a", + "rev": "e5a047497950bbf56c20ca57c83f349a860d02b2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7061b2f..20bee45 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,10 @@ url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + quickshell = { + url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; + inputs.nixpkgs.follows = "nixpkgs"; + }; zen-browser = { url = "github:0xc000022070/zen-browser-flake"; inputs.nixpkgs.follows = "nixpkgs"; @@ -20,7 +24,6 @@ }; }; outputs = inputs @ { - self, nixpkgs, home-manager, ...