7 files changed, 51 insertions, 102 deletions
diff --git a/home-config/hypr/config.d/autostart.sh b/home-config/hypr/config.d/autostart.sh
deleted file mode 100755
index 9b18715..0000000
--- a/home-config/hypr/config.d/autostart.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-pipewire & &> ~/.log/pipewire
-pipewire-pulse & &> ~/.log/pipewire-pulse
-wireplumber & &> ~/.log/wireplumber
-
-/usr/lib/xdg-desktop-portal -r &
-/usr/lib/xdg-desktop-portal-hyprland -r &
-
-waybar &
-
-mako &
-
-hyprpaper &
-
-nm-applet --indicator &
-
-/usr/bin/gnome-keyring-daemon --foreground &
-
-discord --enable-features=UseOzonePlatform --ozone-platform=wayland &
-element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland &
diff --git a/home-config/hypr/config.d/theme.conf b/home-config/hypr/config.d/theme.conf
deleted file mode 100644
index 90e23e8..0000000
--- a/home-config/hypr/config.d/theme.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-general {
-    gaps_in = $radius
-    gaps_out = $gaps
-    border_size = $border
-    col.active_border = rgba(aaaaaa90)
-    col.inactive_border = rgba(77777790)
-    col.group_border_active = rgba(aaaaaa90)
-    col.group_border = rgba(77777790)
-
-    layout = dwindle
-}
-
-decoration {
-
-    rounding = 5
-    drop_shadow = yes
-    shadow_range = 4
-    shadow_render_power = 3
-    col.shadow = rgba(1a1a1aee)
-}
-
-animations {
-    enabled = yes
-
-    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-
-    #animation = windows, 1, 7, myBezier
-    #animation = windowsOut, 1, 7, default, popin 80%
-    animation = border, 1, 10, default
-    animation = borderangle, 1, 8, default
-    animation = fade, 1, 7, default
-    animation = workspaces, 1, 6, default
-}
-
-windowrule = float, ^(wlogout)$
-windowrule = move 12.5% 12.5%, ^(wlogout)$
-windowrule = size 75% 75%, ^(wlogout)$
-windowrule = noborder, ^(wlogout)$
-windowrule = noshadow, ^(wlogout)$
-windowrule = nofullscreenrequest, ^(wlogout)$
diff --git a/home-config/hypr/hyprpaper.conf b/home-config/hypr/hyprpaper.conf
deleted file mode 100644
index 1bfca3c..0000000
--- a/home-config/hypr/hyprpaper.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-preload = ~/sync/wallpapers/nya0.png
-wallpaper = ,~/sync/wallpapers/nya0.png
diff --git a/home-config/hypr/config.d/input.conf b/home/config/hypr/config.d/input.conf
index 947ae3d..363c473 100644
--- a/home-config/hypr/config.d/input.conf
+++ b/home/config/hypr/config.d/input.conf
@@ -1,13 +1,12 @@
+monitor= eDP-1, highres, auto, $scale
 
