don't pull wallpaper from flake, use fetchGit

alyraffauf · Jul 9, 2024 · 46b62b6 · 46b62b6
1 parent b58d22e
commit 46b62b6
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/flake.nix b/flake.nix
@@ -43,11 +43,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
       url = "github:alyraffauf/raffauflabs";
     };
-
-    wallpapers = {
-      inputs.nixpkgs.follows = "nixpkgs";
-      url = "github:alyraffauf/wallpapers";
-    };
   };
 
   nixConfig = {

diff --git a/homeManagerModules/desktop/default.nix b/homeManagerModules/desktop/default.nix
@@ -48,6 +48,12 @@
         ) "file://${config.home.homeDirectory}/sync";
 
       xdg = {
+        dataFile."backgrounds".source = builtins.fetchGit {
+          url = "https://github.com/alyraffauf/wallpapers.git";
+          rev = "7603a8aa36b0d8d76bd9fd80d19e8b601e4839aa";
+          ref = "master";
+        };
+
         userDirs = {
           enable = true;
           createDirectories = true;

diff --git a/homeManagerModules/desktop/hyprland/default.nix b/homeManagerModules/desktop/hyprland/default.nix
@@ -45,7 +45,7 @@
             pkgs.writers.writeRuby "hyprland-randomWallpaper" {} ''
               require 'fileutils'
 
-              directory = "${self.inputs.wallpapers.packages.${pkgs.system}.default}/share/backgrounds"
+              directory = "${config.xdg.dataHome}/backgrounds/"
               hyprctl = "${lib.getExe' config.wayland.windowManager.hyprland.package "hyprctl"}"
               old_pids = []
 

diff --git a/homeManagerModules/desktop/sway/randomWallpaper.nix b/homeManagerModules/desktop/sway/randomWallpaper.nix
@@ -9,7 +9,7 @@
     kill `pidof swaybg`
 
     OLD_PIDS=()
-    directory=${self.inputs.wallpapers.packages.${pkgs.system}.default}/share/backgrounds
+    directory=${config.xdg.dataHome}/backgrounds
 
     if [ -d "$directory" ]; then
         while true; do

diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix
@@ -1,9 +1,9 @@
 {
   config,
-  inputs,
   lib,
   osConfig,
   pkgs,
+  self,
   ...
 }: let
   cfg = config.ar.home;
@@ -284,7 +284,7 @@ in {
 
       wallpaper = lib.mkOption {
         description = "Default wallpaper.";
-        default = "${inputs.wallpapers.packages.${pkgs.system}.defaults}/share/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
+        default = "${config.xdg.dataHome}/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
         type = lib.types.str;
       };
     };

diff --git a/homes/aly/default.nix b/homes/aly/default.nix
@@ -69,7 +69,7 @@ self: {
 
     theme = {
       enable = true;
-      wallpaper = "${self.inputs.wallpapers.packages.${pkgs.system}.default}/share/backgrounds/wallhaven-3led2d.jpg";
+      wallpaper = "${config.xdg.dataHome}/backgrounds/wallhaven-3led2d.jpg";
     };
   };
 }
diff --git a/homes/dustin/default.nix b/homes/dustin/default.nix
@@ -43,7 +43,7 @@ self: {
 
     theme = {
       enable = true;
-      wallpaper = "${self.inputs.wallpapers.packages.${pkgs.system}.default}/share/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
+      wallpaper = "${config.xdg.dataHome}/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
     };
   };
 }