hyprland: update config to current style

deploy.sh

@@ -12,9 +12,6 @@ rsync --delete --recursive $(dirname "$0")/hypr/ ~/.config/hypr
 echo "Syncing user with rofi..."
 rsync --delete --recursive $(dirname "$0")/rofi/ ~/.config/rofi
 
-echo "Syncing user with swaylock..."
-rsync --delete --recursive $(dirname "$0")/swaylock/ ~/.config/swaylock
-
 echo "Syncing user with waybar..."
 rsync --delete --recursive $(dirname "$0")/waybar/ ~/.config/waybar 
 

hypr/hyprland.conf

@@ -1,16 +1,14 @@
 # █▀▄▀█ █▀█ █▄░█ █ ▀█▀ █▀█ █▀█
 # █░▀░█ █▄█ █░▀█ █ ░█░ █▄█ █▀▄
 
-# Day
+# Single
-monitor=DP-1, 1920x1080@144, 760x0, 1, vrr, 1
+monitor=DP-3, highrr, 0x0, 1, vrr, 1
-monitor=DP-3, 3440x1440@160, 0x1080, 1, vrr, 1
+monitor=DP-1, disable
 
-# Night
+# Double
-#monitor=DP-1, disable
+#monitor=DP-3, highrr, 0x1080, 1, vrr, 1
-#monitor=DP-3, 3440x1440@160, 0x0, 1, vrr, 1
+#monitor=DP-1, highrr, 760x0, 1, vrr, 1
 
-# Set primary monitor for xwayland
-exec-once = xrandr --output DP-3 --primary
 
 
 # █░░ ▄▀█ █░█ █▄░█ █▀▀ █░█
@@ -22,11 +20,11 @@ exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CUR
 exec-once = dbus-update-activation-environment --systemd --all # for XDPH
 exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH
 exec-once = /usr/lib/polkit-kde-authentication-agent-1 # authentication dialogue for GUI apps
-exec-once = ~/.config/waybar/autobar.sh
+exec-once = waybar -c ~/.config/waybar/config
 exec-once = dunst # start notification demon
 exec-once = swww init
 exec-once = syncthing --no-browser
-exec-once = xwaylandvideobridge
+
 
 
 # █▀▀ █▄░█ █░█
