diff --git a/flake.lock b/flake.lock index 64f74bc..18335e9 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1787559586, - "narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=", + "lastModified": 1788450739, + "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1", + "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993", "type": "github" }, "original": { @@ -112,11 +112,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1788531059, - "narHash": "sha256-hLD4l3QOGBQhkVp3mQ2lJ/YbEi99qUgKapb40KovZ88=", + "lastModified": 1790046670, + "narHash": "sha256-MYiI+CzL0tuWgRPjGsKCDHqYs2T3OzMlMQWOYWG0qso=", "owner": "nixos", "repo": "nixpkgs", - "rev": "801bef6abd86b91e51083066b83fb354a11fc640", + "rev": "6774f7bc253789b113a4f39285dc0fa100abeacc", "type": "github" }, "original": { @@ -144,11 +144,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1787631388, - "narHash": "sha256-vMiXptXarfSdJb1Gkc+FYVOAibuBRj7qxGa8z68q1Uw=", + "lastModified": 1789724158, + "narHash": "sha256-nlKgrm0dsVhOSopKheVBCcOpiIticufPPVLdVOI0euA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ac6b2166e7a9375683b8e98f860f273222337b16", + "rev": "0a3468a402c449992505b6a9fc5b06580141b750", "type": "github" }, "original": { @@ -160,11 +160,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1787900134, - "narHash": "sha256-5GWj0FI2uOwKNpXkmpWrSFDe1rCaNBCUQ8d+HDtFQPI=", - "rev": "83199d0d373dd3ac2b9a1996b1d0263f76ab7a4c", + "lastModified": 1787736819, + "narHash": "sha256-cV5xEJJK3BvhU8rEd4mC9UsmDi5qscv/kzGPhBRC5WA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9fbb54b33e91ee4ca368e35a78e0613c720600b3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1789921291, + "narHash": "sha256-uLLUj+TLUmBc6KrUzx76KZdPi5ZkI1ORR9A6lJUIZlo=", + "rev": "44a91898084f46797b5fac650c7e8c9ac38c43d4", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1063296.83199d0d373d/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1077143.44a91898084f/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -178,11 +194,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1788190018, - "narHash": "sha256-59BAfH0txPAZrPBF4QJqwvUWppD+ICrcjA1LZAmPnrQ=", + "lastModified": 1789961561, + "narHash": "sha256-2lRgE8XsmXIVmiujmHVaCy5TrBUSblILNT5vYOj/Ed0=", "owner": "nix-community", "repo": "nixvim", - "rev": "41844750e55f17b1385d5b09ca7ade5f11f49506", + "rev": "bcb5f577a36565bda07d7b81346b73cad8618d16", "type": "github" }, "original": { @@ -191,6 +207,25 @@ "type": "github" } }, + "release": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1790098491, + "narHash": "sha256-dtybYzJt1OyXepG/xWo5/MxzQb2Ree6Y+/SMOqHEthw=", + "owner": "liixini", + "repo": "skwd-wall", + "rev": "cac52a7539ddf8e2d7ab7d69bd051200a129f62c", + "type": "github" + }, + "original": { + "owner": "liixini", + "ref": "nix", + "repo": "skwd-wall", + "type": "github" + } + }, "root": { "inputs": { "awww": "awww", @@ -199,6 +234,7 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", + "skwd-wall": "skwd-wall", "spicetify-nix": "spicetify-nix" } }, @@ -223,17 +259,35 @@ "type": "github" } }, + "skwd-wall": { + "inputs": { + "release": "release" + }, + "locked": { + "lastModified": 1790085328, + "narHash": "sha256-thAQwQ52nSbzeJfNIf5mfYmgq813+vl8ABbC6uMSqPY=", + "owner": "liixini", + "repo": "skwd-wall", + "rev": "503962c3fb503edb55ad98ab497b2a1b5adecaac", + "type": "github" + }, + "original": { + "owner": "liixini", + "repo": "skwd-wall", + "type": "github" + } + }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "systems": "systems_2" }, "locked": { - "lastModified": 1788263070, - "narHash": "sha256-Mw163zYcjr59hB2JMC1iKU1Y69SNKZ2r/haXZ07UWQY=", + "lastModified": 1790025920, + "narHash": "sha256-SmeXQetF/hQbhz0qVv3qv7QxvfKhhrJ+tgYQLYkFJZk=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "27ff19b00338052e8a504e1d1a34efad82c4bb26", + "rev": "e96330757db4c93b10c31b85feb23ffa693f7b2d", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3b1504e..7979cf3 100644 --- a/flake.nix +++ b/flake.nix @@ -19,7 +19,7 @@ # Day to Day spicetify-nix.url = "github:Gerg-L/spicetify-nix"; #spotify client nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; - #skwd-wall.url = "github:liixini/skwd-wall"; #wallpaper selector + skwd-wall.url = "github:liixini/skwd-wall"; #wallpaper selector awww.url = "git+https://codeberg.org/LGFae/awww"; }; @@ -28,7 +28,7 @@ nixpkgs, home-manager, nix-flatpak, - #skwd-wall, + skwd-wall, ... } @ inputs: let # Supported systems for your flake packages, shell, etc. @@ -66,7 +66,7 @@ specialArgs = {inherit inputs;}; modules = [ nix-flatpak.nixosModules.nix-flatpak - #skwd-wall.nixosModules.default + skwd-wall.nixosModules.default ./hosts/WarNyx/configuration.nix ]; }; @@ -74,7 +74,7 @@ specialArgs = {inherit inputs;}; modules = [ nix-flatpak.nixosModules.nix-flatpak - #skwd-wall.nixosModules.default + skwd-wall.nixosModules.default ./hosts/Reconix/configuration.nix ]; }; diff --git a/home/common/features/niri/config.kdl b/home/common/features/niri/config.kdl index dae39f9..78f8014 100644 --- a/home/common/features/niri/config.kdl +++ b/home/common/features/niri/config.kdl @@ -287,7 +287,7 @@ spawn-sh-at-startup "clipse -listen" spawn-sh-at-startup "mako --default-timeout=5000" -//spawn-at-startup "skwd-daemon" +spawn-at-startup "skwd-daemon" // To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup: // spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell" diff --git a/hosts/common/features/DesktopNiri.nix b/hosts/common/features/DesktopNiri.nix index e4079c7..ef4b93a 100644 --- a/hosts/common/features/DesktopNiri.nix +++ b/hosts/common/features/DesktopNiri.nix @@ -11,7 +11,7 @@ services.displayManager.sddm.enable = true; services.displayManager.sddm.wayland.enable = true; programs.niri.enable = true; - programs.skwd-wall.enable = true; + #programs.skwd-wall.enable = true; #may not work after update services.gnome.gnome-keyring.enable = true; programs.seahorse.enable = true; @@ -25,5 +25,6 @@ playerctl swaylock inputs.awww.packages.${pkgs.stdenv.hostPlatform.system}.awww + inputs.skwd-wall.packages.${pkgs.stdenv.hostPlatform.system}.default #Fix for above ]; }