6 files changed, 26 insertions, 36 deletions
diff --git a/dot_config/hypr/config/binds.conf b/dot_config/hypr/config/binds.conf
index 902312b..ab665ab 100644
--- a/dot_config/hypr/config/binds.conf
+++ b/dot_config/hypr/config/binds.conf
@@ -23,10 +23,10 @@ bind = ,code:127,pass,class:(discord)
 bind = $mainMod, code:51,pass,class:(discord)
 
 # Bind multimedia keys
-bindle=, XF86AudioRaiseVolume, exec, vol --up
-bindle=, XF86AudioLowerVolume, exec, vol --down
-bindle=, XF86MonBrightnessUp, exec, bri --up
-bindle=, XF86MonBrightnessDown, exec, bri --down
+bindle=, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
+bindle=, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+# bindle=, XF86MonBrightnessUp, exec, bri --up
+# bindle=, XF86MonBrightnessDown, exec, bri --down
 bindle=, XF86Search, exec, launchpad
 # bindl=, XF86AudioMute, exec, amixer set Master toggle
 bindl=, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
diff --git a/dot_config/hypr/config/env.conf b/dot_config/hypr/config/env.conf
index 567e8eb..6cced37 100644
--- a/dot_config/hypr/config/env.conf
+++ b/dot_config/hypr/config/env.conf
@@ -1,9 +1,11 @@
 env = XCURSOR_SIZE,24
 env = HYPRCURSOR_SIZE,24
+env = HYPRCURSOR_THEME,catppuccin-mocha-green-cursors
+env = XCURSOR_THEME,catppuccin-mocha-green-cursors
+
 env = LIBVA_DRIVER_NAME,nvidia
 env = XDG_SESSION_TYPE,wayland
 env = GBM_BACKEND,nvidia-drm
 env = __GLX_VENDOR_LIBRARY_NAME,nvidia
 env = NVD_BACKEND,direct
-
-
+env = WLR_NO_HARDWARE_CURSORS,1
diff --git a/dot_config/hypr/config/general.conf b/dot_config/hypr/config/general.conf
index 7d9762b..6b49bf5 100644
--- a/dot_config/hypr/config/general.conf
+++ b/dot_config/hypr/config/general.conf
@@ -1,7 +1,7 @@
-monitor=DP-4,2560x1440@240,auto,1
-workspace=DP-3,1
-monitor=DP-3,1920x1200@60,auto-left,1,transform,1
-workspace=DP-4,6
+monitor=DP-7,2560x1440@240,auto,1
+workspace=DP-7,1
+monitor=DP-6,1920x1200@60,auto-left,1,transform,1
+workspace=DP-6,6
 
 general { 
     gaps_in = 2
diff --git a/dot_config/hypr/config/programs.conf b/dot_config/hypr/config/programs.conf
index ec4fece..5d1744b 100644
--- a/dot_config/hypr/config/programs.conf
+++ b/dot_config/hypr/config/programs.conf
@@ -7,17 +7,3 @@ $hyprlock = ~/.config/hypr/fix-hypr-lock.sh
 $spotify = LIBVA_DRIVER_NAME=nvidia spotify-launcher 
 $obs = obs
 $steam = steam
-
-exec-once = [workspace 1 silent] $terminal
-exec-once = [workspace 6 silent] $spotify
-
-# exec-once = xrandr --output DP-4 --primary 
-exec-once = XDG_MENU_PREFIX=arch- kbuildsycoca6
-exec-once = sleep 2 && waybar &
-exec-once = hyprpaper
-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once = dunst
-
-exec-once = systemctl --user start hyprpolkitagent
-
-exec-once = playerctld daemon
diff --git a/dot_config/hypr/config/rules.conf b/dot_config/hypr/config/rules.conf
index aab3bcf..b0f869e 100644
--- a/dot_config/hypr/config/rules.conf
+++ b/dot_config/hypr/config/rules.conf
@@ -1,22 +1,22 @@
 # windowrule = suppress_event maximize, class:.* # You'll probably like this.
 
 # Workspace rules
-workspace=1,monitor:DP-4,default:true,persistent:true
-workspace=2,monitor:DP-4,persistent:true
-workspace=3,monitor:DP-4,persistent:true
-workspace=4,monitor:DP-4,persistent:true
-workspace=5,monitor:DP-4,persistent:true
+workspace=1,monitor:DP-7,default:true,persistent:true
+workspace=2,monitor:DP-7,persistent:true
+workspace=3,monitor:DP-7,persistent:true
+workspace=4,monitor:DP-7,persistent:true
+workspace=5,monitor:DP-7,persistent:true
 
-workspace=6,monitor:DP-3,default:true,persistent:true
-workspace=7,monitor:DP-3,persistent:true
-workspace=8,monitor:DP-3,persistent:true
-workspace=9,monitor:DP-3,persistent:true
-workspace=10,monitor:DP-3,persistent:true
+workspace=6,monitor:DP-6,default:true,persistent:true
+workspace=7,monitor:DP-6,persistent:true
+workspace=8,monitor:DP-6,persistent:true
+workspace=9,monitor:DP-6,persistent:true
+workspace=10,monitor:DP-6,persistent:true
 
 # Other
 windowrule = stay_focused on, match:class swappy
 windowrule = allows_input on, match:class discord
-windowrule = monitor DP-3, match:class discord
+windowrule = monitor DP-6, match:class discord
 
 windowrule {
   name = steam
diff --git a/dot_config/hypr/hyprland.conf b/dot_config/hypr/hyprland.conf
index 1adc6ce..d5dc309 100644
--- a/dot_config/hypr/hyprland.conf
+++ b/dot_config/hypr/hyprland.conf
@@ -1,5 +1,7 @@
-source = config/general.conf
 source = config/env.conf
+source = config/autostart.conf
+
+source = config/general.conf
 source = config/binds.conf
 # Dont source because it is sourced in binds.conf to set Program specific keybinds
 # source = config/programs.conf