From 6474b10e9fa5781a0d0d2e05e29cd1d83fef989d Mon Sep 17 00:00:00 2001
From: Nathan <nathanblunkall5@gmail.com>
Date: Sat, 30 Aug 2025 15:42:34 -0500
Subject: [PATCH] sddm theme

---
 home-manager/programs/hyprland/default.nix             |  2 +-
 home-manager/users/nathan/dotfiles/hypr/main.conf      |  7 +------
 home-manager/users/nathan/dotfiles/hypr/pyprland.toml  | 10 +++++-----
 home-manager/users/nathan/packages/scripts/default.nix |  7 ++++---
 system-config/services/sddm/default.nix                |  4 ++--
 5 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/home-manager/programs/hyprland/default.nix b/home-manager/programs/hyprland/default.nix
index 9b97586..5be9f32 100644
--- a/home-manager/programs/hyprland/default.nix
+++ b/home-manager/programs/hyprland/default.nix
@@ -16,7 +16,7 @@
         ];
 
         home.activation.extraHyprFile = lib.hm.dag.entryAfter ["writeBoundary"] ''
-            if [ ! -f ${config.home.homeDirectory}/.config/hypr/otf.conf ] && [ -z ''$DRY_RUN ]; then
+            if [[ ! -f ${config.home.homeDirectory}/.config/hypr/otf.conf ]]; then
                 touch ${config.home.homeDirectory}/.config/hypr/otf.conf
             fi
         '';
diff --git a/home-manager/users/nathan/dotfiles/hypr/main.conf b/home-manager/users/nathan/dotfiles/hypr/main.conf
index 87044f9..5e40068 100644
--- a/home-manager/users/nathan/dotfiles/hypr/main.conf
+++ b/home-manager/users/nathan/dotfiles/hypr/main.conf
@@ -236,11 +236,6 @@ bindm = $mainMod SHIFT, mouse:272, resizewindow
 
 $scratchpadsize = size 60% 80%
 
-$scratchpad = class:^(scratchpad)$
-windowrulev2 = float, $scratchpad
-windowrulev2 = $scratchpadsize, $scratchpad
-windowrulev2 = workspace special silent, $scratchpad
-
 $kitty = class:^(scratchpad-kitty)$
 windowrulev2 = float, $kitty
 windowrulev2 = $scratchpadsize, $kitty
@@ -251,7 +246,7 @@ windowrulev2 = float, $nvim
 windowrulev2 = $scratchpadsize, $nvim
 windowrulev2 = workspace special silent, $nvim
 
-$cal = class:^(scratchpad-calendar)$
+$cal = class:^(scratchpad-cal)$
 windowrulev2 = float, $cal
 windowrulev2 = $scratchpadsize, $cal
 windowrulev2 = workspace special silent, $cal
diff --git a/home-manager/users/nathan/dotfiles/hypr/pyprland.toml b/home-manager/users/nathan/dotfiles/hypr/pyprland.toml
index 43adbb5..79edad3 100644
--- a/home-manager/users/nathan/dotfiles/hypr/pyprland.toml
+++ b/home-manager/users/nathan/dotfiles/hypr/pyprland.toml
@@ -7,15 +7,15 @@
 	animation = "fromTop"
 	command = "kitty --class scratchpad-nvim -e nvim ~/Projects"
 	lazy = false
-	class = "scratchpad"
+	class = "scratchpad-nvim"
 	margin = 100
 	multi = true
 	excludes = "*"
 
 	[scratchpads.kitty]
 	animation = "fromBottom"
-	command = "kitty --class scratchpad -e tmux"
-	class = "scratchpad"
+	command = "kitty --class scratchpad-kitty -e tmux"
+	class = "scratchpad-kitty"
 	lazy = false
 	margin = 100
 	multi = true
@@ -23,8 +23,8 @@
 	
     [scratchpads.calendar]
 	animation = "fromTop"
-	command = "kitty --class scratchpad -e calcurse"
-	class = "scratchpad"
+	command = "kitty --class scratchpad-cal -e calcurse"
+	class = "scratchpad-cal"
 	lazy = false
 	margin = 100
 	multi = true
diff --git a/home-manager/users/nathan/packages/scripts/default.nix b/home-manager/users/nathan/packages/scripts/default.nix
index ea39e1a..34ea42a 100644
--- a/home-manager/users/nathan/packages/scripts/default.nix
+++ b/home-manager/users/nathan/packages/scripts/default.nix
@@ -19,8 +19,8 @@
 	        
 
 	        (pkgs.writeShellScriptBin "randWallpaper" ''
-                file=$(ls /home/nathan/Pictures/Wallpaper/ | shuf -n 1)
-                setWallpaper /home/nathan/Pictures/Wallpaper/$file
+                file=$(ls ${config.home.homeDirectory}/Pictures/Wallpaper/ | shuf -n 1)
+                setWallpaper ${config.home.homeDirectory}/Pictures/Wallpaper/$file
 	        '')
 
 	        (pkgs.writeShellScriptBin "setWallpaper" ''
@@ -74,6 +74,7 @@
                 hyprctl setcursor Bibata-Modern-Classic 16
                 sleep 3
 		        hyprctl reload
+                hyprctl dispatch exec ${pkgs.pyprland}/bin/pypr toggle calendar
                 #tmux new-session -s hyprland 
 	        '')
 
@@ -85,7 +86,7 @@
         ] ++ (if config.homeconfig.standalone.enable then [
 
             (pkgs.writeShellScriptBin "_homeRebuild" ''
-	            ${pkgs.nh}/bin/nh home switch --ask /home/nathan/Projects/Olympus
+	            ${pkgs.nh}/bin/nh home switch --ask
 	            echo //////Enter to close//////
 	            read
 	        '')
diff --git a/system-config/services/sddm/default.nix b/system-config/services/sddm/default.nix
index a537d36..8d3d1fb 100644
--- a/system-config/services/sddm/default.nix
+++ b/system-config/services/sddm/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, inputs, ... }: {
+{ config, lib, pkgs, ... }: {
 
     options.sysconfig.services.sddm.enable = lib.mkOption {
         type = lib.types.bool;
@@ -9,7 +9,7 @@
 
         qt.enable = true;
 
-        environment.systemPackages = with pkgs; [ (sddm-astronaut.override { embeddedTheme = "cyberpunk"; }) ];
+        environment.systemPackages = with pkgs; [ (sddm-astronaut.override { embeddedTheme = "pixel_sakura"; }) ];
 
         services.displayManager.sddm = {
             enable = true;