From 829459865cbde97c979fa67ff7e9f78c98a95709 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Sun, 22 Dec 2024 22:01:38 -0500
Subject: [PATCH] Reorganize some apps and add wlsunset

---
 modules/home/programs/gui/default.nix                       | 1 +
 .../home/programs/{misc/production => gui}/obs/default.nix  | 0
 modules/home/programs/misc/avtools/default.nix              | 5 -----
 modules/home/programs/misc/production/default.nix           | 2 --
 modules/home/programs/terminal/default.nix                  | 2 ++
 .../programs/{misc/avtools => terminal}/spotdl/default.nix  | 0
 .../programs/{misc/avtools => terminal}/yt-dlp/default.nix  | 6 +-----
 modules/home/wms/hyprland/autostart/default.nix             | 1 +
 modules/home/wms/niri/autostart/default.nix                 | 1 +
 modules/home/wms/programs/default.nix                       | 5 +++--
 modules/home/wms/sway/autostart/default.nix                 | 1 +
 11 files changed, 10 insertions(+), 14 deletions(-)
 rename modules/home/programs/{misc/production => gui}/obs/default.nix (100%)
 rename modules/home/programs/{misc/avtools => terminal}/spotdl/default.nix (100%)
 rename modules/home/programs/{misc/avtools => terminal}/yt-dlp/default.nix (61%)

diff --git a/modules/home/programs/gui/default.nix b/modules/home/programs/gui/default.nix
index 8376689..39f60ef 100644
--- a/modules/home/programs/gui/default.nix
+++ b/modules/home/programs/gui/default.nix
@@ -7,6 +7,7 @@
     ./librewolf
     ./mangohud
     ./mpv
+    ./obs
     ./pcmanfm
     ./rofi
     ./thunderbird
diff --git a/modules/home/programs/misc/production/obs/default.nix b/modules/home/programs/gui/obs/default.nix
similarity index 100%
rename from modules/home/programs/misc/production/obs/default.nix
rename to modules/home/programs/gui/obs/default.nix
diff --git a/modules/home/programs/misc/avtools/default.nix b/modules/home/programs/misc/avtools/default.nix
index 8ed60a4..b1e27f8 100644
--- a/modules/home/programs/misc/avtools/default.nix
+++ b/modules/home/programs/misc/avtools/default.nix
@@ -1,10 +1,5 @@
 { pkgs, ... }:
 {
-  imports = [
-    ./spotdl
-    ./yt-dlp
-  ];
-
   home.packages = with pkgs; [
     ffmpeg
     ffmpegthumbnailer
diff --git a/modules/home/programs/misc/production/default.nix b/modules/home/programs/misc/production/default.nix
index a32fc68..72e8220 100644
--- a/modules/home/programs/misc/production/default.nix
+++ b/modules/home/programs/misc/production/default.nix
@@ -1,7 +1,5 @@
 { pkgs, blender, ... }:
 {
-  imports = [ ./obs ];
-
   nixpkgs.overlays = [ blender.overlays.default ];
 
   home.packages = with pkgs; [
diff --git a/modules/home/programs/terminal/default.nix b/modules/home/programs/terminal/default.nix
index 4478c8e..c8b13f7 100644
--- a/modules/home/programs/terminal/default.nix
+++ b/modules/home/programs/terminal/default.nix
@@ -8,7 +8,9 @@
     ./neovim
     ./nh
     ./ranger
+    ./spotdl
     ./tmux
+    ./yt-dlp
     ./zsh
   ];
 }
diff --git a/modules/home/programs/misc/avtools/spotdl/default.nix b/modules/home/programs/terminal/spotdl/default.nix
similarity index 100%
rename from modules/home/programs/misc/avtools/spotdl/default.nix
rename to modules/home/programs/terminal/spotdl/default.nix
diff --git a/modules/home/programs/misc/avtools/yt-dlp/default.nix b/modules/home/programs/terminal/yt-dlp/default.nix
similarity index 61%
rename from modules/home/programs/misc/avtools/yt-dlp/default.nix
rename to modules/home/programs/terminal/yt-dlp/default.nix
index e8239bc..0aa78a7 100644
--- a/modules/home/programs/misc/avtools/yt-dlp/default.nix
+++ b/modules/home/programs/terminal/yt-dlp/default.nix
@@ -11,9 +11,5 @@
     };
   };
 
-  home.shellAliases = {
-    ytm3u = "yt-dlp -gS proto:m3u8";
-    opusdl = ''yt-dlp -f ba -x --audio-quality 0'';
-    spotdl = "spotdl --m3u --format opus";
-  };
+  home.shellAliases.opusdl = ''yt-dlp -f ba -x --audio-quality 0'';
 }
diff --git a/modules/home/wms/hyprland/autostart/default.nix b/modules/home/wms/hyprland/autostart/default.nix
index 7048b07..28652ba 100644
--- a/modules/home/wms/hyprland/autostart/default.nix
+++ b/modules/home/wms/hyprland/autostart/default.nix
@@ -15,6 +15,7 @@
     "mako"
     "sunshine"
     "rot8"
+    "wlsunset -s 22:30 -S 06:30"
     "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"
 
     # Foreground
diff --git a/modules/home/wms/niri/autostart/default.nix b/modules/home/wms/niri/autostart/default.nix
index 1c82fea..424b43b 100644
--- a/modules/home/wms/niri/autostart/default.nix
+++ b/modules/home/wms/niri/autostart/default.nix
@@ -10,6 +10,7 @@
     spawn-at-startup "mako"
     spawn-at-startup "sunshine"
     spawn-at-startup "rot8"
+    spawn-at-startup "wlsunset -s 22:30 -S 06:30"
     spawn-at-startup "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"
     spawn-at-startup "${pkgs.xwayland-satellite}/bin/xwayland-satellite"
     
diff --git a/modules/home/wms/programs/default.nix b/modules/home/wms/programs/default.nix
index 2e1682e..8147730 100644
--- a/modules/home/wms/programs/default.nix
+++ b/modules/home/wms/programs/default.nix
@@ -14,8 +14,9 @@
     brightnessctl
     clipman
     libnotify
-    wl-clipboard
-    wdisplays
     rot8
+    wl-clipboard
+    wlsunset
+    wdisplays
   ];
 }
diff --git a/modules/home/wms/sway/autostart/default.nix b/modules/home/wms/sway/autostart/default.nix
index 03272ad..03ac3ce 100644
--- a/modules/home/wms/sway/autostart/default.nix
+++ b/modules/home/wms/sway/autostart/default.nix
@@ -16,6 +16,7 @@
       { command = "mako"; }
       { command = "sunshine"; }
       { command = "rot8"; }
+      { command = "wlsunset -s 22:30 -S 06:30"; }
       { command = "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"; }
 
       # Foreground