i forgor to commit stuff

11 files changed, 179 insertions, 24 deletions

diff --git a/.config/hypr/config.d/input.conf b/.config/hypr/config.d/input.conf
index 32843aa..0ea3797 100644
--- a/.config/hypr/config.d/input.conf
+++ b/.config/hypr/config.d/input.conf
@@ -1,6 +1,6 @@
+monitor= eDP-1, highres, auto, $scale
 
-monitor= eDP-1, 2560x1600, 0x0, $scale
-
+env = GDK_SCALE,1.25
 env = XCURSOR_SIZE, 24
 
 input {
@@ -18,7 +18,3 @@ input {
 
     sensitivity = 0
 }
-
-device:epic-mouse-v1 {
-    sensitivity = -0.5
-}
diff --git a/.config/hypr/config.d/keybinds.conf b/.config/hypr/config.d/keybinds.conf
index eaa625f..815f7d2 100644
--- a/.config/hypr/config.d/keybinds.conf
+++ b/.config/hypr/config.d/keybinds.conf
@@ -2,13 +2,13 @@
 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 SHIFT, C, togglegroup
 bind = $mod, F, fullscreen
 bind = $mod SHIFT, B, exec, killall waybar && waybar --config ~/.config/waybar/config.hypr
 bind = $mod SHIFT, Q, killactive
-bind = $mod, L, exec, swaylock
+bind = $mod, L, exec, hyprlock
 bind = $mod SHIFT, L, exec, killall Hyprland
 bind = $mod, TAB, changegroupactive
 
@@ -24,7 +24,7 @@ binde =, XF86AudioPlay, exec, playerctl play-pause
 binde =, XF86AudioNext, exec, playerctl next
 binde =, XF86AudioPrev, exec, playerctl previous
 
-bind = $mod SHIFT, s, exec, grim -g "$(slurp)" - | wl-copy -t image/png && notify-send -t 3000 "Sway" "Screenshot copied to clipboard" 
+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
 
diff --git a/.config/hypr/config.d/theme.conf b/.config/hypr/config.d/theme.conf
index 22ff1bd..09a624d 100644
--- a/.config/hypr/config.d/theme.conf
+++ b/.config/hypr/config.d/theme.conf
@@ -1,9 +1,9 @@
 general {
-    gaps_in = $radius
+    gaps_in = 6
     gaps_out = $gaps
-    border_size = 0
-    col.active_border = rgba(aaaaaa00)
-    col.inactive_border = rgba(77777700)
+    border_size = $border
+    col.active_border = 0xffaaaaaa
+    col.inactive_border = 0xff777777
     layout = dwindle
 }
 
@@ -13,11 +13,12 @@ group {
     col.border_locked_active = rgb(14171d) rgb(14171d) 0deg
     col.border_locked_inactive = rgb(14171d) rgb(14171d) 0deg
     groupbar {
-        enabled = false
-        gradients = false
+        enabled = true
+        gradients = true
         font_family = monospace
-        font_size = 14
-        col.active = rgb(14171d) rgb(14171d) 0deg
+        font_size = 12
+        height = 16
+        col.active = rgb(24272d) rgb(24272d) 0deg
         col.inactive = rgb(14171d) rgb(14171d) 0deg
         col.locked_active = rgb(14171d) rgb(14171d) 0deg
         col.locked_inactive = rgb(14171d) rgb(14171d) 0deg
@@ -25,7 +26,7 @@ group {
 }
 
 decoration {
-    rounding = 0
+    rounding = $radius
     drop_shadow = yes
     shadow_range = 4
     shadow_render_power = 3
@@ -42,3 +43,20 @@ animations {
     animation = fade, 1, 7, default
     animation = workspaces, 1, 6, default
 }
+
+xwayland {
+  force_zero_scaling = true
+  use_nearest_neighbor = false
+}
+
+env = GDK_BACKEND,wayland,x11
+env = SDL_VIDEODRIVER,wayland
+env = CLUTTER_BACKEND,wayland
+
+env = XDG_CURRENT_DESKTOP,Hyprland
+env = XDG_SESSION_DESKTOP,Hyprland
+
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+env = QT_QPA_PLATFORM,wayland;xcb
+env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+env = QT_QPA_PLATFORMTHEME,gtk2
diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf
new file mode 100644
index 0000000..d0a977a
--- /dev/null
+++ b/.config/hypr/hypridle.conf
@@ -0,0 +1,35 @@
+general {
+    lock_cmd = pidof hyprlock || hyprlock       # dbus/sysd lock command (loginctl lock-session)
+    before_sleep_cmd = loginctl lock-session     # command ran before sleep
+    after_sleep_cmd = hyprctl dispatch dpms on  # command ran after sleep
+    ignore_dbus_inhibit = false                 # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
+}
+
+listener {
+    timeout = 150                                # 2.5min.
+    on-timeout = brightnessctl -s set 10         # set monitor backlight to minimum, avoid 0 on OLED monitor.
+    on-resume = brightnessctl -r                 # monitor backlight restore.
+}
+
+# turn off keyboard backlight, comment out this section if you dont have a keyboard backlight.
+listener {
+    timeout = 150                                          # 2.5min.
+    on-timeout = brightnessctl -sd rgb:kbd_backlight set 0 # turn off keyboard backlight.
+    on-resume = brightnessctl -rd rgb:kbd_backlight        # turn on keyboard backlight.
+}
+
+listener {
+    timeout = 300                                 # 5min
+    on-timeout = loginctl lock-session            # lock screen when timeout has passed
+}
+
+listener {
+    timeout = 330                                 # 5.5min
+    on-timeout = hyprctl dispatch dpms off        # screen off when timeout has passed
+    on-resume = hyprctl dispatch dpms on          # screen on when activity is detected after timeout has fired.
+}
+
+listener {
+    timeout = 1800                                # 30min
+    on-timeout = systemctl suspend                # suspend pc
+}
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index b3611a7..b0b267b 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -1,5 +1,4 @@
-exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP GTK_THEME
-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY GTK_THEME XDG_CURRENT_DESKTOP=Hyprland
+exec-once = ~/.config/hypr/scripts.d/systemd.sh
 
 $mod = SUPER
 
@@ -11,7 +10,7 @@ $scale = 1.25
 
 $radius = 5
 $gaps = 10
-$border = 3
+$border = 0
 
 $browser = librewolf
 
@@ -19,5 +18,6 @@ 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
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
new file mode 100644
index 0000000..19ee788
--- /dev/null
+++ b/.config/hypr/hyprlock.conf
@@ -0,0 +1,71 @@
+# BACKGROUND
+background {
+    monitor =
+    path = ~/.config/desktop-common/wallpapers/davekat.png
+    blur_passes = 3
+    contrast = 0.8916
+    brightness = 0.8172
+    vibrancy = 0.1696
+    vibrancy_darkness = 0.0
+}
+
+# GENERAL
+general {
+    no_fade_in = false
+    grace = 0
+    disable_loading_bar = true
+}
+
+# INPUT FIELD
+input-field {
+    monitor =
+    size = 250, 60
+    outline_thickness = 2
+    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 = rgba(0, 0, 0, 0)
+    inner_color = rgba(0, 0, 0, 0.5)
+    font_color = rgb(200, 200, 200)
+    fade_on_empty = false
+    placeholder_text = <i><span foreground="##cdd6f4">Input Password...</span></i>
+    hide_input = false
+    position = 0, -120
+    halign = center
+    valign = center
+}
+
+# TIME
+label {
+    monitor =
+    text = cmd[update:1000] echo "$(date +"%-H:%M:%S")"
+    #color = rgba(255, 255, 255, 0.6)
+    font_size = 80
+    font_family = JetBrains Mono Nerd Font Mono ExtraBold
+    position = 0, 500
+    halign = center
+    valign = center
+}
+
+# PRFOLE IMAGE
+image {
+    monitor =
+    path = ~/.config/desktop-common/pfps/karkat.png
+    size = 300
+    rounding = -1
+    border_size = 0
+    position = 0, 250
+    halign = center
+    valign = center
+}
+
+# USER
+label {
+    monitor =
+    text = Freya Murphy
+    font_family = JetBrains Mono Nerd Font Mono ExtraBold
+    font_size = 25
+    position = 0, 50
+    halign = center
+    valign = center
+}
diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf
index 9d20acb..1e2fedb 100644
--- a/.config/hypr/hyprpaper.conf
+++ b/.config/hypr/hyprpaper.conf
@@ -1,2 +1,3 @@
-preload = ~/.config/desktop-common/wallpapers/blue.jpg
-wallpaper = ,~/.config/desktop-common/wallpapers/blue.jpg
+preload = ~/.config/desktop-common/wallpapers/davekat.png
+wallpaper = ,~/.config/desktop-common/wallpapers/davekat.png
+splash = false
diff --git a/.config/hypr/monitors.conf b/.config/hypr/monitors.conf
new file mode 100644
index 0000000..af042dd
--- /dev/null
+++ b/.config/hypr/monitors.conf
@@ -0,0 +1,4 @@
+# Generated by nwg-displays on 2024-05-08 at 19:19:19. Do not edit manually.
+
+monitor=eDP-1,2560x1600@90.0,0x0,1.25,bitdepth,10
+monitor=HDMI-A-1,2560x1440@59.95,2048x0,1.0
diff --git a/.config/hypr/scripts.d/autostart.sh b/.config/hypr/scripts.d/autostart.sh
new file mode 100755
index 0000000..01a34e2
--- /dev/null
+++ b/.config/hypr/scripts.d/autostart.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+waybar --config $HOME/.config/waybar/config.hypr &
+
+nm-applet --indicator &
+
+/usr/bin/gnome-keyring-daemon --foreground &
+wl-clip-persist --clipboard both &
+
+gtk-launch discord &
+gtk-launch io.element.Element &
+thunderbird &
+
+hyprpaper &
+hypridle &
diff --git a/.config/hypr/scripts.d/systemd.sh b/.config/hypr/scripts.d/systemd.sh
new file mode 100755
index 0000000..8fd5c39
--- /dev/null
+++ b/.config/hypr/scripts.d/systemd.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+systemctl --user set-environment XDG_CURRENT_DESKTOP=Hyprland
+systemctl --user import-environment DISPLAY \
+									WAYLAND_DISPLAY \
+									XDG_CURRENT_DESKTOP \
+									GTK_THEME
+
+hash dbus-update-activation-environment 2>/dev/null && \
+	 dbus-update-activation-environment --systemd DISPLAY \
+												  XDG_CURRENT_DESKTOP=Hyprland \
+												  WAYLAND_DISPLAY
diff --git a/.config/hypr/workspaces.conf b/.config/hypr/workspaces.conf
new file mode 100644
index 0000000..38de981
--- /dev/null
+++ b/.config/hypr/workspaces.conf
@@ -0,0 +1,3 @@
+# Generated by nwg-displays on 2024-04-15 at 22:15:31. Do not edit manually.
+
+workspace=9,monitor:eDP-1,default:true