Sort hyprland config

17 files changed, 439 insertions, 159 deletions

diff --git a/hyprland/.install.yml b/hyprland/.install.yml
index 2b127aa..9f6bbe0 100644
--- a/hyprland/.install.yml
+++ b/hyprland/.install.yml
@@ -1,16 +1,37 @@
 name: Configure hyprland
 steps:
+  # Hyprland
   - !Link
     from: "hyprland.conf"
     to: "~/.config/hypr/hyprland.conf"
     recursive: false
   - !Link
-    from: "binds.conf"
-    to: "~/.config/hypr/binds.conf"
+    from: "00-theme-vars.conf"
+    to: "~/.config/hypr/00-theme-vars.conf"
     recursive: false
   - !Link
-    from: "hyprpaper.conf"
-    to: "~/.config/hypr/hyprpaper.conf"
+    from: "01-system-vars.conf"
+    to: "~/.config/hypr/01-system-vars.conf"
+    recursive: false
+  - !Link
+    from: "10-startup.conf"
+    to: "~/.config/hypr/10-startup.conf"
+    recursive: false
+  - !Link
+    from: "11-startup.conf"
+    to: "~/.config/hypr/11-environment.conf"
+    recursive: false
+  - !Link
+    from: "20-binds.conf"
+    to: "~/.config/hypr/20-binds.conf"
+    recursive: false
+  - !Link
+    from: "21-rules.conf"
+    to: "~/.config/hypr/21-rules.conf"
+    recursive: false
+  - !Link
+    from: "22-theme.conf"
+    to: "~/.config/hypr/22-theme.conf"
     recursive: false
   - !Link
     from: "input.conf"
@@ -20,19 +41,25 @@ steps:
     from: "monitors.conf"
     to: "~/.config/hypr/monitors.conf"
     recursive: false
+
+  # Wallpaper
   - !Link
-    from: "rules.conf"
-    to: "~/.config/hypr/rules.conf"
+    from: "hyprpaper.conf"
+    to: "~/.config/hypr/hyprpaper.conf"
     recursive: false
   - !Link
-    from: "settings.conf"
-    to: "~/.config/hypr/settings.conf"
+    from: "wallpaper.jpg"
+    to: "~/.config/hypr/wallpaper.jpg"
     recursive: false
+
+  # Hypridle
   - !Link
-    from: "startup.conf"
-    to: "~/.config/hypr/startup.conf"
+    from: "hypridle.conf"
+    to: "~/.config/hypr/hypridle.conf"
     recursive: false
+
+  # Hyprlock
   - !Link
-    from: "wallpaper.jpg"
-    to: "~/.config/hypr/wallpaper.jpg"
+    from: "hyprlock.conf"
+    to: "~/.config/hypr/hyprlock.conf"
     recursive: false
