From d912e3de8c14398a734ce6d6497d686151f23e46 Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Sat, 2 Nov 2024 08:54:17 +0100
Subject: [PATCH] hyprland: cleanup

---
 .../desktop/addons/hyprpaper/default.nix      |  5 -----
 modules/nixos/desktop/hyprland/default.nix    | 22 ++++++++++++++-----
 systems/x86_64-linux/yggdrasil/default.nix    | 17 ++++++--------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/modules/nixos/desktop/addons/hyprpaper/default.nix b/modules/nixos/desktop/addons/hyprpaper/default.nix
index 8c4c6ab..5f19b72 100644
--- a/modules/nixos/desktop/addons/hyprpaper/default.nix
+++ b/modules/nixos/desktop/addons/hyprpaper/default.nix
@@ -1,17 +1,12 @@
 {
   config,
-  inputs,
   lib,
   namespace,
-  pkgs,
-  system,
   ...
 }:
 let
   inherit (lib) mkIf mkEnableOption;
 
-  # hyprpaper-package = inputs.hyprpaper.packages.${system}.hyprpaper;
-
   cfg = config.${namespace}.desktop.addons.hyprpaper;
 
   username = config.${namespace}.user.name;
diff --git a/modules/nixos/desktop/hyprland/default.nix b/modules/nixos/desktop/hyprland/default.nix
index 319c731..634d459 100644
--- a/modules/nixos/desktop/hyprland/default.nix
+++ b/modules/nixos/desktop/hyprland/default.nix
@@ -30,7 +30,7 @@ let
         hyprctl dispatch workspace $running
     else
         # always open on w/space 4
-        hyprctl dispatch workspace 4
+        hyprctl dispatch workspace 9
         1password&
     fi
   '';
@@ -47,19 +47,31 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
-      polkit-kde-agent
+      # Auth Agent
+      hyprpolkitagent
 
+      # Notification daemon
+      libnotify
+
+      # Wayland Utilities
       wl-clipboard
       wl-screenrec
       wlr-randr
-      grimblast
-      xfce.thunar
-      dunst
 
+      # Screenshot Utility
+      grimblast
+
+      # File Manager
+      xfce.thunar
+
+      # clean sddm theme
       elegant-sddm
 
+      # json cli parser for bash script to focus 1password
       jq
       focus-1password
+
+      hyprpanel
     ];
 
     programs = {
diff --git a/systems/x86_64-linux/yggdrasil/default.nix b/systems/x86_64-linux/yggdrasil/default.nix
index d0656e8..f217373 100644
--- a/systems/x86_64-linux/yggdrasil/default.nix
+++ b/systems/x86_64-linux/yggdrasil/default.nix
@@ -57,22 +57,23 @@ in
         };
 
         exec-once = [
-          "hyprctl dispatch moveworkspacetomonitor 4 HDMI-A-1"
           "xrandr --output DP-2 --primary"
           "[workspace 1 silent] obsidian --disabled-gpu"
-          "[workspace 4 silent] git-butler"
+          "[workspace 9 silent] git-butler"
         ];
 
         workspace = [
           "1, monitor:DP-2"
-          "2, monitor:HDMI-A-1"
+          "2, monitor:DP-2"
           "3, monitor:DP-2"
-          "4, monitor:HDMI-A-1"
+          "4, monitor:DP-2"
+          "8, monitor:HDMI-A-1"
+          "9, monitor:HDMI-A-1"
         ];
 
         windowrulev2 = [
-          "workspace 2 silent, class:^(steam)$, title:^(Friends List)"
-          "workspace 2 silent, class:^(discord)$, title:^(Discord)"
+          "workspace 8 silent, class:^(steam)$, title:^(Friends List)"
+          "workspace 8 silent, class:^(discord)$, title:^(Discord)"
         ];
       };
     };
@@ -82,10 +83,6 @@ in
     };
 
     system = {
-      # autoUpgrade = {
-      #   enable = true;
-      #   time = "10:00";
-      # };
       hardware = {
         bluetooth = enabled;
         gpu.nvidia = enabled;