01: update config

alacritty/alacritty.toml

@@ -1,4 +1,3 @@
-import = ["/home/trianta/.config/alacritty/catppuccin/catppuccin-mocha.toml"]
 
 [cursor.style]
 shape = "Underline"
@@ -7,7 +6,7 @@ shape = "Underline"
 TERM = "xterm-256color"
 
 [font]
-size = 11
+size = 13
 
 [colors]
 footer_bar = { foreground = "#181818", background = "#d8d8d8" }
@@ -39,10 +38,16 @@ key = "End"
 mode = "~Alt"
 mods = "Shift"
 
-[shell]
+[terminal.shell]
 args = ["--login"]
 program = "/bin/zsh"
 
 [window]
 opacity = 0.5
+padding = {x = 25, y = 25}
+
+[general]
+import = ["/home/trianta/.config/alacritty/catppuccin/catppuccin-frappe.toml"]
+
+[terminal]
 

deploy.sh

@@ -4,12 +4,6 @@ echo "Syncing user with alacritty..."
 rsync --recursive $(dirname "$0")/alacritty/ ~/.config/alacritty 
 echo "Syncing user with hypr..."
 rsync --recursive $(dirname "$0")/hypr/ ~/.config/hypr 
-echo "Syncing user with nvim..."
-rsync --recursive $(dirname "$0")/nvim/ ~/.config/nvim 
-echo "Syncing user with tmux..."
-echo "  Note: prefix + I for tmux setup"
-mkdir -p ~/tmux
-rsync --recursive $(dirname "$0")/tmux/tmux.conf ~/.config/tmux/tmux.conf
 echo "Syncing user with waybar..."
 rsync --recursive $(dirname "$0")/waybar/ ~/.config/waybar 
 echo "Syncing complete!"

hypr/colorscheme.conf

@@ -0,0 +1,37 @@
+# foreground
+$fg         = ebdbb2
+$fg0        = fbf1c7
+$fg1        = ebdbb2
+$fg2        = d5c4a1
+$fg3        = bdae93
+$fg4        = a89984
+
+# background
+$bg         = 282828
+$bg0_h      = 1d2021
+$bg0_s      = 32302f
+$bg1        = 3c3836
+$bg2        = 504945
+$bg3        = 665c54
+$bg4        = 7c6f64
+
+# colors
+$gray       = a89984
+$red        = cc241d
+$green      = 98971a
+$yellow     = d79921
+$blue       = 458588
+$purple     = b16286
+$aqua       = 689d6a
+$orange     = d65d0e
+$peach      = fe640b
+
+# alternates
+$alt_gray   = 928374
+$alt_red    = fb4934
+$alt_green  = b8bb26
+$alt_yellow = fabd2f
+$alt_blue   = 83a598
+$alt_purple = d3869b
+$alt_aqua   = 8ec07c
+$alt_orange = fe8019

hypr/hyprland.conf

@@ -1,98 +1,206 @@
-# Config home wiki: https://wiki.hyprland.org
-# See https://wiki.hyprland.org/Configuring/Monitors/
+source = ~/.config/hypr/colorscheme.conf # Catppuccin colorscheme
 
-# Day
-monitor=DP-2, highrr, 0x1080, 1, bitdepth, 10, vrr, 1
-monitor=DP-3, highrr, 760x0, 1, vrr, 1
-workspace = DP-3, 5
+# < Start Section >
+# monitors
 