diff --git a/hyprland/00-theme-vars.conf b/hyprland/00-theme-vars.conf
new file mode 100644
index 0000000..2e67eb3
--- /dev/null
+++ b/hyprland/00-theme-vars.conf
@@ -0,0 +1,6 @@
+# Colours
+$col_active_border  = rgba(657585ff)
+$col_inactive_border = rgba(59595977)
+
+# Fonts
+$font_primary = Iosevka Nerd Font
diff --git a/hyprland/01-system-vars.conf b/hyprland/01-system-vars.conf
new file mode 100644
index 0000000..da8e18b
--- /dev/null
+++ b/hyprland/01-system-vars.conf
@@ -0,0 +1,33 @@
+# Mod key
+$mod = SUPER
+
+# Terminal
+$terminal = alacritty
+
+# Menus
+$run_launcher = pgrep -x wofi >/dev/null 2>&1 && killall wofi || wofi --show drun
+$exit_menu    = ~/bin/exit-menu.sh
+
+# Screenshots
+$screenshot_area             = /usr/bin/grimblast --notify --freeze save area - | swappy -f -
+$screenshot_area_clipboard   = /usr/bin/grimblast --notify copy area
+$screenshot_screen           = /usr/bin/grimblast --notify save screen - | swappy -f -
+$screenshot_screen_clipboard = /usr/bin/grimblast --notify copy screen
+
+# Audio
+$sink_volume      = pactl get-sink-volume @DEFAULT_SINK@ | grep '^Volume:' | cut -d / -f 2 | tr -d ' ' | sed 's/%//'
+$sink_volume_mute = pactl get-sink-mute @DEFAULT_SINK@ | sed -En "/no/ s/.*/$($sink_volume)/p; /yes/ s/.*/0/p"
+
+# Brightness
+$brightness = brightnessctl | grep 'Current brightness:' | cut -d "(" -f 2 | cut -d "%" -f 1
+
+# Utilities
+$zoom     = ~/bin/hyprctl-zoom.sh
+$zoomd    = ~/bin/hyprctl-zoom-daemon.sh
+$batteryd = ~/bin/battery-notify.sh
+
+# OSD socket
+$wob_socket = $XDG_RUNTIME_DIR/wob.sock
+
+# Other
+$polkit = /usr/lib/polkit-kde-authentication-agent-1
diff --git a/hyprland/10-startup.conf b/hyprland/10-startup.conf
new file mode 100644
index 0000000..b96d7ba
--- /dev/null
+++ b/hyprland/10-startup.conf
@@ -0,0 +1,16 @@
+# Startup Programs #
+
+exec-once = waybar
+exec-once = hyprpaper
+exec-once = mako
+
+exec-once = $polkit
+exec-once = $batteryd
+exec-once = $zoomd
+
+
+#exec-once = easyeffects --gapplication-service
+#exec-once = systemd-inhibit --what=handle-power-key sleep infinity
+
+#exec-once = hypridle -> moved to systemd [07 Aug 2024]
+
diff --git a/hyprland/11-environment.conf b/hyprland/11-environment.conf
new file mode 100644
index 0000000..a28981b
--- /dev/null
+++ b/hyprland/11-environment.conf
@@ -0,0 +1,5 @@
+# Environment #
+
+env = WLR_NO_HARDWARE_CURSORS,1
+
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
diff --git a/hyprland/20-binds.conf b/hyprland/20-binds.conf
new file mode 100644
index 0000000..2cfb616
--- /dev/null
+++ b/hyprland/20-binds.conf
@@ -0,0 +1,132 @@
+# Keybinds #
+
+# Programs
+# ---------------------------------------------------------
+#      Modifier    Key     Dispatcher      Value
+bind = $mod,       Return, exec,           $terminal
+bind = $mod,       Q,      killactive, 
+bind = $mod SHIFT, Space,  togglefloating, 
+bind = $mod,       D,      exec,           $run_launcher
+bind = $mod SHIFT, E,      exec,           $exit_menu
+
+
+# Move around
+# ---------------------------------------------------------
+#      Modifier  Key    Dispatcher  Value
+bind = $mod,     H,     movefocus,  l
+bind = $mod,     J,     movefocus,  d
+bind = $mod,     K,     movefocus,  u
+bind = $mod,     L,     movefocus,  r
+bind = $mod,     left,  movefocus,  l
+bind = $mod,     right, movefocus,  r
+bind = $mod,     up,    movefocus,  u
+bind = $mod,     down,  movefocus,  d
+
+
+# Move containers
+# ---------------------------------------------------------
+#      Modifier    Key    Dispatcher  Value
+bind = $mod SHIFT, H,     swapwindow, l
+bind = $mod SHIFT, J,     swapwindow, d
+bind = $mod SHIFT, K,     swapwindow, u
+bind = $mod SHIFT, left,  swapwindow, l
+bind = $mod SHIFT, right, swapwindow, r
+bind = $mod SHIFT, up,    swapwindow, u
+bind = $mod SHIFT, down,  swapwindow, d
+
+
+# Move workspaces
+# ---------------------------------------------------------
+#      Modifier    Key    Dispatcher  Value
+bind = $mod,       1,     workspace,  1
+bind = $mod,       2,     workspace,  2
+bind = $mod,       3,     workspace,  3
+bind = $mod,       4,     workspace,  4
+bind = $mod,       5,     workspace,  5
+bind = $mod,       6,     workspace,  6
+bind = $mod,       7,     workspace,  7
+bind = $mod,       8,     workspace,  8
+bind = $mod,       9,     workspace,  9
+bind = $mod,       0,     workspace,  10
+
+
+# Move containers to workspace
+# ---------------------------------------------------------
+#      Modifier    Key    Dispatcher       Value
+bind = $mod SHIFT, 1,     movetoworkspace, 1
+bind = $mod SHIFT, 2,     movetoworkspace, 2
+bind = $mod SHIFT, 3,     movetoworkspace, 3
+bind = $mod SHIFT, 4,     movetoworkspace, 4
+bind = $mod SHIFT, 5,     movetoworkspace, 5
+bind = $mod SHIFT, 6,     movetoworkspace, 6
+bind = $mod SHIFT, 7,     movetoworkspace, 7
+bind = $mod SHIFT, 8,     movetoworkspace, 8
+bind = $mod SHIFT, 9,     movetoworkspace, 9
+bind = $mod SHIFT, 0,     movetoworkspace, 10
+
+
+# Move/resize windows 
+# ---------------------------------------------------------
+#       Modifier  Key        Dispatcher
+bindm = $mod,     mouse:272, movewindow
+bindm = $mod,     mouse:273, resizewindow
+
+
+# Groups (tabs)
+# ---------------------------------------------------------
+#      Modifier    Key    Dispatcher         Value
+bind = $mod,       W,     togglegroup,
+bind = $mod,       Z,     changegroupactive, b
+bind = $mod,       X,     changegroupactive, f
+
+
+# Screenshot
+# ---------------------------------------------------------
+#      Modifier   Key    Dispatcher  Value
+bind = ,          Print, exec,       $screenshot_area
+bind = Alt,       Print, exec,       $screenshot_area_clipboard
+bind = SHIFT,     Print, exec,       $screenshot_screen
+bind = SHIFT ALT, Print, exec,       $screenshot_screen_clipboard
+
+
+# Audio
+# ---------------------------------------------------------
+#       Modifier  Key                   Dispatcher  Value
+bind  = ,         XF86AudioMute,        exec,       pactl set-sink-mute @DEFAULT_SINK@ toggle && $sink_volume_mute > $wob_socket
+binde = ,         XF86AudioLowerVolume, exec,       pactl set-sink-volume @DEFAULT_SINK@ -4% && $sink_volume > $wob_socket
+binde = ,         XF86AudioRaiseVolume, exec,       pactl set-sink-volume @DEFAULT_SINK@ +4% && $sink_volume > $wob_socket
+
+
+# Playback
+# ---------------------------------------------------------
+#       Modifier  Key            Dispatcher  Value
+bind = ,          XF86AudioPrev, exec,       playerctl --player=spotify,%any previous
+bind = ,          XF86AudioNext, exec,       playerctl --player=spotify,%any next
+bind = ,          XF86AudioPlay, exec,       playerctl --player=spotify,%any play-pause
+
+
+# Brightness
+# ---------------------------------------------------------
+#       Modifier  Key                    Dispatcher  Value
+binde = ,         XF86MonBrightnessDown, exec,       brightnessctl set 5- && $brightness > $wob_socket
+binde = ,         XF86MonBrightnessUp,   exec,       brightnessctl set +5 && $brightness > $wob_socket
+
+
+# Zoom
+# ---------------------------------------------------------
+#       Modifier  Key     Dispatcher  Value
+bind =  $mod, mouse_up,   exec,       $zoom i
+bind =  $mod, mouse_down, exec,       $zoom d
+binde = $mod, grave,      exec,       $zoom i
+binde = $mod, Escape,     exec,       $zoom d
+
+
+# Scratchpad
+# ---------------------------------------------------------
+#      Modifier    Key        Dispatcher              Value
+bind = $mod SHIFT, C,         movetoworkspace,        special:scratchpad
+bind = $mod,       C,         togglespecialworkspace, scratchpad
+bind = $mod,       S,         togglespecialworkspace, spotify
+bind = $mod,       backslash, togglespecialworkspace, shadowplay
+
+
diff --git a/hyprland/21-rules.conf b/hyprland/21-rules.conf
new file mode 100644
index 0000000..a6deb81
--- /dev/null
+++ b/hyprland/21-rules.conf
@@ -0,0 +1,16 @@
+# Window Rules #
+
+# Workspaces
+windowrulev2 = workspace special:shadowplay, title:(gpu-screen-recorder-gtk) 
+windowrulev2 = workspace special:spotify,    initialTitle:(Spotify Premium) 
+
+# Float
+windowrule   = float, org.kde.polkit-kde-authentication-agent-
+windowrulev2 = float, class:^(org.pulseaudio.pavucontrol)$
+windowrulev2 = float, class:^(thunderbird)$, title:^(.*Reminder)
+
+# Size
+windowrulev2 = size 1000 90%, class:^(org.pulseaudio.pavucontrol)$
+
+# Discord aliasing
+windowrule = nearestneighbor, ^(discord)$ 
diff --git a/hyprland/settings.conf b/hyprland/22-theme.conf
index dfaf6e4..9c06384 100644
--- a/hyprland/settings.conf
+++ b/hyprland/22-theme.conf
@@ -1,13 +1,11 @@
-############
 # Settings #