@@ -61,8 +59,9 @@ input {
 # █░░ ▄▀█ █▄█ █▀█ █░█ ▀█▀ █▀
 # █▄▄ █▀█ ░█░ █▄█ █▄█ ░█░ ▄█
 
-workspace = DP-3, 1
+workspace = 1, monitor:DP-3
-workspace = DP-1, 5
+workspace = 5, monitor:DP-1 
+exec-once = xrandr --output DP-3 --primary # Set primary monitor for xwayland
 
 dwindle {
     pseudotile = yes

hypr/hyprlock.conf

@@ -0,0 +1,79 @@
+source = $HOME/.config/hypr/mocha.conf
+
+$accent = $mauve
+$accentAlpha = $mauveAlpha
+$font = JetBrainsMono Nerd Font
+
+# GENERAL
+general {
+    disable_loading_bar = true
+    hide_cursor = true
+}
+
+# BACKGROUND
+background {
+    monitor =
+    path = ~/.config/background
+    blur_passes = 0
+    color = $base
+}
+
+# TIME
+label {
+    monitor =
+    text = cmd[update:30000] echo "$(date +"%R")"
+    color = $text
+    font_size = 90
+    font_family = $font
+    position = -30, 0
+    halign = right
+    valign = top
+}
+
+# DATE 
+label {
+    monitor = 
+    text = cmd[update:43200000] echo "$(date +"%A, %d %B %Y")"
+    color = $text
+    font_size = 25
+    font_family = $font
+    position = -30, -150
+    halign = right
+    valign = top
+}
+
+# USER AVATAR
+
+image {
+    monitor = 
+    path = ~/.face
+    size = 100
+    border_color = $accent
+
+    position = 0, 75
+    halign = center
+    valign = center
+}
+
+# INPUT FIELD
+input-field {
+    monitor =
+    size = 300, 60
+    outline_thickness = 4
+    dots_size = 0.2
+    dots_spacing = 0.2
+    dots_center = true
+    outer_color = $accent
+    inner_color = $surface0
+    font_color = $text
+    fade_on_empty = false
+    placeholder_text = <span foreground="##$textAlpha"><i>󰌾 Logged in as </i><span foreground="##$accentAlpha">$USER</span></span>
+    hide_input = false
+    check_color = $accent
+    fail_color = $red
+    fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
+    capslock_color = $yellow
+    position = 0, -35
+    halign = center
+    valign = center
+}

hypr/keybindings.conf

@@ -8,22 +8,24 @@ $mainMod = SUPER
 # Passthrough
 bind = , mouse:275, pass, ^(discord)$
 bind = SHIFT, mouse:275, pass, ^(discord)$
-bind = $mainMod, mouse:275, pass, ^(discord)$
-bind = $mainMod SHIFT, mouse:275, pass, ^(discord)$
 
 # Window/Session actions
 bind = $mainMod SHIFT, Q, killactive, 
-bind = $mainMod SHIFT, M, exec, $scrPath/logoutlaunch.sh 1 # logout menu
+bind = $mainMod SHIFT, M, exit
 bind = $mainMod, SPACE, togglefloating, 
 bind = $mainMod, F, fullscreen,
-bind = $mainMod SHIFT, L, exec, swaylock
+bind = $mainMod SHIFT, L, exec, hyprlock
-bind = $CONTROL, ESCAPE, exec, killall waybar || waybar # toggle waybar
+bind = $mainMod $CONTROL, ESCAPE, exec, killall waybar || waybar # toggle waybar
 bind = $mainMod SHIFT, J, togglesplit, # dwindle
 bind = $mainMod SHIFT, P, pseudo, # dwindle
 
 # Application shortcuts
 bind = $mainMod, RETURN, exec, alacritty
 bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy
+bind = $mainMod SHIFT, 7, exec, taskset -c 0-7 mangohud steamtinkerlaunch mo2 start
+bind = $mainMod SHIFT, 8, exec, taskset -c 0-7 mangohud steam-runtime
+bind = $mainMod SHIFT, 9, exec, spotify --disable-gpu
+bind = $mainMod SHIFT, 0, exec, discord 
 bind = $mainMod, S, exec, pkill -x rofi || rofi -show drun
 
 # Audio control
@@ -35,6 +37,11 @@ binde = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
 binde = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
 binde = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
 
+# Custom audio control
+binde = $mainMod, F1, exec, playerctl play-pause
+binde = $mainMod, F2, exec, playerctl previous
+binde = $mainMod, F3, exec, playerctl next 
+
 # Move focus 
 bind = $mainMod, h, movefocus, l
 bind = $mainMod, l, movefocus, r

hypr/theme.conf

@@ -28,12 +28,13 @@ general {
     #gaps_out = 40, 160, 40, 160
     gaps_in = 0
     gaps_out = 0
-    #border_size = 4
+    border_size = 4
-    border_size = 0
+    #border_size = 0
     col.active_border = $peach
-    col.inactive_border = $peach
+    #col.inactive_border = $peach
     layout = dwindle
     resize_on_border = false
+    cursor_inactive_timeout = 2
 }
 
 group {
@@ -49,6 +50,7 @@ decoration {
     dim_special = 0.3
     #active_opacity = 1.0
     #inactive_opacity = 0.8
+    fullscreen_opacity = 1.0
 
     blur {
         enabled = yes
@@ -85,4 +87,3 @@ misc {
     force_default_wallpaper = 0
     vrr = 1
 }
-

hypr/windowrules.conf

@@ -20,8 +20,13 @@ windowrulev2 = center, title:^(SnakePlusPlus)$
 windowrulev2 = opacity 0.6, title:^(SnakePlusPlus)$ 
 windowrulev2 = float, title:^(TetrisPlusPlus)$ 
 windowrulev2 = center, title:^(TetrisPlusPlus)$ 
+windowrulev2 = float, title:^(wifiLogger)$ 
+windowrulev2 = center, title:^(wifiLogger)$ 
 
 # Games
+windowrulev2 = opacity 1.00 override 1.00 override, class:^(net-runelite-client-RuneLite)$
+windowrulev2 = pseudo, class:^(net-runelite-client-RuneLite)$
+windowrulev2 = size 825 520, class:^(net-runelite-client-RuneLite)$
 windowrulev2 = opacity 1.00 override 1.00 override, class:^(Minecraft.*)$
 windowrulev2 = pseudo, class:^(Minecraft.*)$
 windowrulev2 = size 2560 1080, class:^(Minecraft.*)$

swaylock/config

@@ -1,38 +0,0 @@
-daemonize
-show-failed-attempts
-clock
-screenshot
-effect-blur=15x15
-effect-vignette=1:1
-color=1f1d2e80
-font="Inter"
-indicator
-indicator-radius=200
-indicator-thickness=20
-line-color=1f1d2e
-ring-color=191724
-inside-color=1f1d2e
-key-hl-color=eb6f92
-separator-color=00000000
-text-color=e0def4
-text-caps-lock-color=""
-line-ver-color=eb6f92
-ring-ver-color=eb6f92
-inside-ver-color=1f1d2e
-text-ver-color=e0def4
-ring-wrong-color=31748f
-text-wrong-color=31748f
-inside-wrong-color=1f1d2e
-inside-clear-color=1f1d2e
-text-clear-color=e0def4
-ring-clear-color=9ccfd8
-line-clear-color=1f1d2e
-line-wrong-color=1f1d2e
-bs-hl-color=31748f
-grace=2
-grace-no-mouse
-grace-no-touch
-datestr=%a, %B %e
-timestr=%I:%M %p
-fade-in=0.3
-ignore-empty-password

update.sh

@@ -12,9 +12,6 @@ rsync --delete --recursive ~/.config/hypr $(dirname "$0")
 echo "Syncing dotfiles with rofi..."
 rsync --delete --recursive ~/.config/rofi $(dirname "$0")
 
-echo "Syncing dotfiles with swaylock..."
-rsync --delete --recursive ~/.config/swaylock $(dirname "$0")
-
 echo "Syncing dotfiles with waybar..."
 rsync --delete --recursive ~/.config/waybar $(dirname "$0")
 

waybar/config

@@ -2,8 +2,8 @@
     {
         "name": "main",
         "layer": "bottom",
-        "position": "bottom",
+        "position": "top",
-        "height": 44,
+        "height": 38,
         "spacing": 0,
         "output": "DP-3",
         "reload_style_on_change": true,

waybar/style.css

@@ -11,10 +11,8 @@
 
 window#waybar {
     background: alpha(@mantle, 0.7);
-    border-top: 4px solid @crust;
     border-radius: 0px;
 	color: @peach;
-    padding: 4px;
 }
 
 window#waybar.hidden {
@@ -22,22 +20,28 @@ window#waybar.hidden {
 }
 
 #workspaces button {
-    color: @peach;
+    color: @base;
     transition: all 0.1s ease;
 }
 
 #workspaces button.active {
-    background-color: alpha(@peach, 0.2);
+    background-color: alpha(@base, 0.4);
     border-radius: 2px;
-    margin-top: 2px;
-    margin-bottom: 2px;
     transition: all 0.1s ease;
 }
 
 .modules-left,
 .modules-center,
 .modules-right {
-    padding: 4 4 2 4px;
+    padding-bottom: 6px;
+}
+
+.modules-left {
+    padding-left: 440px;
+}
+
+.modules-right {
+    padding-right: 440px;
 }
 
 #clock,
@@ -48,13 +52,19 @@ window#waybar.hidden {
 #temperature,
 #tray,
 #wireplumber,
+#workspaces,
 #custom-gpu,
 #custom-poweroff,
 #custom-weather {
-    background-color: @base;
+    background-color: @peach;
     border-radius: 6px;
     margin-left: 6px;
     margin-right: 6px;
-	padding: 0 10px;
+    color: @base;
-    color: @peach;
+    min-width: 70px;
+}
+
+
+#clock {
+    min-width: 100px;
 }