7 files changed, 76 insertions, 124 deletions
diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf
index 9a7f609..6602768 100644
--- a/.config/hypr/binds.conf
+++ b/.config/hypr/binds.conf
@@ -2,14 +2,13 @@
 $mainMod = SUPER
 
 # Set programs that you use
-$terminal = alacritty
-$fileManager = kitty xplr
-$browser = waterfox
+$terminal = kitty
+$browser = firefox
 $menu = tofi-run | xargs hyprctl dispatch exec --
 $appMenu = tofi-drun | xargs hyprctl dispatch exec --
 
 # Main Binds
-bind = $mainMod, RETURN, exec, $appMenu
+bind = $mainMod, R, exec, $appMenu
 bind = $mainMod CTRL, RETURN, exec, $menu
 bind = $mainMod, A, exec, $terminal
 bind = $mainMod, D, killactive,
@@ -20,7 +19,6 @@ bind = $mainMod, S, exec, grim -o eDP-1 ~/Pictures/Screenshots/$(date +'%s_grim.
 # screenshot and copy
 bind = $mainMod CTRL SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy
 bind = $mainMod CTRL, S, exec, grim -o eDP-1 - | wl-copy
-bind = $mainMod, M, exit,
 bind = $mainMod, V, togglefloating,
 bind = $mainMod CTRL, P, exec, hyprpicker -a
 bind = $mainMod, L, exec, hyprlock
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 9db8796..ec6c213 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -1,29 +1,11 @@
 source=binds.conf
-source=monitors.conf
-source=style.conf
-source=windowrules.conf
-
-# Slow app launch fix
-exec-once = systemctl --user import-environment &
-exec-once = hash dbus-update-activation-environment 2>/dev/null &
-exec-once = dbus-update-activation-environment --systemd &
+
 exec-once = startup
-#exec-once = xdg-desktop-portal-hyprland &
+env = XCURSOR_SIZE,24
+env = HYPRCURSOR_SIZE,24
 
 exec-once = hyprctl dispatch workspace 1
 
-exec-once = gsettings set org.gnome.desktop.interface cursor-theme "Bibata-Modern-Classic"
-exec-once = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
-exec-once = gsettings set org.gnome.desktop.interface gtk-theme Adwaita
-
-# Some default env vars.
-env = QT_QPA_PLATFORMTHEME,qt6ct # change to qt6ct if you have that 
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-env = XCURSOR_THEME,"Bibata-Modern-Classic"
-env = XCURSOR_SIZE,24
-env = HYPRCURSOR_THEME,HyprBibataModernClassicSVG
-
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
   kb_layout = us
@@ -46,15 +28,75 @@ input {
 }
 
 general {
-  #layout = dwindle
   layout = master
-
-  # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
   allow_tearing = false
+  resize_on_border = false
+
+  gaps_in = 0
+  gaps_out = 0
+
+  border_size = 2
+
+  col.active_border = rgba(33ccffee)
+  col.inactive_border = rgba(595959aa)
 }
 
-windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$
-windowrulev2 = noanim,class:^(xwaylandvideobridge)$
-windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$
-windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$
-windowrulev2 = noblur,class:^(xwaylandvideobridge)$
+decoration {
+  # See https://wiki.hyprland.org/Configuring/Variables/ for more
+
+  rounding = 0
+  
+  blur {
+    enabled = true
+    size = 2
+    passes = 3
+  }
+}
+
+master {
+  # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+  new_status = master
+  new_on_top = true
+  orientation = left
+  mfact = 0.6
+}
+
+misc {
+  # See https://wiki.hyprland.org/Configuring/Variables/ for more
+  force_default_wallpaper = 1 # Set to 0 or 1 to disable the anime mascot wallpapers
+}
+
+animations {
+    enabled = yes, please :)
+
+    # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+
+    bezier = easeOutQuint,0.23,1,0.32,1
+    bezier = easeInOutCubic,0.65,0.05,0.36,1
+    bezier = linear,0,0,1,1
+    bezier = almostLinear,0.5,0.5,0.75,1.0
+    bezier = quick,0.15,0,0.1,1
+
+    animation = global, 1, 10, default
+    animation = border, 1, 5.39, easeOutQuint
+    animation = windows, 1, 4.79, easeOutQuint
+    animation = windowsIn, 1, 4.1, easeOutQuint, popin 87%
+    animation = windowsOut, 1, 1.49, linear, popin 87%
+    animation = fadeIn, 1, 1.73, almostLinear
+    animation = fadeOut, 1, 1.46, almostLinear
+    animation = fade, 1, 3.03, quick
+    animation = layers, 1, 3.81, easeOutQuint
+    animation = layersIn, 1, 4, easeOutQuint, fade
+    animation = layersOut, 1, 1.5, linear, fade
+    animation = fadeLayersIn, 1, 1.79, almostLinear
+    animation = fadeLayersOut, 1, 1.39, almostLinear
+    animation = workspaces, 1, 1.94, almostLinear, fade
+    animation = workspacesIn, 1, 1.21, almostLinear, fade
+    animation = workspacesOut, 1, 1.94, almostLinear, fade
+}
+
+# Ignore maximize requests from apps. You'll probably like this.
+windowrule = suppressevent maximize, class:.*
+
+# Fix some dragging issues with XWayland
+windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
+\ No newline at end of file
diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf
index f27c3c5..0438755 100644
--- a/.config/hypr/hyprpaper.conf
+++ b/.config/hypr/hyprpaper.conf
@@ -1,2 +1,2 @@
-preload = /home/jack/.dotfiles/wallpapers/active/wallpaper.png
-wallpaper = ,/home/jack/.dotfiles/wallpapers/active/wallpaper.png
+preload = /home/jack/.dotfiles/wallpapers/grass.png
+wallpaper = ,/home/jack/.dotfiles/wallpapers/grass.png
diff --git a/.config/hypr/misc.conf b/.config/hypr/misc.conf
deleted file mode 100644
index e69de29..0000000
--- a/.config/hypr/misc.conf
+++ /dev/null
diff --git a/.config/hypr/monitors.conf b/.config/hypr/monitors.conf
deleted file mode 100644
index 5fc6065..0000000
--- a/.config/hypr/monitors.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# See https://wiki.hyprland.org/Configuring/Monitors/
-#monitor=,2560x1440@144,0x0,auto
-monitor=,highres,auto,1
-#monitor=DP-2,1920x1080@60,2560x0,auto
-
-# FOR HYPRSOME (MULTIPLE MONITORS)
-workspace=1,monitor:eDP-1
-workspace=2,monitor:eDP-1
-workspace=3,monitor:eDP-1
-workspace=4,monitor:eDP-1
-workspace=5,monitor:eDP-1
-workspace=6,monitor:eDP-1
-workspace=7,monitor:eDP-1
-workspace=8,monitor:eDP-1
-workspace=9,monitor:eDP-1
-workspace=10,monitor:eDP-1
-
-workspace=11,monitor:eDP-2
-workspace=12,monitor:eDP-2
-workspace=13,monitor:eDP-2
-workspace=14,monitor:eDP-2
-workspace=15,monitor:eDP-2
-workspace=17,monitor:eDP-2
-workspace=18,monitor:eDP-2
-workspace=19,monitor:eDP-2
-workspace=10,monitor:eDP-2
diff --git a/.config/hypr/style.conf b/.config/hypr/style.conf
deleted file mode 100644
index f89d137..0000000
--- a/.config/hypr/style.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-general {
-  gaps_in = 0
-  gaps_out = 0
-
-  border_size = 1
-}
-
-decoration {
-  # See https://wiki.hyprland.org/Configuring/Variables/ for more
-
-  rounding = 0
-  
-  blur {
-    enabled = true
-    size = 2
-    passes = 3
-  }
-
-  # drop_shadow = no 
-  # shadow_range = 4
-  # shadow_render_power = 3
-  # col.shadow = rgba(1a1a1aee)
-}
-
-animations {
-  enabled = yes
-
-  bezier = defaultBezier, 0.00, 1.0, 0.0, 1.0
-
-  animation = windows, 1, 7, defaultBezier, slide
-  animation = windowsOut, 1, 7, defaultBezier, slide
-  animation = border, 1, 10, default
-  animation = borderangle, 0#1, 8, default
-  animation = fade, 0#1, 3, default
-  animation = workspaces, 0#1, 6, defaultBezier
-}
-
-dwindle {
-  # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
-  pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-  preserve_split = yes # you probably want this
-}
-
-master {
-  # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-  new_status = master
-  new_on_top = true
-  orientation = left
-  mfact = 0.6
-}
-
-gestures {
-  # See https://wiki.hyprland.org/Configuring/Variables/ for more
-  workspace_swipe = on
-}
-
-misc {
-  # See https://wiki.hyprland.org/Configuring/Variables/ for more
-  force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
-}
diff --git a/.config/hypr/windowrules.conf b/.config/hypr/windowrules.conf
deleted file mode 100644
index 30cbcaa..0000000
--- a/.config/hypr/windowrules.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-windowrulev2 = float,title:^(Friends List)$
-windowrulev2 = float,title:^(btm)$