-############
 
 general {
     gaps_in = 2
     gaps_out = 5
     border_size = 2
-    col.active_border = rgba(657585ff)
-    col.inactive_border = rgba(59595977)
+    col.active_border = $col_active_border
+    col.inactive_border = $col_inactive_border
 
     layout = dwindle
 
@@ -27,11 +25,11 @@ decoration {
 }
 
 group {
-    col.border_active = 0x66ffff00
-    col.border_inactive = 0x66ffff99
+    col.border_active = $col_active_border
+    col.border_inactive = $col_inactive_border
 
     groupbar {
-        font_family = Iosevka Nerd Font
+        font_family = $font_primary
         font_size = 10
         gradients = false
         col.active = 0x66ffff00
@@ -50,6 +48,7 @@ animations {
     animation = border, 1, 5, default
     animation = borderangle, 1, 8, default
     animation = fade, 1, 3, default
+    animation = layers, 
     animation = workspaces, 1, 2, default
 }
 
@@ -65,7 +64,7 @@ dwindle {
 }
 
 master {
-    new_is_master = false
+    # new_is_master = false
 }
 
 gestures {
@@ -73,7 +72,9 @@ gestures {
 }
 
 misc {
-    disable_hyprland_logo = yes
+    disable_hyprland_logo = true
+    disable_splash_rendering = true
     force_default_wallpaper = 0
-    cursor_zoom_factor = 1
+    # cursor_zoom_factor = 1
+    vfr = false
 }
diff --git a/hyprland/binds.conf b/hyprland/binds.conf
deleted file mode 100644
index 4165398..0000000
--- a/hyprland/binds.conf
+++ /dev/null
@@ -1,99 +0,0 @@
-############
-# Keybinds #
-############
-
-$mainMod = SUPER
-
-# Programs
-bind = $mainMod, Return, exec, alacritty
-bind = $mainMod, Q, killactive, 
-bind = $mainMod SHIFT, Space, togglefloating, 
-bind = $mainMod, D, exec, pgrep -x wofi >/dev/null 2>&1 && killall wofi || wofi --show drun
-bind = $mainMod SHIFT, E, exec, ~/bin/exit-menu.sh
-
-# Move around
-bind = $mainMod, H, movefocus, l
-bind = $mainMod, J, movefocus, d
-bind = $mainMod, K, movefocus, u
-bind = $mainMod, L, movefocus, r
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
-
-# Move containers
-bind = $mainMod SHIFT, H, swapwindow, l
-bind = $mainMod SHIFT, J, swapwindow, d
-bind = $mainMod SHIFT, K, swapwindow, u
-bind = $mainMod SHIFT, L, swapwindow, r
-bind = $mainMod SHIFT, left, swapwindow, l
-bind = $mainMod SHIFT, right, swapwindow, r
-bind = $mainMod SHIFT, up, swapwindow, u
-bind = $mainMod SHIFT, down, swapwindow, d
-
-# Move workspaces
-bind = $mainMod, 1, workspace, 1
-bind = $mainMod, 2, workspace, 2
-bind = $mainMod, 3, workspace, 3
-bind = $mainMod, 4, workspace, 4
-bind = $mainMod, 5, workspace, 5
-bind = $mainMod, 6, workspace, 6
-bind = $mainMod, 7, workspace, 7
-bind = $mainMod, 8, workspace, 8
-bind = $mainMod, 9, workspace, 9
-bind = $mainMod, 0, workspace, 10
-
-# Move containers to workspace
-bind = $mainMod SHIFT, 1, movetoworkspace, 1
-bind = $mainMod SHIFT, 2, movetoworkspace, 2
-bind = $mainMod SHIFT, 3, movetoworkspace, 3
-bind = $mainMod SHIFT, 4, movetoworkspace, 4
-bind = $mainMod SHIFT, 5, movetoworkspace, 5
-bind = $mainMod SHIFT, 6, movetoworkspace, 6
-bind = $mainMod SHIFT, 7, movetoworkspace, 7
-bind = $mainMod SHIFT, 8, movetoworkspace, 8
-bind = $mainMod SHIFT, 9, movetoworkspace, 9
-bind = $mainMod SHIFT, 0, movetoworkspace, 10
-
-# Move/resize windows 
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-
-# Groups
-bind = $mainMod, W, togglegroup,
-bind = $mainMod, Z, changegroupactive, b
-bind = $mainMod, X, changegroupactive, f
-
-# Screenshot
-bind = ,Print, exec, /usr/bin/grimblast --notify save area - | swappy -f -
-bind = Alt,Print, exec, /usr/bin/grimblast --notify copy area
-bind = SHIFT,Print, exec, /usr/bin/grimblast --notify save screen - | swappy -f -
-bind = SHIFT ALT,Print, exec, /usr/bin/grimblast --notify copy screen
-
-# Audio
-bind = ,XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
-bind = ,XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
-bind = ,XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
-
-# Playback
-bind = ,XF86AudioPrev, exec, playerctl previous
-bind = ,XF86AudioNext, exec, playerctl next
-bind = ,XF86AudioPlay, exec, playerctl play-pause
-
-# Brightness
-bind = ,XF86MonBrightnessDown, exec, brightnessctl set 5-
-bind = ,XF86MonBrightnessUp, exec, brightnessctl set +5
-
-# Zoom
-bind = $mainMod, mouse_up, exec, ~/bin/hyprctl-zoom.sh i
-bind = $mainMod, mouse_down, exec, ~/bin/hyprctl-zoom.sh d
-binde = $mainMod, grave, exec, ~/bin/hyprctl-zoom.sh i
-binde = $mainMod, Escape, exec, ~/bin/hyprctl-zoom.sh d
-
-# Scratchpad
-bind = $mainMod SHIFT, C, movetoworkspace, special:scratchpad
-bind = $mainMod, C, togglespecialworkspace, scratchpad
-bind = $mainMod, backslash, togglespecialworkspace, shadowplay
-
-#bind = ,XF86PowerOff, exec, swaylock
-
diff --git a/hyprland/hypridle.conf b/hyprland/hypridle.conf
new file mode 100644
index 0000000..3e6b5bf
--- /dev/null
+++ b/hyprland/hypridle.conf
@@ -0,0 +1,21 @@
+general {
+    lock_cmd = pidof hyprlock || hyprlock
+    before_sleep_cmd = loginctl lock-session
+    after_sleep_cmd = hyprctl dispatch dpms on
+}
+
+listener {
+    timeout = 300
+    on-timeout = notify-send 'Power' 'System will suspend soon due to inactivity'
+}
+
+listener {
+    timeout = 310
+    on-timeout = loginctl lock-session
+}
+
+listener {
+    timeout = 320
+    on-timeout = systemctl suspend
+}
+
diff --git a/hyprland/hyprland.conf b/hyprland/hyprland.conf
index 630cc3a..a7f99c3 100644
--- a/hyprland/hyprland.conf
+++ b/hyprland/hyprland.conf
@@ -1,6 +1,16 @@
-source = ~/.config/hypr/input.conf
-source = ~/.config/hypr/monitors.conf
-source = ~/.config/hypr/binds.conf
-source = ~/.config/hypr/rules.conf
-source = ~/.config/hypr/settings.conf
-source = ~/.config/hypr/startup.conf
+# 00 Vars
+source = 00-theme-vars.conf
+source = 01-system-vars.conf
+
+# 10 Exec
+source = 10-startup.conf
+source = 11-environment.conf
+
+# 20 Hyprland configuration
+source = 20-binds.conf
+source = 21-rules.conf
+source = 22-theme.conf
+
+# Other stuff
+source = input.conf
+source = monitors.conf
diff --git a/hyprland/hyprlock.conf b/hyprland/hyprlock.conf
new file mode 100644
index 0000000..9250479
--- /dev/null
+++ b/hyprland/hyprlock.conf
@@ -0,0 +1,112 @@
+# BACKGROUND
+background {
+    path = ~/.config/hypr/wallpaper.png
+    blur_passes = 1
+    contrast = 0.8
+    brightness = 0.5
+    vibrancy = 0.1
+    vibrancy_darkness = 0.0
+}
+
+# GENERAL
+general {
+    no_fade_in = false
+    no_fade_out = true
+    grace = 0
+    ignore_empty_input = true
+    hide_cursor = true
+}
+
+# INPUT FIELD
+input-field {
+    size = 300, 50
+    outline_thickness = 3
+    dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    outer_color = rgb(434e59)
+    inner_color = rgb(22282e)
+    font_color = rgb(200, 200, 200)
+    fade_on_empty = true
+    fade_timeout = 2000
+    rounding = 0
+    font_family = Iosevka Nerd Font
+    placeholder_text = <i><span foreground="##cdd6f4">Password</span></i>
+    fail_text = $FAIL 
+    hide_input = false
+    position = 0, -120
+    halign = center
+    valign = center
+}
+
+# FAILED ATTEMPTS
+label {
+    text = cmd[update:1000] [ ! -z "$ATTEMPTS[]" ] && echo "$ATTEMPTS[] failed attempt(s)"
+    color = rgba(255, 160, 6, 0.6)
+    # color = rgba(255, 255, 255, 0.8)
+    font_size = 20
+    font_family = Iosevka Nerd Font 
+    position = 0, -200
+    halign = center
+    valign = center
+}
+
+# DATE
+label {
+    text = cmd[update:1000] echo "$(date +"%A, %d %B %Y")"
+    color = rgba(255, 255, 255, 0.7)
+    font_size = 40
+    font_family = Iosevka Nerd Font ExtraBold
+    position = 0, 280
+    halign = center
+    valign = center
+}
+
+# TIME
+label {
+    text = cmd[update:1000] echo "$(date +"%H:%M")"
+    color = rgba(255, 255, 255, 0.8)
+    font_size = 120
+    font_family = Iosevka Nerd Font ExtraBold
+    position = 0, 50
+    halign = center
+    valign = center
+}
+
+# LAYOUT
+label {
+    text = Layout: $LAYOUT
+    color = rgba(255, 255, 255, 0.8)
+    font_size = 14
+    font_family = Iosevka Nerd Font
+
+    shadow_passes = 1
+    shadow_size = 5
+    shadow_boost = 1.8
+
+    position = -10, -10
+    halign = right
+    valign = top
+}
+
+# BATTERY
+label {
+    text = cmd[update:1000] echo "Battery: $(cat /sys/class/power_supply/BAT1/capacity)%"
+    color = rgba(255, 255, 255, 0.6)
+    font_size = 18
+    font_family = Iosevka Nerd Font ExtraBold
+    position = 0, 0
+    halign = center
+    valign = bottom
+}
+
+# IDLE INHIBITOR
+label {
+    text = cmd[update:1000] [[ `~/bin/get-inhibit-idle-status.sh | jq -r .alt` != "running" ]] && echo "Automatic Suspend Inhibited"
+    color = rgba(255, 160, 6, 0.6)
+    font_size = 14
+    font_family = Iosevka Nerd Font ExtraBold
+    position = 0, 60
+    halign = center
+    valign = bottom
+}
diff --git a/hyprland/hyprpaper.conf b/hyprland/hyprpaper.conf
index 1a1bfb6..a3a29a1 100644
--- a/hyprland/hyprpaper.conf
+++ b/hyprland/hyprpaper.conf
@@ -1,3 +1,5 @@
 preload = ~/.config/hypr/wallpaper.jpg
 
 wallpaper = ,~/.config/hypr/wallpaper.jpg
+
+splash = false
diff --git a/hyprland/input.conf b/hyprland/input.conf
index b6050c9..c84c68c 100644
--- a/hyprland/input.conf
+++ b/hyprland/input.conf
@@ -1,6 +1,4 @@
-#################
 # Input Devices #
-#################
 #
 # List input devices with
 #   hyprctl devices
@@ -27,16 +25,33 @@ input {
     sensitivity = 0 
 }
 
-device:razer-razer-deathadder-v2 {
+# device:razer-razer-deathadder-v2 {
+#     sensitivity = 0
+#     accel_profile = flat
+# }
+# 
+# device:razer-razer-deathadder-v2-1 {
+#     sensitivity = 0
+#     accel_profile = flat
+# }
+# 
+# device:bm30x-mouse {
+#     accel_profile = flat
+# }
+
+device {
+    name = razer-razer-deathadder-v2 
     sensitivity = 0
     accel_profile = flat
 }
 
-device:razer-razer-deathadder-v2-1 {
+device {
+    name = razer-razer-deathadder-v2-1 
     sensitivity = 0
     accel_profile = flat
 }
 
-device:bm30x-mouse {
+device {
+    name = bm30x-mouse
     accel_profile = flat
 }
diff --git a/hyprland/monitors.conf b/hyprland/monitors.conf
index 93a202d..1b9d1c0 100644
--- a/hyprland/monitors.conf
+++ b/hyprland/monitors.conf
@@ -1,9 +1,16 @@
-##################
 # Output Devices #
-##################
 # 
 # List outputs with
 #   hyprctl monitors
 #
+# Output syntax
+#   monitor = name, resolution, position, scale
+#
+# Mirror another output
+#   monitor = DP-3, 1920x1080@60, 0x0, 1, mirror, DP-2
+#   monitor = , preferred, auto, 1, mirror, DP-1
+
+monitor = eDP-1, preferred, auto, 1.56667
+monitor = eDP-1, preferred, auto, 1.56667, vrr, 0
 
-monitor = eDP-1, preferred, auto, 1.5
+monitor = desc:OEM 19W_LCD_TV, preferred, auto, 1.6 
diff --git a/hyprland/rules.conf b/hyprland/rules.conf
deleted file mode 100644
index 6042b7e..0000000
--- a/hyprland/rules.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-################
-# Window Rules #
-################
-
-windowrulev2 = workspace special:shadowplay,class:(gpu-screen-recorder-gtk) 
-windowrule = nearestneighbor,^(discord)$ 
-windowrule = float,org.kde.polkit-kde-authentication-agent-
diff --git a/hyprland/startup.conf b/hyprland/startup.conf
deleted file mode 100644
index f98eb35..0000000
--- a/hyprland/startup.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-####################
-# Startup Programs #
-####################
-
-env = WLR_NO_HARDWARE_CURSORS,1
-
-exec-once = waybar
-exec-once = hyprpaper
-exec-once = mako
-exec-once = easyeffects --gapplication-service
-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once = /usr/lib/polkit-kde-authentication-agent-1
-exec-once = ~/bin/swayidle.sh
-exec-once = ~/bin/battery-notify.sh
-exec-once = ~/bin/hyprctl-zoom-daemon.sh
-#exec-once = systemd-inhibit --what=handle-power-key sleep infinity
-