-monitor= eDP-1, 3072x1920, 0x0, $scale
-
-env = XCURSOR_SIZE, 24
+env = GDK_SCALE,1.25
 
 input {
     kb_layout = us
     kb_variant =
     kb_model =
-    kb_options = gtp:alt_shit_toggle, compose:rctrl
+    kb_options = gtp:alt_shit_toggle, compose:ralt
     kb_rules =
 
     follow_mouse = 1
@@ -18,7 +17,3 @@ input {
 
     sensitivity = 0
 }
-
-device:epic-mouse-v1 {
-    sensitivity = -0.5
-}
diff --git a/home-config/hypr/config.d/keybinds.conf b/home/config/hypr/config.d/keybinds.conf
index 3351e85..4c24083 100644
--- a/home-config/hypr/config.d/keybinds.conf
+++ b/home/config/hypr/config.d/keybinds.conf
@@ -1,34 +1,30 @@
 
+bind = $mod SHIFT, SPACE, togglefloating
 bind = $mod, Return, exec, $term
 bind = $mod, W, exec, $browser
-bind = $mod SHIFT, SPACE, togglefloating
-bind = $mod, D, exec, $menu 
+bind = $mod, D, exec, $menu
 bind = $mod, J, togglesplit
 bind = $mod, F, fullscreen
-bind = $mod, L, exec, killall wlogout || wlogout --css ~/scripts/power/style.css -l ~/scripts/power/layout
-bind = $mod, P, exec, killall wlogout || wlogout --css ~/scripts/monitor/style.css -l ~/scripts/monitor/layout -b 2 -L 400 -R 400
-bind = $mod SHIFT, B, exec, killall waybar && waybar
-bind = $mod SHIFT, Q, killactive
-bind = $mod SHIFT, W, exec, hyprpaper
 
-$monitor_sh = ~/scripts/monitor
-bind = $mod ALT, right, exec, $monitor_sh right
-bind = $mod ALT, left, exec, $monitor_sh left
-bind = $mod ALT, up, exec, $monitor_sh mirror
-bind = $mod ALT, down, exec, $monitor_sh disable
+bind = $mod, L, exec, hyprlock
+bind = $mod SHIFT, L, exec, killall Hyprland
+
+bind = $mod SHIFT, Q, killactive
+bind = $mod, F5, exec, sh -c 'killall waybar; waybar --config ~/.config/waybar/config.hypr'
 
 binde =, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+
 binde =, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
 binde =, XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
 binde =, XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
 
-binde =, XF86MonBrightnessDown, exec, brightnessctl set 5%-
-binde =, XF86MonBrightnessUp, exec, brightnessctl set 5%+
-
 binde =, XF86AudioPlay, exec, playerctl play-pause
 binde =, XF86AudioNext, exec, playerctl next
 binde =, XF86AudioPrev, exec, playerctl previous
 
-bind = ,Print, exec, grim -g "$(slurp)" - | wl-copy   
+binde =, XF86MonBrightnessDown, exec, brightnessctl set 5%-
+binde =, XF86MonBrightnessUp, exec, brightnessctl set 5%+
+
+bind = $mod SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Hyprland" "Screenshot copied to clipboard"
+bind = , Print, exec, grim - | wl-copy -t iamge/png && notify-send -t 3000 "Hyprland" "Full screen copied to clipboard"
 bind = SHIFT, Print, exec, slurp -p | grim -g - - | convert - txt:- | tail -n 1 | awk '{print $3}' | wl-copy
-bind = CONTROL, Print, exec, 
+
diff --git a/home-config/hypr/config.d/workspaces.conf b/home/config/hypr/config.d/workspaces.conf
index 2f3e81c..408b05f 100644
--- a/home-config/hypr/config.d/workspaces.conf
+++ b/home/config/hypr/config.d/workspaces.conf
@@ -1,6 +1,6 @@
 
 dwindle {
-    pseudotile = yes 
+    pseudotile = yes
     preserve_split = yes
 }
 
@@ -17,10 +17,10 @@ bind = $mod, down, movefocus, d
 
 # Move window across workspace with mod + arrow keys
 
-bind = $mod SHIFT, left, movewindow, l
-bind = $mod SHIFT, right, movewindow, r
-bind = $mod SHIFT, up, movewindow, u
-bind = $mod SHIFT, down, movewindow, d
+bind = $mod SHIFT, left, hy3:movewindow, l
+bind = $mod SHIFT, right, hy3:movewindow, r
+bind = $mod SHIFT, up, hy3:movewindow, u
+bind = $mod SHIFT, down, hy3:movewindow, d
 
 # Switch workspaces with mod + [0-9]
 
@@ -47,6 +47,27 @@ bind = $mod SHIFT, 8, movetoworkspacesilent, 8
 bind = $mod SHIFT, 9, movetoworkspacesilent, 9
 bind = $mod SHIFT, 0, movetoworkspacesilent, 10
 
+# Move to tab
+
+bind = $mod CONTROL, 1, hy3:focustab, index, 01
+bind = $mod CONTROL, 2, hy3:focustab, index, 02
+bind = $mod CONTROL, 3, hy3:focustab, index, 03
+bind = $mod CONTROL, 4, hy3:focustab, index, 04
+bind = $mod CONTROL, 5, hy3:focustab, index, 05
+bind = $mod CONTROL, 6, hy3:focustab, index, 06
+bind = $mod CONTROL, 7, hy3:focustab, index, 07
+bind = $mod CONTROL, 8, hy3:focustab, index, 08
+bind = $mod CONTROL, 9, hy3:focustab, index, 09
+bind = $mod CONTROL, 0, hy3:focustab, index, 10
+
+bindn = , mouse:272, hy3:focustab, mouse
+bindn = , mouse_down, hy3:focustab, l, require_hovered
+bindn = , mouse_up, hy3:focustab, r, require_hovered
+
+bind = $mod SHIFT, B, hy3:makegroup, h
+bind = $mod SHIFT, V, hy3:makegroup, v
+bind = $mod SHIFT, C, hy3:changegroup, toggletab
+
 # Scroll through existing workspaces with mod + scroll
 
 bind = $mod, mouse_down, workspace, e+1
diff --git a/home-config/hypr/hyprland.conf b/home/config/hypr/hyprland.conf
index 743fa37..ccea461 100644
--- a/home-config/hypr/hyprland.conf
+++ b/home/config/hypr/hyprland.conf
@@ -1,22 +1,22 @@
-exec-once = dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP=Hyprland
-
 $mod = SUPER
 
-$term = alacritty
+$term = kitty
 
 $menu = wofi --allow-images --show drun --prompt "Search Program"
 
-$scale = 1.5
+$scale = 1.25
 
 $radius = 5
-$gaps = 10
-$border = 3
+$border = 2
 
-$browser = firefox
+$browser = librewolf
 
-source = ~/.config/hypr/config.d/theme.conf
+source = ~/.config/hypr/config.d/plugins.conf
+source = ~/.config/hypr/config.d/colors.conf
 source = ~/.config/hypr/config.d/keybinds.conf
+source = ~/.config/hypr/config.d/theme.conf
 source = ~/.config/hypr/config.d/input.conf
 source = ~/.config/hypr/config.d/workspaces.conf
+source = ~/.config/hypr/monitors.conf
 
-exec-once = ~/.config/hypr/config.d/autostart.sh
+exec-once = ~/.config/hypr/scripts.d/autostart.sh