-# Night
-#monitor=DP-2, highrr, 0x0, 1, bitdepth, 10, vrr, 0
-#monitor=DP-3, disable
-
-# Main workspace
-workspace = DP-2, 1
-
-# Color: Catppuccin Mocha
-source=~/.config/hypr/mocha.conf
-
-# Launch applications
-exec-once = hyprpaper
-exec-once = waybar -c ~/.config/waybar/config.json
-exec-once = syncthing --no-browser
-exec-once = hyprctl setcursor Catppuccin-Mocha-Lavender 24
-exec-once = xwaylandvideobridge
-exec-once = linux-discord-rich-presence -c ~/.config/linux-discord-rich-presencerc 
-
-
-# Slow launch fix
-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-
-# Default env vars.
-env = XCURSOR_SIZE,20
-
-# Nvidia environment variables
-env = LIBVA_DRIVER_NAME,nvidia
-env = XDG_SESSION_TYPE,wayland
-env = __GLX_VENDOR_LIBRARY_NAME,nvidia
-env = WLR_NO_HARDWARE_CURSORS,1
-#env = GBM_BACKEND,nvidia-drm
-#env = WLR_DRM_NO_ATOMIC,1
-
-# Nvidia G-Sync
-env = __GL_GSYNC_ALLOWED,1
-env = __GL_VRR_ALLOWED,1
-
-input {
-    kb_layout = us
-    follow_mouse = 2
-    sensitivity = -.75 # -1.0 - 1.0, 0 means no modification.
+monitorv2 {
+	output = eDP-1
+	mode = highrr
+	position = 0x0 # alt: 0x0
+	bitdepth = 8
+	cm = edid
 }
 
+# HDMI port
+monitorv2 {
+    output = 
+	mode = highrr
+	position = 1920x0 # alt: 0x0
+    scale = 1.00
+	bitdepth = 8
+	cm = edid
+}
+
+# < End Section >
+
+
+
+# < Start Section >
+# environment variables
+
+env = XDG_CURRENT_DESKTOP,Hyprland
+env = XDG_SESSION_TYPE,wayland
+env = XDG_SESSION_DESKTOP,Hyprland
+env = MOZ_ENABLE_WAYLAND,1
+env = HYPRCURSOR_THEME, volantes
+env = HYPRCURSOR_SIZE, 30
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+env = QT_QPA_PLATFORM,wayland;xcb
+env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+env = QT_QPA_PLATFORMTHEME,qt5ct
+
+#env = HYPRLAND_TRACE,1
+#env = AQ_TRACE,1
+
+# < End Section >
+
+
+
+# < Start Section >
+# startup applications
+
+# environment launches
+exec-once = ~/.config/hypr/scripts/resetxdgportal.sh # reset XDPH for screenshare
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP HYPRLAND_INSTANCE_SIGNATURE
+exec-once = dbus-update-activation-environment --systemd --all
+exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+exec-once = /usr/lib/polkit-kde-authentication-agent-1 # authentication dialogue for GUI apps
+exec-once = gsettings set org.gnome.desktop.interface gtk-theme 'Catppuccin-Mocha'
+exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
+exec-once = sleep 1 && hyprpm reload
+#exec-once = wayvnc --output=DP-3 0.0.0.0
+
+# xrandr settings
+#exec-once = ~/.config/hypr/scripts/xrandr.sh
+
+# background applications
+exec-once = waybar -c ~/.config/waybar/config
+exec-once = dunst
+exec-once = swww-daemon
+exec-once = syncthing --no-browser
+#exec-once = xwaylandvideobridge
+#exec-once = pulsemeeter
+
+# main applications
+exec-once = thunderbird
+#exec-once = obs
+#exec-once = vesktop --ozone-platform-hint=auto --enable-webrtc-pipewire-capturer --enable-features=WaylandWindowDecorations
+exec-once = commet
+#exec-once = spotify
+#exec-once = dopamine
+exec-once = alacritty
+exec-once = floorp
+exec-once = env JAVA_HOME=/usr/lib/jvm/java-17-openjdk bolt > /tmp/bolt-launcher.log 2>&1
+
+# obsidian planner
+exec-once = ~/sync/obsidian/Trinote/create-week.sh
+
+# completion alert
+# exec-once = sleep 5 && pw-play --volume=2.0 ~/.alert/finished.mp3
+
+# first time lock
+exec-once = hyprlock
+
+# < End Section >
+
+
+
+# < Start Section >
+# workspace rules
+
+# smart gaps
+#workspace = w[tv1], gapsout:25 725 25 725, gapsin:0
+workspace = w[tv1] r[4-5], gapsout:0 0 0 0, gapsin:0
+
+# gaps numbers (top, right, bottom, left)
+# Workspaces swapped for ease of use
+workspace = 1, monitor:eDP-1, persistent:true, default:true
+workspace = 2, monitor:eDP-1, persistent:true
+workspace = 3, monitor:eDP-1, persistent:true
+workspace = 4, monitor:eDP-1, persistent:true
+workspace = 5, monitor:HDMI-A-1, persistent:true, gapsout:0
+workspace = 6, monitor:eDP-1, persistent:true
+
+
+# < End Section >
+
+
+
+# < Start Section >
+# variables
+
+
 general {
 	gaps_in = 5
-    gaps_out = 10
-    border_size = 0
-    col.active_border = 0xee$lavenderAlpha 45deg
-    col.inactive_border = 0xaa$overlay0Alpha
+	gaps_out = 20
+	border_size = 3
+	#col.active_border = rgb($yellow)
+	col.active_border = rgb($fg)
+	col.inactive_border = rgb($bg)
 	layout = dwindle
+	resize_on_border = false
 	allow_tearing = false
 }
 
 decoration {
     rounding = 10
-    blur { 
-        enabled = yes
-        size = 12
-        passes = 1
+	rounding_power = 2
+	
+	shadow {
+		enabled = true
+		range = 32
+		render_power = 2
+		color = rgba(00000050)
 	}
+	dim_special = 0.3
+	fullscreen_opacity = 1.0
 	
-    drop_shadow = yes
-    shadow_range = 4
-    shadow_render_power = 3
-    col.shadow = 0xee$baseAlpha
-
-    active_opacity = 1.0
-    inactive_opacity = 0.9
+	blur {
+		enabled = true
+		special = true
+		size = 3
+		passes = 4
+		new_optimizations = true
+		ignore_opacity = true
+		xray = true
+		vibrancy = 0.1696
+	}
 }
 
 animations {
-    enabled = yes
-    animation = windows, 1, 8, default
-    animation = windowsOut, 1, 8, default
-    animation = border, 1, 8, default
-    animation = borderangle, 1, 8, default
-    animation = fade, 1, 8, default
-    animation = workspaces, 1, 8, default, slidefade 80%
+	enabled = true
+	
+	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
+	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
+	animation = zoomFactor,    1,     7,     quick
 }
 
-dwindle {
-    pseudotile = yes
-    preserve_split = yes 
+input {
+	kb_layout = us
+	kb_options = caps:escape
+	follow_mouse = 2
+	mouse_refocus = true
+	force_no_accel = 1
+    touchpad {
+        natural_scroll = true
+    }
 }
 
-master {
-    new_is_master = true
+group {
+	col.border_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg
+	col.border_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg
+	col.border_locked_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg
+	col.border_locked_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg
 }
 
 misc {
@@ -100,47 +208,181 @@ misc {
 	disable_splash_rendering = true
 	force_default_wallpaper = 0
 	vrr = 1
+	vfr = true
+	middle_click_paste = false
+	render_unfocused_fps = 15
 }
 
-# General window rules
-windowrule = float, ^(SnakePlusPlus)$ 
-windowrule = center, ^(SnakePlusPlus)$ 
-windowrule = opacity 0.6, ^(SnakePlusPlus)$ 
-windowrule = float, ^(TetrisPlusPlus)$ 
-windowrule = center, ^(TetrisPlusPlus)$ 
-windowrulev2 = pseudo,class:^(firefox.*)$
-windowrulev2 = pseudo,class:^(Alacritty.*)$
-windowrulev2 = opacity 0.6 override 0.6 override,class:(Spotify)
+xwayland {
+	enabled = true
+	use_nearest_neighbor = true
+	force_zero_scaling = false
+}
 
-# Game window rules
-windowrulev2 = pseudo, class:(Minecraft.*)
-windowrulev2 = size 2646 1108, class:(Minecraft.*)
-windowrulev2 = pseudo, title:(Warframe.*)
-windowrulev2 = size 2646 1108, title:(Warframe.*)
+cursor {
+	inactive_timeout = 2
+	no_warps = false
+	persistent_warps = true
+	default_monitor = eDP-1
+	warp_on_change_workspace = false
+}
 
-# Super bind
+debug {
+	disable_logs = true
+	#overlay
+	full_cm_proto = true
+}
+
+render {
+	new_render_scheduling = true
+	direct_scanout = true
+}
+
+# Disable touchscreen
+device {
+	name = gxtp7386:00-27c6:011a
+	enabled = false
+}
+
+
+# < End Section >
+
+
+
+# < Start Section >
+# master layout
+
+master {
+	new_status = master
+}
+
+# < End Section >
+
+
+
+# < Start Section >
+# dwindle layout
+
+dwindle {
+	pseudotile = true
+	preserve_split = true
+    smart_resizing = true
+}
+
+# < End Section >
+
+
+
+# < Start Section >
+# window rules
+
+# core
+windowrule {
+	name = globals
+	match:class = ^(.*)$
+	suppress_event = maximize fullscreen
+	render_unfocused = true
+	opacity = 0.75 0.75
+    pseudo = false
+}
+
+windowrule = match:workspace 1, float true
+windowrule = match:workspace 2, float true
+windowrule = match:class ^(qt5ct)$, float true
+windowrule = match:class ^(nwg-look)$, float true
+windowrule = match:class ^(pavucontrol)$, float true
+windowrule = match:class ^(org.kde.polkit-kde-authentication-agent-1)$, float true
+windowrule = match:class ^(org.speedcrunch.speedcrunch)$, float true
+
+# main
+#windowrule = match:class ^(discord)$, workspace 1 silent
+#windowrule = match:class ^(vesktop)$, workspace 1 silent
+windowrule = match:class ^(chat.commet.commetapp)$, workspace 1 silent
+windowrule = match:class ^(thunderbird)$, workspace 1 silent
+windowrule = match:class ^(Dopamine)$, workspace 1 silent
+windowrule = match:class ^(spotify)$, workspace 1 silent
+windowrule = match:class ^(steam)$, workspace 6 silent
+
+# workspace 2 group
+windowrule = match:class ^(floorp)$, workspace 3 silent
+windowrule = match:class ^(floorp)$, tile true
+windowrule = match:class ^(Alacritty)$, workspace 2 silent
+windowrule = match:class ^(Alacritty)$, tile true
+windowrule = match:class ^(net-runelite-client-RuneLite)$, opacity 1.00 override 1.00 override
+
+# tag games
+windowrule = match:xdg_tag proton-game, tag +game
+windowrule = match:title ^(Warframe)$, tag +game
+windowrule = match:class ^(org.prismlauncher.PrismLauncher)$, tag +game
+windowrule = match:class ^(Minecraft.*)$, tag +game
+windowrule = match:class ^(steam_app_.*)$, tag +game
+windowrule = match:class ^(steam_proton)$, tag +game
+windowrule = match:class ^(cstrike_linux64)$, tag +game
+windowrule = match:class ^(dota2)$, tag +game
+windowrule = match:class ^(gamescope)$, tag +game
+windowrule = match:class ^(wowclassic.exe)$, tag +game
+windowrule = match:title ^(World of Warcraft)$, tag +game
+windowrule = match:class ^(RuneScape)$, tag +game
+#windowrule = match:class ^(bolt.*)$, tag +game
+windowrule = match:class ^(Minecraft.*)$, tag +game
+#windowrule = match:class ^(net-runelite-client-RuneLite)$, tag +game
+# Runelite opacity likes to skip after login
+windowrule = match:class ^(net-runelite-client-RuneLite)$, opacity 1.00 override 1.00 override
+
+windowrule {
+    name = games
+    match:tag = game
+    workspace = 4 silent
+    opacity = 1.00 override 1.00 override
+    float = true
+    no_initial_focus = true
+    suppress_event = maximize
+}
+
+# layer rules
+layerrule = match:namespace waybar, blur true
+layerrule = match:namespace waybar, ignore_alpha 0
+
+# xwaylandvideobridge
+windowrule = match:class ^(xwaylandvideobridge)$, opacity 0.0 override
+windowrule = match:class ^(xwaylandvideobridge)$, no_anim true
+windowrule = match:class ^(xwaylandvideobridge)$, no_initial_focus true
+windowrule = match:class ^(xwaylandvideobridge)$, max_size 1 1
+windowrule = match:class ^(xwaylandvideobridge)$, no_blur true
+
+# < End Section >
+
+
+
+# < Start Section >
+# keybinds
+
+# main modifier
 $mainMod = SUPER
 
-# Passthrough
-bind = , mouse:275, pass, ^(discord)$
+# passthrough
+#bind = , mouse:275, pass, class:^(discord)$
+#bind = , mouse:275, sendshortcut, ALT, V, class:^(vesktop)$
+#bind = SHIFT, mouse:275, sendshortcut, ALT, V, class:^(vesktop)$
 
-# Tiling binds
-bind = $mainMod SHIFT, Q, killactive, 
-bind = $mainMod, SPACE, togglefloating, 
-bind = $mainMod SHIFT, M, exit, 
-bind = $mainMod SHIFT, J, togglesplit, # dwindle
-bind = $mainMod SHIFT, P, pseudo, # dwindle
-bind = $mainMod, F, fullscreen,
+# core binds
+bind = $mainMod SHIFT, Q, killactive
+bind = $mainMod SHIFT, M, exit
+bind = $mainMod, SPACE, togglefloating
+bind = $mainMod, C, centerwindow
+bind = $mainMod, F, fullscreen
+bind = $mainMod SHIFT, L, exec, hyprlock
+bind = $mainMod $CONTROL, ESCAPE, exec, killall waybar || waybar -c ~/.config/waybar/config # toggle waybar
 
-# Exec binds
-bind = $mainMod SHIFT, E, exec, dolphin
-bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy
-bind = $mainMod SHIFT, L, exec, swaylock -e -c cba6f7 -i /home/trianta/pics/catppuccin/misc/Street.jpg
+# main application shortcuts
 bind = $mainMod, RETURN, exec, alacritty
-bind = $mainMod, S, exec, wofi --show drun
+bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy
+bind = $mainMod SHIFT, 7, exec, taskset -c 1-7 prismlauncher
+bind = $mainMod, S, exec, pkill -x rofi || rofi -show drun
+bind = $mainMod, 9, exec, taskset -c 1-7 steam
+bind = $mainMod, 0, exec, JAVA_HOME=/usr/lib/jvm/java-17-openjdk bolt --ozone-platform=wayland > /tmp/bolt-launcher.log 2>&1
 
-
-# Audio binds
+# generic audio control
 binde = , XF86AudioPlay, exec, playerctl play-pause
 binde = , XF86AudioStop, exec, playerctl stop
 binde = , XF86AudioPrev, exec, playerctl previous
@@ -149,33 +391,54 @@ 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
 bind = $mainMod, k, movefocus, u
 bind = $mainMod, j, movefocus, d
 
+# 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 SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 1, centerwindow
 bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 2, centerwindow
 bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 3, centerwindow
 bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 4, centerwindow
 bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 5, centerwindow
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 6, centerwindow
+bind = $mainMod ALT, 1, movetoworkspacesilent, 1
+bind = $mainMod ALT, 2, movetoworkspacesilent, 2
+bind = $mainMod ALT, 3, movetoworkspacesilent, 3
+bind = $mainMod ALT, 4, movetoworkspacesilent, 4
+bind = $mainMod ALT, 5, movetoworkspacesilent, 5
+bind = $mainMod ALT, 6, movetoworkspacesilent, 6
 
-# Custom resize bind
-# bindsym $mod+ctrl+0 resize set width 3440px height 1440px
-#binde = $mainMod SHIFT, ], setactivesize, 2646 1108
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
+# resizing windows
+binde = $mainMod, right, resizeactive, 5 0
+binde = $mainMod, left, resizeactive, -5 0
+binde = $mainMod, up, resizeactive, 0 -5
+binde = $mainMod, down, resizeactive, 0 5
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
-# Resize windows with arrow keys
-binde = $mainMod, right, resizeactive, 10 0
-binde = $mainMod, left, resizeactive, -10 0
-binde = $mainMod, up, resizeactive, 0 10
-binde = $mainMod, down, resizeactive, 0 -10
+# recordings
+bind = SUPER, R, pass, class:^(com\.obsproject\.Studio)$
+bind = SUPER, F9, pass, class:^(com\.obsproject\.Studio)$
+bind = SUPER, F10, pass, class:^(com\.obsproject\.Studio)$
 
+# < End Section >

hypr/hyprlock.conf

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

hypr/hyprpaper.conf

@@ -1,23 +1,5 @@
 splash = false
-# Preset 1 
-#preload = /home/trianta/pics/squirrel-coffee.png
-#preload = /home/trianta/pics/dbb7hcs-1f9e8f0a-c4c7-4fc9-baf6-9e075ce86e30.jpg
-#wallpaper = DP-2,/home/trianta/pics/squirrel-coffee.png
-#wallpaper = DP-3,/home/trianta/pics/dbb7hcs-1f9e8f0a-c4c7-4fc9-baf6-9e075ce86e30.jpg
-
-# Preset 2 (Cyberpunk bright)
-#preload = ~/pics/P7SL1tk.jpeg
-#preload = ~/pics/cyberpunk.jpg
-#wallpaper = DP-2, ~/pics/P7SL1tk.jpeg
-#wallpaper = DP-3, ~/pics/cyberpunk.jpg
-
-# Preset 3 (Cyberpunk minimalistic)
-preload = ~/pics/analog-shadowscape.png
-preload = ~/pics/monochrome-kanji-art.png
-wallpaper = DP-2, ~/pics/analog-shadowscape.png
-wallpaper = DP-3, ~/pics/monochrome-kanji-art.png
-
-
-# Single monitor
-#preload = ~/pics/P7SL1tk.jpeg
-#wallpaper = DP-2, ~/pics/P7SL1tk.jpeg
+# Single monitor setup
+preload=~/pics/dharmx/nord/holy-arch-nordic.png
+wallpaper=eDP-1,~/pics/dharmx/nord/holy-arch-nordic.png
+ipc = off

hypr/scripts/globalcontrol.sh

@@ -0,0 +1,60 @@
+#!/usr/bin/env sh
+
+# wallpaper var
+EnableWallDcol=0
+ConfDir="${XDG_CONFIG_HOME:-$HOME/.config}"
+CloneDir="$HOME/Hyprdots"
+ThemeCtl="$ConfDir/hypr/theme.ctl"
+cacheDir="$HOME/.cache/hyprdots"
+
+# theme var
+gtkTheme=`gsettings get org.gnome.desktop.interface gtk-theme | sed "s/'//g"`
+gtkMode=`gsettings get org.gnome.desktop.interface color-scheme | sed "s/'//g" | awk -F '-' '{print $2}'`
+
+# hypr var
+hypr_border=`hyprctl -j getoption decoration:rounding | jq '.int'`
+hypr_width=`hyprctl -j getoption general:border_size | jq '.int'`
+
+# notification var
+#ncolor="-h string:bgcolor:#191724 -h string:fgcolor:#faf4ed -h string:frcolor:#56526e"
+#
+#if [ "${gtkMode}" == "light" ] ; then
+#    ncolor="-h string:bgcolor:#f4ede8 -h string:fgcolor:#9893a5 -h string:frcolor:#908caa"
+#fi
+
+# pacman fns
+pkg_installed()
+{
+    local PkgIn=$1
+
+    if pacman -Qi $PkgIn &> /dev/null
+    then
+        #echo "${PkgIn} is already installed..."
+        return 0
+    else
+        #echo "${PkgIn} is not installed..."
+        return 1
+    fi
+}
+
+get_aurhlpr()
+{
+    if pkg_installed yay
+    then
+        aurhlpr="yay"
+    elif pkg_installed paru
+    then
+        aurhlpr="paru"
+    fi
+}
+
+check(){
+    local Pkg_Dep=$(for PkgIn in "$@"; do ! pkg_installed $PkgIn && echo "$PkgIn"; done)
+
+if [ -n "$Pkg_Dep" ]; then echo -e "$0 Dependencies:\n$Pkg_Dep"
+    read -p "ENTER to install  (Other key: Cancel): " ans
+    if [ -z "$ans" ]; then get_aurhlpr ; $aurhlpr -S $Pkg_Dep
+    else echo "Skipping installation of packages" ;exit 1
+    fi
+fi
+}

hypr/scripts/logoutlaunch.sh

@@ -0,0 +1,61 @@
+#!/usr/bin/env sh
+
+# Check if wlogout is already running
+if pgrep -x "wlogout" > /dev/null
+then
+    pkill -x "wlogout"
+    exit 0
+fi
+
+# set file variables
+ScrDir=`dirname "$(realpath "$0")"`
+source $ScrDir/globalcontrol.sh
+wLayout="${XDG_CONFIG_HOME:-$HOME/.config}/wlogout/layout_$1"
+wlTmplt="${XDG_CONFIG_HOME:-$HOME/.config}/wlogout/style_$1.css"
+
+if [ ! -f $wLayout ] || [ ! -f $wlTmplt ] ; then
+    echo "ERROR: Config $1 not found..."
+    exit 1;
+fi
+
+# detect monitor res
+x_mon=$(hyprctl -j monitors | jq '.[] | select(.focused==true) | .width')
+y_mon=$(hyprctl -j monitors | jq '.[] | select(.focused==true) | .height')
+hypr_scale=$(hyprctl -j monitors | jq '.[] | select (.focused == true) | .scale' | sed 's/\.//')
+
+
+# scale config layout and style
+case $1 in
+    1)  wlColms=6
+        export mgn=$(( y_mon * 28 / hypr_scale ))
+        export hvr=$(( y_mon * 23 / hypr_scale )) ;;
+    2)  wlColms=2
+        export x_mgn=$(( x_mon * 35 / hypr_scale ))
+        export y_mgn=$(( y_mon * 25 / hypr_scale ))
+        export x_hvr=$(( x_mon * 32 / hypr_scale ))
+        export y_hvr=$(( y_mon * 20 / hypr_scale )) ;;
+esac
+
+# scale font size
+export fntSize=$(( y_mon * 2 / 100 ))
+
+# detect gtk system theme
+export BtnCol=`[ "$gtkMode" == "dark" ] && ( echo "white" ) || ( echo "black" )`
+export WindBg=`[ "$gtkMode" == "dark" ] && ( echo "rgba(0,0,0,0.5)" ) || ( echo "rgba(255,255,255,0.5)" )`
+
+if [ "$EnableWallDcol" -eq 1 ] ; then
+    export wbarTheme="Wall-Dcol"
+else
+    export wbarTheme="${gtkTheme}"
+fi
+
+# eval hypr border radius
+export active_rad=$(( hypr_border * 5 ))
+export button_rad=$(( hypr_border * 8 ))
+
+# eval config files
+wlStyle=`envsubst < $wlTmplt`
+
+# launch wlogout
+wlogout -b $wlColms -c 0 -r 0 -m 0 --layout $wLayout --css <(echo "$wlStyle") --protocol layer-shell
+

hypr/scripts/resetxdgportal.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+killall xdg-desktop-portal-hyprland
+killall xdg-desktop-portal-gnome
+killall xdg-desktop-portal-kde
+killall xdg-desktop-portal-lxqt
+killall xdg-desktop-portal-wlr
+killall xdg-desktop-portal
+/usr/lib/xdg-desktop-portal-hyprland &
+/usr/lib/xdg-desktop-portal &

hypr/scripts/xrandr.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Custom resolution through xrandr (21:9)
+xrandr --newmode "2560x1080"  677.75  2560 2784 3064 3568  1080 1083 1093 1188 -hsync +vsync
+xrandr --newmode "2560x1080R"  373.00  2560 2608 2640 2720  1080 1083 1093 1144 +hsync -vsync
+xrandr --addmode DP-1 2560x1080
+xrandr --addmode DP-1 2560x1080R
+
+# 3200x900 suggestion (32:9)
+xrandr --newmode "3200x900" 704.50  3200 3472 3824 4448  900 903 913 991 -hsync +vsync
+xrandr --addmode DP-1 3200x900
+
+# 3200x1100 suggestion
+xrandr --newmode "3200x1100" 863.75  3200 3480 3832 4464  1100 1103 1113 1210 -hsync +vsync
+xrandr --addmode DP-1 3200x1100
+
+# 3200x1100 suggestion (21:9)
+xrandr --newmode "2100x900"  462.50  2100 2280 2512 2920  900 903 913 991 -hsync +vsync
+xrandr --addmode DP-1 2100x900 
+
+sleep 2 && xrandr --output DP-1 --primary # Set primary monitor for xwayland

nvim/after/plugin/binds.lua

@@ -1,27 +0,0 @@
--- Telescope
-local builtin = require('telescope.builtin')
-vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
-vim.keymap.set('n', '<C-p>', builtin.git_files, {})
-vim.keymap.set('n', '<leader>ps', function()
-    builtin.grep_string({ search = vim.fn.input("Grep > ") })
-end)
-
--- Harpoon
-local mark = require("harpoon.mark")
-local ui = require("harpoon.ui")
-vim.keymap.set("n", "<leader>a", mark.add_file)
-vim.keymap.set("n", "<C-t>", ui.toggle_quick_menu)
-
-vim.keymap.set("n", "<C-q>", function() ui.nav_file(1) end)
-vim.keymap.set("n", "<C-w>", function() ui.nav_file(2) end)
-vim.keymap.set("n", "<C-e>", function() ui.nav_file(3) end)
-vim.keymap.set("n", "<C-r>", function() ui.nav_file(4) end)
-
--- Zenmode
-vim.keymap.set("n", "<leader>pz", function()
-  require("zen-mode").toggle({
-      window = {
-          width = 90,
-      }
-  })
-end)

nvim/after/plugin/settings.lua

@@ -1,46 +0,0 @@
--- lsp-zero
-local lsp = require('lsp-zero')
-
-lsp.preset('recommended')
-lsp.setup()
-
--- Treesitter
-vim.opt.runtimepath:append("~/.local/share/nvim/parsers")
-
-require'nvim-treesitter.configs'.setup {
-  -- A list of parser names, or "all" (the five listed parsers should always be installed)
-  ensure_installed = { "c", "cpp", "javascript", "lua", "vim" },
-
-  -- Install parsers synchronously (only applied to `ensure_installed`)
-  sync_install = false,
-
-  -- Automatically install missing parsers when entering buffer
-  -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
-  auto_install = true,
-
-  parser_install_dir = "~/.local/share/nvim/parsers",
-
-  highlight = {
-    enable = true,
-
-    -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-    -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-    -- Using this option may slow down your editor, and you may see some duplicate highlights.
-    -- Instead of true it can also be a list of languages
-    additional_vim_regex_highlighting = false,
-  },
-}
-
--- Obsidian
-vim.opt.conceallevel = 1
-
--- Colors
-function ColorMyPencils(color)
-    color = color or "catppuccin-frappe"
-    vim.cmd.colorscheme(color)
-
-    vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
-    vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
-end
-
-ColorMyPencils()

nvim/init.lua

@@ -1,2 +0,0 @@
-require('trianta')
-

nvim/lazy-lock.json

@@ -1,23 +0,0 @@
-{
-  "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
-  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" },
-  "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
-  "lsp-zero.nvim": { "branch": "v1.x", "commit": "aa36afcf7a59fbd98008c9a434593c423d3d649a" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364" },
-  "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" },
-  "nvim": { "branch": "main", "commit": "5e36ca599f4aa41bdd87fbf2c5aae4397ac55074" },
-  "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
-  "nvim-lspconfig": { "branch": "master", "commit": "7eed8b2150192e5ad05e1886fdf133493ddf2928" },
-  "nvim-treesitter": { "branch": "master", "commit": "97ba59c6f532072e456b3d1f2413560e689c132b" },
-  "obsidian.nvim": { "branch": "main", "commit": "a9ae6b20560d716a5f9b89252e4ea29c8e64617a" },
-  "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
-  "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
-  "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
-  "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
-  "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" }
-}

nvim/lua/trianta/init.lua

@@ -1,3 +0,0 @@
-require("trianta.remap")
-require("trianta.lazy")
-require("trianta.set")

nvim/lua/trianta/lazy.lua

@@ -1,144 +0,0 @@
--- This file can be loaded by calling `lua require('plugins')` from your init.vim
-
--- Only required if you have packer configured as `opt`
-vim.cmd [[packadd lazy.nvim]]
-
-return require('lazy').setup({
-    -- Packer can manage itself
-    "folke/lazy.nvim",
-    {
-        "folke/todo-comments.nvim",
-        dependencies = { "nvim-lua/plenary.nvim" },
-        opts = {
-            -- your configuration comes here
-            -- or leave it empty to use the default settings
-            -- refer to the configuration section below
-        }
-    },
-    { "catppuccin/nvim", as = "catppuccin" },
-    {
-        "nvim-telescope/telescope.nvim", branch = '0.1.x',
-        -- or                            , branch = '0.1.x',
-        dependencies = {"nvim-lua/plenary.nvim"},
-    },
-
-    {
-        "nvim-treesitter/nvim-treesitter",
-        build = ":TSUpdate",
-    },
-    "nvim-treesitter/playground",
-    "ThePrimeagen/harpoon",
-    {
-        'VonHeikemen/lsp-zero.nvim',
-        branch = 'v1.x',
-        dependencies = {
-            -- LSP Support
-            "neovim/nvim-lspconfig",             -- Required
-            'williamboman/mason.nvim',           -- Optional
-            'williamboman/mason-lspconfig.nvim', -- Optional
-
-            -- Autocompletion
-            'hrsh7th/nvim-cmp',         -- Required
-            'hrsh7th/cmp-nvim-lsp',     -- Required
-            'hrsh7th/cmp-buffer',       -- Optional
-            'hrsh7th/cmp-path',         -- Optional
-            'saadparwaiz1/cmp_luasnip', -- Optional
-            'hrsh7th/cmp-nvim-lua',     -- Optional
-
-            -- Snippets
-            'L3MON4D3/LuaSnip',             -- Required
-            'rafamadriz/friendly-snippets', -- Optional
-        },
-    },
-    {
-        "epwalsh/obsidian.nvim",
-        version = "*",  -- recommended, use latest release instead of latest commit
-        lazy = true,
-        ft = "markdown",
-        dependencies = {
-            "nvim-lua/plenary.nvim",
-        },
-        opts = {
-            workspaces = {
-                {
-                    name = "trinote",
-                    path = "~/sync/obsidian/Trinote/",
-                },
-            },
-        },
-        ui = {
-            enable = true
-        }
-    },
-    {
-        "folke/twilight.nvim",
-        opts = {
-            dimming = {
-                alpha = 0.25, -- amount of dimming
-                -- we try to get the foreground from the highlight groups or fallback color
-                color = { "Normal", "#ffffff" },
-                term_bg = "#000000", -- if guibg=NONE, this will be used to calculate text color
-                inactive = false, -- when true, other windows will be fully dimmed (unless they contain the same buffer)
-            },
-            context = 10, -- amount of lines we will try to show around the current line
-            treesitter = true, -- use treesitter when available for the filetype
-            -- treesitter is used to automatically expand the visible text,
-            -- but you can further control the types of nodes that should always be fully expanded
-            expand = { -- for treesitter, we we always try to expand to the top-most ancestor with these types
-            "function",
-            "method",
-            "table",
-            "if_statement",
-        },
-        exclude = {}, -- exclude these filetypes
-    },
-},
--- Lua
-{
-    "folke/zen-mode.nvim",
-    opts = {
-        -- your configuration comes here
-        -- or leave it empty to use the default settings
-        -- refer to the configuration section below
-        {
-            window = {
-                backdrop = 0.95, -- shade the backdrop of the Zen window. Set to 1 to keep the same as Normal
-                -- height and width can be:
-                -- * an absolute number of cells when > 1
-                -- * a percentage of the width / height of the editor when <= 1
-                -- * a function that returns the width or the height
-                width = 120, -- width of the Zen window
-                height = 1, -- height of the Zen window
-                -- by default, no options are changed for the Zen window
-                -- uncomment any of the options below, or add other vim.wo options you want to apply
-                options = {
-                    -- signcolumn = "no", -- disable signcolumn
-                    -- number = false, -- disable number column
-                    -- relativenumber = false, -- disable relative numbers
-                    -- cursorline = false, -- disable cursorline
-                    -- cursorcolumn = false, -- disable cursor column
-                    -- foldcolumn = "0", -- disable fold column
-                    -- list = false, -- disable whitespace characters
-                },
-            },
-            plugins = {
-                options = {
-                    enabled = true,
-                    ruler = false, -- disables the ruler text in the cmd line area
-                    showcmd = false, -- disables the command in the last line of the screen
-                    -- you may turn on/off statusline in zen mode by setting 'laststatus' 
-                    -- statusline will be shown only if 'laststatus' == 3
-                    laststatus = 0, -- turn off the statusline in zen mode
-                },
-                twilight = { enabled = true }, -- enable to start Twilight when zen mode opens
-            },
-            -- callback where you can add custom code when the Zen window opens
-            on_open = function(win)
-            end,
-            -- callback where you can add custom code when the Zen window closes
-            on_close = function()
-            end,
-        }
-    }
-}
-})

nvim/lua/trianta/remap.lua

@@ -1,2 +0,0 @@
-vim.g.mapleader = " "
-vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)

nvim/lua/trianta/set.lua

@@ -1,26 +0,0 @@
-vim.opt.nu = true
-
-vim.opt.tabstop = 4
-vim.opt.softtabstop = 4
-vim.opt.shiftwidth = 4
-vim.opt.expandtab = true
-
-vim.opt.smartindent = true
-
-vim.opt.wrap = true
-
-vim.opt.hlsearch = false
-vim.opt.incsearch = true
-
-vim.opt.termguicolors = true
-
-vim.opt.scrolloff = 8
-vim.opt.signcolumn = "yes"
-
-vim.opt.updatetime = 50
-
-vim.opt.colorcolumn = "80"
-
-vim.g.mapleader = " "
-
-vim.opt.mouse = ""

tmux/tmux.conf

@@ -1,12 +0,0 @@
-# Start panels at 1
-set -g base-index 1
-set -g pane-base-index 1
-set-window-option -g pane-base-index 1
-set-option -g renumber-windows on
-
-# Plugins
-set -g @plugin 'catppuccin/tmux'
-set -g @catppuccin_flavour 'mocha' # or frappe, latte, mocha
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-sensible'
-run '/usr/share/tmux-plugin-manager/tpm'

update.sh

@@ -4,10 +4,6 @@ echo "Syncing dotfiles with alacritty..."
 rsync --recursive ~/.config/alacritty $(dirname "$0")
 echo "Syncing dotfiles with hypr..."
 rsync --recursive ~/.config/hypr $(dirname "$0")
-echo "Syncing dotfiles with nvim..."
-rsync --recursive ~/.config/nvim $(dirname "$0")
-echo "Syncing dotfiles with tmux..."
-rsync ~/.config/tmux/tmux.conf $(dirname "$0")/tmux/tmux.conf
 echo "Syncing dotfiles with waybar..."
 rsync --recursive ~/.config/waybar $(dirname "$0")
 echo "Syncing complete!"

waybar/config

@@ -0,0 +1,130 @@
+[
+    {
+        "name": "main",
+        "layer": "bottom",
+        "position": "top",
+        "height": 40,
+        "spacing": 0,
+        "output": "eDP-1",
+        "reload_style_on_change": true,
+        "modules-left": [
+            "custom/appmenu",
+            "disk", 
+            "memory", 
+            "cpu", 
+            "custom/gpu",
+            "temperature"
+        ],
+        "modules-center": [
+            "hyprland/workspaces"
+        ],
+        "modules-right": [
+            "tray", 
+            "wireplumber", 
+            "network#wifi", 
+            "battery",
+            "clock",
+            "custom/poweroff"
+        ],
+        "battery": {
+            "interval": 20,
+            "states": {
+                "warning": 30,
+                "critical": 15
+            },
+            "format": "{icon} {capacity}%",
+            "format-icons": [" ", " ", " ", " ", " "],
+            "max-length": 25
+        },
+        "clock": {
+            "interval": 1,
+            "format": "<b>{:%H:%M:%S %p}</b>",
+            "format-alt": "{:%Y-%m-%d}",
+            "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
+        },
+        "cpu": {
+            "format": " {usage}%",
+            "interval": 5,
+            "tooltip": false
+        },
+        "disk": {
+            "format": " {percentage_used}%",
+            "tooltip-format": "{used} / {total} used"
+        },
+        "idle_inhibitor": {
+            "format": "{icon}",
+            "format-icons": {
+                "activated": "",
+                "deactivated": ""
+            }
+        },
+        "memory": {
+            "format": " {}%",
+            "tooltip-format": "{used:0.1f}G / {total:0.1f}G used"
+        },
+        "temperature": {
+            "format": "{icon} {temperatureC}°C ",
+            "format-icons": ["", "", "", "", ""],
+            "hwmon-path": "/sys/class/thermal/thermal_zone2/temp",
+            "critical-threshold": 80,
+            "interval": 5
+        },
+        "temperature": {
+            "critical-threshold": 80,
+            "format": "{icon} {temperatureC}°C",
+            "format-icons": ["", "", "", "", ""],
+            "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input"
+        },
+        "network#wifi": {
+            "interface": "wlo1",
+            "format-wifi": "󰣺 {signalStrength}%",
+            "format-disconnected": "󰣽",
+            "tooltip-format": "{ifname}: {ipaddr}/{cidr}"
+        },
+        "sway/mode": {
+            "format": "<span style=\"italic\">{}</span>"
+        },
+        "hyprland/workspaces": {
+            "format": "{icon}",
+            "sort-by-number": true,
+            "all-outputs": true,
+            "disable-scroll": true,
+            "active-only": false,
+            "format-icons": {
+                "active": "",
+                "default": "",
+                "persistent": "",
+            },
+            "persistent-workspaces": {
+                "1": [ ],
+                "2": [ ],
+                "3": [ ],
+                "4": [ ],
+                "5": [ ]
+            }
+
+        },
+        "wireplumber": {
+            "format": " {volume}%",
+            "format-muted": " 0%",
+            "on-click": "pavucontrol",
+            "on-click-right": "helvum",
+            "max-volume": 100,
+            "scroll-step": 5
+        },
+        "tray": {
+            "icon-size": 21,
+            "spacing": 10
+        },
+        "custom/appmenu": {
+            "format": "",
+            "on-click": "pkill -x rofi || rofi -show drun"
+        },
+        "custom/poweroff": {
+            "tooltip": false,
+            "format": " ",
+            "on-click": "pgrep poweroff.sh || $HOME/.config/waybar/scripts/poweroff.sh"
+        },
+    }
+]
+

waybar/config.json

@@ -3,27 +3,37 @@
         "name": "main",
         "layer": "top",
         "position": "top",
-        "height": 34,
+        "height": 38,
         "spacing": 4,
-        "margin-top": 10,
+        "margin-top": 4,
         "margin-bottom": 0,
-        "output": "DP-2",
+        "output": "eDP-1",
         "modules-left": [
-            "wireplumber", 
             "disk", 
             "memory", 
             "cpu", 
-            "temperature"
+            "temperature",
+            "pulseaudio"
         ],
-        "modules-center": ["wlr/taskbar"],
+        "modules-center": ["hyprland/workspaces"],
         "modules-right": [
-            "hyprland/workspaces",
             "tray", 
+            "network#wifi", 
             "custom/weather", 
-            "network#ethernet", 
+            "battery",
             "clock",
             "custom/poweroff"
         ],
+        "battery": {
+            "interval": 60,
+            "states": {
+                "warning": 30,
+                "critical": 15
+            },
+            "format": "{icon} {capacity}%",
+            "format-icons": ["", "", "", "", "", ""],
+            "max-length": 25
+        },
         "clock": {
             "interval": 1,
             "format": "<b>{:%H:%M:%S}</b>",
@@ -51,26 +61,34 @@
         },
         "temperature": {
             "critical-threshold": 80,
-            "format": " {icon} {temperatureC}°C  ",
+            "format": "{icon} {temperatureC}°C",
             "format-icons": ["", "", "", "", ""],
             "hwmon-path": "/sys/class/thermal/thermal_zone2/temp"
         },
-        "network#ethernet": {
-            "interface": "enp*",
-            "format-ethernet": "",
-            "format-wifi": "",
-            "format-linked": "",
+        "network#wifi": {
+            "interface": "wlo1",
+            "format-wifi": " {essid} ({signalStrength})%",
             "format-disconnected": "",
-            "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
-            "on-click": "nm-connection-editor"
-        },
-        "sway/mode": {
-            "format": "<span style=\"italic\">{}</span>"
+            "tooltip-format": "{ifname}: {ipaddr}/{cidr}"
         },
         "hyprland/workspaces": {
-            "format": "{name}",
+            "format": "{icon}",
             "sort-by-number": true,
-            "all-outputs": true
+            "all-outputs": true,
+            "disable-scroll": true,
+            "active-only": false,
+            "format-icons": {
+                "default": "",
+                "persistent": "",
+                "active": ""
+            },
+            "persistent-workspaces": {
+                "1": [ ],
+                "2": [ ],
+                "3": [ ],
+                "4": [ ],
+                "5": [ ]
+            }
         },
         "wlr/taskbar": {
             "format": "{name}",
@@ -84,19 +102,17 @@
             ],
             "rewrite": {
                 "(.*)Firefox Web Browser": "",
-                "(.*)Discord": "",
+                "(.*)Discord": "󰙯",
                 "(.*)Alacritty": "",
                 "Steam(.*)": "",
                 "(.*)Spotify": ""
             }
         },
-        "wireplumber": {
+        "pulseaudio": {
             "format": " {volume}%",
             "format-muted": " 0%",
-            "on-click": "pavucontrol",
-            "on-click-right": "helvum",
             "max-volume": 100,
-            "scroll-step": 5
+            "scroll-step": 0
         },
         "tray": {
             "icon-size": 21,
@@ -112,10 +128,10 @@
         "custom/poweroff": {
             "tooltip": false,
             "format": " ",
-            "on-click": "bash $HOME/.config/waybar/scripts/poweroff.sh"
+            "on-click": "bash ~/.config/waybar/scripts/poweroff.sh"
         },
         "custom/weather": {
-            "exec": "$HOME/.config/waybar/scripts/get_weather.sh Belleville+Illinois",
+            "exec": "~/.config/waybar/scripts/get_weather.sh Belleville+Illinois",
             "return-type": "json",
             "format": "{}",
             "tooltip": true,

waybar/frappe.css

@@ -0,0 +1,37 @@
+/*
+*
+* Catppuccin Frappe palette
+* Maintainer: rubyowo
+*
+*/
+
+@define-color base   #303446;
+@define-color mantle #292c3c;
+@define-color crust  #232634;
+
+@define-color text     #c6d0f5;
+@define-color subtext0 #a5adce;
+@define-color subtext1 #b5bfe2;
+
+@define-color surface0 #414559;
+@define-color surface1 #51576d;
+@define-color surface2 #626880;
+
+@define-color overlay0 #737994;
+@define-color overlay1 #838ba7;
+@define-color overlay2 #949cbb;
+
+@define-color blue      #8caaee;
+@define-color lavender  #babbf1;
+@define-color sapphire  #85c1dc;
+@define-color sky       #99d1db;
+@define-color teal      #81c8be;
+@define-color green     #a6d189;
+@define-color yellow    #e5c890;
+@define-color peach     #ef9f76;
+@define-color maroon    #ea999c;
+@define-color red       #e78284;
+@define-color mauve     #ca9ee6;
+@define-color pink      #f4b8e4;
+@define-color flamingo  #eebebe;
+@define-color rosewater #f2d5cf;

waybar/style.css

@@ -1,92 +1,85 @@
-@import "mocha.css";
+@import "frappe.css";
 
 * {
     border: none;
     border-radius: 0px;
     min-height: 0;
-	font-size: 15px;
+    font-weight: bold;
+	font-size: 14px;
 	font-family: "Hack Nerd Font";
-    /*background: @base;*/
 }
 
 window#waybar {
-    background-color: transparent;
-	color: #ffffff;
-    transition-property: background-color;
-    transition-duration: .5s;
-}
-
-window#waybar.hidden {
-    opacity: 0.2;
+    background-color: alpha(@crust, 0.3);
+    border-radius: 0px;
+    border-bottom: 0px solid @overlay0;
 }
 
 #workspaces button {
-    border-radius: 20px;
+    color: @peach;
+    border-radius: 8px;
+    margin: 4px 2px;
+    padding: 0px 8px;
+    padding-right: 12px; /* why?? */
+    transition: all 0.4s ease;
 }
 
-#workspaces button:hover {
-    color: black;
-    border-bottom: 3px solid #ffffff;
+#workspaces button.active {
+    background-color: alpha(@peach, 0.2);
+    transition: all 0.4s ease;
 }
 
