From 9cdc091141a75584c5da6a08442b157c4ec05cb4 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Tue, 12 Sep 2023 06:24:56 +0100
Subject: [PATCH] Wallpaper changes to not be a flake any more

---
 flake.lock                     |  9 +++++----
 flake.nix                      | 14 +++++++++-----
 home/hyprland/default.nix      |  4 ++--
 home/hyprland/rofi/default.nix | 18 ++++++++++--------
 4 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6be41a07..0d1226b9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -228,12 +228,13 @@
       }
     },
     "wallpapers": {
+      "flake": false,
       "locked": {
-        "lastModified": 1694436191,
-        "narHash": "sha256-eWhgMiKKxVX47IIfSvs4FmxPlR35okVOrXxbzKwNa4A=",
+        "lastModified": 1694496009,
+        "narHash": "sha256-1GygepmH3Y91aYW2QeFEP8oIqNbPgMa46xoO/lSy9Qs=",
         "ref": "refs/heads/main",
-        "rev": "1b0a2a35be9fbab42ed25fb49a6960d31d899fa9",
-        "revCount": 4,
+        "rev": "12accd90c68cc5e90e5b2000fc18f07cf4f33acb",
+        "revCount": 5,
         "type": "git",
         "url": "https://git.xenia.me.uk/xenia/wallpapers.git"
       },
diff --git a/flake.nix b/flake.nix
index 31025777..c096bcce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,7 +11,12 @@
       url = "github:hyprwm/Hyprland";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    wallpapers.url = "git+https://git.xenia.me.uk/xenia/wallpapers.git";
+
+    # Non-flake inputs
+    wallpapers = {
+      url = "git+https://git.xenia.me.uk/xenia/wallpapers.git";
+      flake = false;
+    };
     catppuccin-alacritty = {
       url = "github:catppuccin/alacritty";
       flake = false;
@@ -45,6 +50,7 @@
   outputs = { self, nixpkgs, ... }@inputs:
     let
       flakeURL = "git+https://git.xenia.me.uk/xenia/nixos.git?ref=main";
+      wallpapers = { default = "${inputs.wallpapers}/waves/cat-waves.png"; };
       catppuccin-themes = with inputs; {
         alacritty = "${catppuccin-alacritty}/catppuccin-macchiato.yml";
         bat = "${catppuccin-bat}/Catppuccin-macchiato.tmTheme";
@@ -170,9 +176,8 @@
               useGlobalPkgs = true;
               useUserPackages = true;
               extraSpecialArgs = {
-                inherit hostName user shell inputs catppuccin-themes;
+                inherit hostName user shell inputs wallpapers catppuccin-themes;
                 hyprland = inputs.hyprland;
-                wallpapers = inputs.wallpapers;
               };
               users.${user} = let
                 username = user;
@@ -210,8 +215,7 @@
         inputs.home-manager.lib.homeManagerConfiguration {
           pkgs = nixpkgs.legacyPackages.${system};
           extraSpecialArgs = {
-            inherit hostName user shell inputs catppuccin-themes;
-            wallpapers = inputs.wallpapers;
+            inherit hostName user shell inputs wallpapers catppuccin-themes;
           };
           modules = [
             ./home/shell/${shell}.nix
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index 6d4f2b1e..51e2e203 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -44,8 +44,8 @@
   };
   xdg.configFile = {
     "hypr/hyprpaper.conf".text = ''
-      preload = ${wallpapers.outputs.default}
-      wallpaper = ,${wallpapers.outputs.default}
+      preload = ${wallpapers.default}
+      wallpaper = ,${wallpapers.default}
     '';
     "hypr/macchiato.conf".source = ./macchiato.conf;
     "hypr/extra.conf" = lib.mkDefault { text = ""; };
diff --git a/home/hyprland/rofi/default.nix b/home/hyprland/rofi/default.nix
index 1f000033..7e4309bc 100644
--- a/home/hyprland/rofi/default.nix
+++ b/home/hyprland/rofi/default.nix
@@ -21,14 +21,16 @@ in {
       drun-display-format = "{icon} {name}";
       disable-history = false;
       hide-scrollbar = true;
-      display-window = " 󰧨  Move ";
-      display-run = " 󰅴  Run ";
-      display-drun = " 󱓞  Launch ";
-      display-ssh = " 󰢹  SSH ";
-      display-filebrowser = " 󰝰  Files ";
-      display-calc = " 󰪚  Calculator ";
-      display-combi = " 󱗿  Combi ";
+      display-window = " 󰧨 Move ";
+      display-run = " 󰅴 Run ";
+      display-drun = " 󱓞 Launch ";
+      display-ssh = " 󰢹 SSH ";
+      display-filebrowser = " 󰝰 Files ";
+      display-calc = " 󰪚 Calculator ";
+      display-combi = " 󱗿 Combi ";
     };
-    theme = ./theme.rasi;
+    theme = ./theme.rasi
+
+    ;
   };
 }