From 518273eec199c9090d96420809f2653f5dbff79f Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Wed, 25 Jan 2023 22:12:03 -0800
Subject: [PATCH 1/3] Use substituteAll for rofi power menu

---
 modules/i3/default.nix        | 6 +++++-
 modules/{rofi => i3}/power.sh | 0
 modules/rofi/default.nix      | 4 ----
 modules/rofi/power.nix        | 9 ---------
 4 files changed, 5 insertions(+), 14 deletions(-)
 rename modules/{rofi => i3}/power.sh (100%)
 delete mode 100644 modules/rofi/power.nix

diff --git a/modules/i3/default.nix b/modules/i3/default.nix
index f1ca4b7..3032928 100644
--- a/modules/i3/default.nix
+++ b/modules/i3/default.nix
@@ -8,6 +8,7 @@ in with theme.colors; {
   home.packages = with pkgs; [
     playerctl # pactl comes with PulseAudio
     xclip # Copying screenshots to clipboard
+    wmctrl # For rofi power menu
   ];
 
   # Screenshots
@@ -69,7 +70,10 @@ in with theme.colors; {
         "${mod}+Return" = "exec kitty";
         "${mod}+Shift+e" = "exec i3-msg exit"; # bypass default session exit confirmation menu
         "${mod}+space" = "exec i3-msg open"; # Open blank space
-        "Mod1+Q" = "exec /etc/profiles/per-user/elnu/bin/rofi-power";
+        "Mod1+Q" = let rofi-power = pkgs.substituteAll {
+          src = ./power.sh;
+          isExecutable = true;
+        }; in "exec ${rofi-power}";
 
         # Audio controls
         "XF86AudioRaiseVolume" = "exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10%";
diff --git a/modules/rofi/power.sh b/modules/i3/power.sh
similarity index 100%
rename from modules/rofi/power.sh
rename to modules/i3/power.sh
diff --git a/modules/rofi/default.nix b/modules/rofi/default.nix
index 527740e..7a52c43 100644
--- a/modules/rofi/default.nix
+++ b/modules/rofi/default.nix
@@ -4,10 +4,6 @@ let
   _theme = import ../theme;
   theme = _theme.theme; # Theme name
 in {
-  home.packages = with pkgs; [
-    (pkgs.callPackage ./power.nix { })
-    wmctrl # TODO: add as dependency of rofi-power
-  ];
   programs.rofi = {
     enable = true;
     inherit theme;
diff --git a/modules/rofi/power.nix b/modules/rofi/power.nix
deleted file mode 100644
index 2f4ff50..0000000
--- a/modules/rofi/power.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, substituteAll }:
-
-substituteAll {
-  name = "rofi-power";
-  src = ./power.sh;
-
-  dir = "bin";
-  isExecutable = true;
-}

From d5797493c0d1e4a0d40ec2f04c996ff9d93608f1 Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Wed, 25 Jan 2023 22:13:04 -0800
Subject: [PATCH 2/3] Remove old xclip dependency

---
 modules/i3/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/modules/i3/default.nix b/modules/i3/default.nix
index 3032928..868f6d0 100644
--- a/modules/i3/default.nix
+++ b/modules/i3/default.nix
@@ -7,7 +7,6 @@ in with theme.colors; {
   # Dependencies
   home.packages = with pkgs; [
     playerctl # pactl comes with PulseAudio
-    xclip # Copying screenshots to clipboard
     wmctrl # For rofi power menu
   ];
 

From 180a87464cc5cf87ae6a49318e9158dc05cd4800 Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Wed, 25 Jan 2023 22:17:47 -0800
Subject: [PATCH 3/3] Get wallpaper path in theme

---
 hosts/desktop.nix         | 2 +-
 hosts/home.nix            | 2 +-
 modules/theme/default.nix | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/hosts/desktop.nix b/hosts/desktop.nix
index 581bedc..4a6926d 100644
--- a/hosts/desktop.nix
+++ b/hosts/desktop.nix
@@ -15,7 +15,7 @@ in
             enable = true;
             theme = theme.gtkTheme pkgs;
           };
-          background = ../modules/wallpapers/${theme.wallpaper};
+          background = theme.wallpaper;
         };
         defaultSession = "none+i3";
       };
diff --git a/hosts/home.nix b/hosts/home.nix
index 02eb28f..a01ac8d 100644
--- a/hosts/home.nix
+++ b/hosts/home.nix
@@ -19,7 +19,7 @@ in
     ../modules/terminal
   ];
 
-  home.file."./.background-image".source = ../modules/wallpapers/${theme.wallpaper};
+  home.file."./.background-image".source = theme.wallpaper;
 
   programs.home-manager.enable = true;
 
diff --git a/modules/theme/default.nix b/modules/theme/default.nix
index c79489e..dbb821f 100644
--- a/modules/theme/default.nix
+++ b/modules/theme/default.nix
@@ -9,3 +9,4 @@ in
   css = lib: lib.strings.concatStringsSep "\n" (lib.attrValues (lib.mapAttrs (k: v: "  --${k}: ${v};") theme.colors));
 }
 // theme // { colors = theme.colors // colors; }
+// { wallpaper = ../wallpapers/${theme.wallpaper}; }