-#mode {
-    background-color: #64727D;
-    border-bottom: 3px solid #ffffff;
-}
-
-/* Sections */
-
 .modules-left,
 .modules-center,
 .modules-right {
-    border-radius: 20px;
-    border: 3px solid @crust;
-    padding: 0 10px;
+    padding-top: 0px;
+    padding-bottom: 0px;
 }
 
+.modules-left {
+    padding-left: 0px;
+}
+
+.modules-right {
+    padding-right: 0px;
+}
+
+#battery,
 #clock,
 #cpu,
 #disk,
 #memory,
-#network,
 #temperature,
-#taskbar,
 #tray,
-#workspaces,
 #wireplumber,
+#workspaces,
+#network,
+#custom-appmenu,
+#custom-gpu,
 #custom-poweroff,
-#custom-weather,
-#custom-spotify {
-	padding: 0 10px;
-}
-
-.modules-left {
-    background-image: linear-gradient(90deg, @base, @surface0, @surface2);
-}
-
-.modules-center {
-    background-image: linear-gradient(270deg, @base, @overlay2, @base);
-}
-
-.modules-right {
-    background-image: linear-gradient(270deg, @base, @surface0, @surface2);
-}
-
-#wireplumber{
-	color: @sapphire;
-}
-#disk {
+#custom-weather {
+    background-color: transparent;
+    border-radius: 10px;
+    border: none;
+    margin-left: 6px;
+    margin-right: 6px;
     color: @peach;
+    min-width: 45px;
 }
-#memory {
-	color: @teal;
+
+#network {
+    margin: 0px;
+    padding: 0px;
 }
-#cpu {
-	color: @lavender;
+
+#custom-appmenu,
+#workspaces label,
+#network {
+    font-size: 14px;
 }
-#temperature {
-    color: @sky;
-}
-#taskbar button {
-    color: @rosewater;
+
+
+#clock {
+    min-width: 80px;
 }
+