feat(desktop)!: allow only one wallpaper

mrtnvgr · Oct 4, 2024 · 3993ba4 · 3993ba4
1 parent 6b300b5
commit 3993ba4
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 84 deletions.
diff --git a/hosts/minix/default.nix b/hosts/minix/default.nix
@@ -25,34 +25,10 @@
 
       opacity = 0.8;
 
-      wallpapers = with pkgs; [
-        # "${colorScheme.palette.background}"
-
-        (fetchurl {
-          url = "https://w.wallhaven.cc/full/72/wallhaven-72weyy.jpg";
-          hash = "sha256-H9VpfpdOQzfzHkKE1HzjbfUdBLqGU0+5wuWzxQBB0cc=";
-        })
-
-        # (fetchurl {
-        #   url = "https://w.wallhaven.cc/full/m3/wallhaven-m3zrmy.png";
-        #   hash = "sha256-BNsKALFBm9Ukb6j62fap3n/O0bHlyYFj0ic5qnfdbnI=";
-        # })
-
-        (fetchurl {
-          url = "https://w.wallhaven.cc/full/2y/wallhaven-2yw9w9.png";
-          hash = "sha256-ieVRCXZszemw8Ai1nLXrYDm/gLrJGY4yeZntEOCL/GM=";
-        })
-
-        (fetchurl {
-          url = "https://w.wallhaven.cc/full/p9/wallhaven-p9l9r9.png";
-          hash = "sha256-yYt4bvU1K/F2xqGzgExckzzbcYPtXFyNPnP/TP5H3dI=";
-        })
-
-        (fetchurl {
-          url = "https://w.wallhaven.cc/full/73/wallhaven-73qz6y.png";
-          hash = "sha256-CGZqwT976V8odi8lNThbSTIQFbhI9twC4h1jWPG06zM=";
-        })
-      ];
+      wallpaper = pkgs.fetchurl {
+        url = "https://w.wallhaven.cc/full/73/wallhaven-73qz6y.png";
+        hash = "sha256-CGZqwT976V8odi8lNThbSTIQFbhI9twC4h1jWPG06zM=";
+      };
     };
 
     feats = {

diff --git a/modules/desktop/core/default.nix b/modules/desktop/core/default.nix
@@ -9,7 +9,7 @@
     ./network.nix
     ./screenshots.nix
     ./adb.nix
-    ./wallpapers.nix
+    ./wallpaper.nix
 
     ./rices
     ./guiServers

diff --git a/modules/desktop/core/rices/hyprpop/hyprland/hyprland.conf b/modules/desktop/core/rices/hyprpop/hyprland/hyprland.conf
@@ -139,6 +139,3 @@ bind = SHIFT, Print, exec, screenshot-full
 bind = , XF86AudioRaiseVolume, exec, amixer -q sset Master 1%+
 bind = , XF86AudioLowerVolume, exec, amixer -q sset Master 1%-
 bind = , XF86AudioMute, exec, amixer -q sset Master toggle
-
-# Theming
-bind = $mainMod CTRL, W, exec, chwl
diff --git a/modules/desktop/core/rices/hyprpop/hyprland/wallpaper.nix b/modules/desktop/core/rices/hyprpop/hyprland/wallpaper.nix
@@ -5,7 +5,7 @@ in {
   config = mkIf (theme.rice == "hyprpop") {
     home-manager.users.${user} = {
       wayland.windowManager.hyprland.extraConfig = ''
-        exec-once = chwl & waybar
+        exec-once = ${pkgs.swaybg}/bin/swaybg -i ${theme.wallpaper} & waybar
       '';
     };
   };

diff --git a/modules/desktop/core/wallpaper.nix b/modules/desktop/core/wallpaper.nix
@@ -0,0 +1,8 @@
+{ lib, ... }: let
+  inherit (lib) mkOption types;
+in {
+  options.modules.desktop.theme.wallpaper = mkOption {
+    type = with types; nullOr package;
+    default = null;
+  };
+}
diff --git a/modules/desktop/core/wallpapers.nix b/modules/desktop/core/wallpapers.nix