control: update dotfiles to v0.1.0

alacritty/alacritty.toml

@@ -1,13 +1,53 @@
-import = ["~/.config/alacritty/catppuccin/catppuccin-frappe.toml"]
 
 [cursor.style]
 shape = "Underline"
 
+[env]
+TERM = "xterm-256color"
+
 [font]
-size = 23
+size = 13
+
+[colors]
+footer_bar = { foreground = "#181818", background = "#d8d8d8" }
 
 [font.normal]
-family = "Hack Nerd Font"
+family = "HackNerdFont"
+
+[[keyboard.bindings]]
+action = "ScrollPageUp"
+key = "PageUp"
+mode = "~Alt"
+mods = "Shift"
+
+[[keyboard.bindings]]
+action = "ScrollPageDown"
+key = "PageDown"
+mode = "~Alt"
+mods = "Shift"
+
+[[keyboard.bindings]]
+action = "ScrollToTop"
+key = "Home"
+mode = "~Alt"
+mods = "Shift"
+
+[[keyboard.bindings]]
+action = "ScrollToBottom"
+key = "End"
+mode = "~Alt"
+mods = "Shift"
+
+[terminal.shell]
+args = ["--login"]
+program = "/bin/zsh"
 
 [window]
-opacity = 0.2
+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/frappe.conf

@@ -0,0 +1,61 @@
+$rosewaterAlpha = f2d5cf
+$flamingoAlpha  = eebebe
+$pinkAlpha      = f4b8e4
+$mauveAlpha     = ca9ee6
+$redAlpha       = e78284
+$maroonAlpha    = ea999c
+$peachAlpha     = ef9f76
+$yellowAlpha    = e5c890
+$greenAlpha     = a6d189
+$tealAlpha      = 81c8be
+$skyAlpha       = 99d1db
+$sapphireAlpha  = 85c1dc
+$blueAlpha      = 8caaee
+$lavenderAlpha  = babbf1
+
+$textAlpha      = c6d0f5
+$subtext1Alpha  = b5bfe2
+$subtext0Alpha  = a5adce
+
+$overlay2Alpha  = 949cbb
+$overlay1Alpha  = 838ba7
+$overlay0Alpha  = 737994
+
+$surface2Alpha  = 626880
+$surface1Alpha  = 51576d
+$surface0Alpha  = 414559
+
+$baseAlpha      = 303446
+$mantleAlpha    = 292c3c
+$crustAlpha     = 232634
+
+$rosewater = 0xfff2d5cf
+$flamingo  = 0xffeebebe
+$pink      = 0xfff4b8e4
+$mauve     = 0xffca9ee6
+$red       = 0xffe78284
+$maroon    = 0xffea999c
+$peach     = 0xffef9f76
+$yellow    = 0xffe5c890
+$green     = 0xffa6d189
+$teal      = 0xff81c8be
+$sky       = 0xff99d1db
+$sapphire  = 0xff85c1dc
+$blue      = 0xff8caaee
+$lavender  = 0xffbabbf1
+
+$text      = 0xffc6d0f5
+$subtext1  = 0xffb5bfe2
+$subtext0  = 0xffa5adce
+
+$overlay2  = 0xff949cbb
+$overlay1  = 0xff838ba7
+$overlay0  = 0xff737994
+
+$surface2  = 0xff626880
+$surface1  = 0xff51576d
+$surface0  = 0xff414559
+
+$base      = 0xff303446
+$mantle    = 0xff292c3c
+$crust     = 0xff232634

hypr/hyprland.conf

@@ -1,137 +1,325 @@
-# Monitor
-monitor=,highrr,auto,1.00
+source = ~/.config/hypr/frappe.conf # Catppuccin colorscheme
 
-# Startup
-exec-once = hyprpaper
-exec-once = waybar -c ~/.config/waybar/config.json
-exec-once = pulseaudio
-exec-once = linux-discord-rich-presence --config ~/.config/linux-discord-rich-presencerc
+# < Start Section >
+# monitors
+
+monitor = eDP-1, highrr, 0x0, 1.00
+monitor = , highrr, 1920x0, 1.00
+
+# < End Section >
+
+
+
+# < Start Section >
+# startup applications
+
+# environment launches
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH
+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 = waybar -c ~/.config/waybar/config
+exec-once = dunst
+exec-once = swww-daemon
 exec-once = syncthing --no-browser
 
-# Settings
-input {
-    kb_layout = us
-    kb_variant =
-    kb_model =
-    kb_options =
-    kb_rules =
+# main applications
+#exec-once = discord --enable-features=UseOzonePlatform --ozone-platform=wayland
+exec-once = spotify --disable-gpu
+exec-once = alacritty
+exec-once = firefox
+#exec-once = taskset -c 1-7 steam
+#exec-once = taskset -c 1-7 gamescope -W 3200 -H 1100 -b -- steam
+exec-once = bolt
 
-    follow_mouse = 2
+# < End Section >
 
-    touchpad {
-        natural_scroll = no
-    }
 
-    sensitivity = 0 
-}
+
+# < Start Section >
+# workspace rules
+
+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:eDP-1, persistent:true
+
+# last workspace for hdmi
+workspace = 6, monitor:HDMI-A-1
+
+# < End Section >
+
+
+
+# < Start Section >
+# variables
+
 
 general {
-    gaps_in = 5
-    gaps_out = 10
-    border_size = 0
-    layout = dwindle
+	gaps_in = 0
+	gaps_out = 4
+	border_size = 0
+	col.active_border = 0x000000
+	col.inactive_border = 0x000000
+	layout = master
+	resize_on_border = false
 }
 
 decoration {
-    rounding = 10
-    blur {
-        enabled = false
-        size = 3
-        passes = 1
-    }
-    drop_shadow = false 
-    shadow_range = 4
-    shadow_render_power = 3
-    col.shadow = rgba(1a1a1aee)
-    active_opacity = 0.75
-    inactive_opacity = 0.75
+    drop_shadow = false
+	rounding = 0
+	dim_special = 0.3
+	fullscreen_opacity = 1.0
+	
+	blur {
+		enabled = true
+		special = true
+		size = 6
+		passes = 3
+		new_optimizations = true
+		ignore_opacity = true
+		xray = false
+	}
 }
 
 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 = wind, 0.05, 0.9, 0.1, 1.05
+	bezier = winIn, 0.1, 1.1, 0.1, 1.1
+	bezier = winOut, 0.3, -0.3, 0, 1
+	bezier = liner, 1, 1, 1, 1
+	animation = windows, 1, 6, wind, slide
+	animation = windowsIn, 1, 6, winIn, slide
+	animation = windowsOut, 1, 5, winOut, slide
+	animation = windowsMove, 1, 5, wind, slide
+	animation = border, 1, 1, liner
+	animation = borderangle, 1, 30, liner, loop
+	animation = fade, 1, 10, default
+	animation = workspaces, 1, 5, wind
 }
 
-dwindle {
-    pseudotile = yes 
-    preserve_split = yes 
-}
-
-master {
-    new_is_master = true
+input {
+	kb_layout = us
+	kb_options = caps:escape
+	follow_mouse = 2
+	mouse_refocus = false;
+	
+	sensitivity = 0
+	force_no_accel = 1
+	touchpad {
+		natural_scroll = true
+	}
 }
 
 gestures {
-    workspace_swipe = off
+	workspace_swipe = false
+}
+
+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 {
-    vfr = true
-    disable_hyprland_logo = true
-    disable_splash_rendering = true
-    force_default_wallpaper = 0
+	disable_hyprland_logo = true
+	disable_splash_rendering = true
+	force_default_wallpaper = 0
+	vrr = 1
+	vfr = true
 }
 
-device:epic-mouse-v1 {
-    sensitivity = -0.5
+xwayland {
+	# latest configuration
+	# use_nearset_neighbor
+	# force_zero_scaling
+	# current configuration
+	use_nearest_neighbor = true
+	force_zero_scaling = false
 }
 
-# Window rules
-windowrule = float, ^(SnakePlusPlus)$
-windowrule = center, ^(SnakePlusPlus)$
+cursor {
+	no_hardware_cursors = true
+	inactive_timeout = 2
+	no_warps = false
+	default_monitor = DP-1
+}
 
-# General binds
+debug {
+	disable_logs = true
+	#disable_logs
+}
+
+# Disable touchscreen
+device {
+	name = gxtp7386:00-27c6:011a
+	enabled = false
+}
+
+
+# < End Section >
+
+
+
+# < Start Section >
+# dwindle layout
+
+dwindle {
+	pseudotile = true
+	preserve_split = true
+}
+
+# < End Section >
+
+
+
+# < Start Section >
+# master layout
+
+master {
+	new_status = master
+}
+
+# < End Section >
+
+
+
+# < Start Section >
+# window rules
+
+# core
+workspace = w[t1], gapsout:0, border:0, rounding:0
+windowrulev2 = suppressevent maximize, class:^(.*)$
+windowrulev2 = opacity 0.80 0.80,class:^(.*)$
+windowrulev2 = opacity 0.80 0.70,class:^(pavucontrol)$
+windowrulev2 = opacity 0.80 0.70,class:^(org.kde.polkit-kde-authentication-agent-1)$
+windowrulev2 = float, class:^(qt5ct)$
+windowrulev2 = float, class:^(nwg-look)$
+windowrulev2 = float, class:^(pavucontrol)$
+windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$
+
+# main
+windowrulev2 = workspace 1 silent, class:^(discord)$
+windowrulev2 = workspace 1 silent, class:^(vesktop)$
+windowrulev2 = workspace 1 silent, class:^(thunderbird)$
+windowrulev2 = workspace 1 silent, class:^(Dopamine)$
+windowrulev2 = workspace 1 silent, class:^(spotify)$
+windowrulev2 = workspace 2 silent, class:^(Alacritty)$
+windowrulev2 = workspace 3 silent, class:^(firefox)$
+
+# development
+windowrulev2 = float, class:^(VirtualBox.*)$
+windowrulev2 = float, title:^(SnakePlusPlus)$
+windowrulev2 = center, title:^(SnakePlusPlus)$
+windowrulev2 = opacity 0.4, title:^(SnakePlusPlus)$
+windowrulev2 = float, title:^(TetrisPlusPlus)$
+windowrulev2 = center, title:^(TetrisPlusPlus)$
+windowrulev2 = workspace 5 silent, class:^(aquamarine)$
+windowrulev2 = fullscreen, class:^(aquamarine)$
+
+# layer rules
+layerrule = blur,waybar
+layerrule = ignorezero, waybar
+
+# < End Section >
+
+
+
+# < Start Section >
+# keybinds
+
+# main modifier
 $mainMod = SUPER
+
+# passthrough
+bind = , mouse:275, pass, ^(discord)$
+bind = SHIFT, mouse:275, pass, ^(discord)$
+
+# core binds
+bind = $mainMod SHIFT, Q, killactive,
+bind = $mainMod SHIFT, M, exit
+bind = $mainMod, SPACE, togglefloating,
+bind = $mainMod, F, fullscreen,
+bind = $mainMod SHIFT, L, exec, hyprlock
+bind = $mainMod $CONTROL, ESCAPE, exec, killall waybar || waybar # toggle waybar
+bind = $mainMod SHIFT, J, togglesplit, # dwindle
+bind = $mainMod SHIFT, SPACE, pseudo, # dwindle
+
+# main application shortcuts
 bind = $mainMod, RETURN, exec, alacritty
-bind = $mainMod SHIFT, P, pseudo
-bind = $mainMod SHIFT, Q, killactive
-bind = $mainMod SHIFT, L, exec, swaylock -e -c 000000
-bind = $mainMod, M, exit, 
-bind = $mainMod, F, fullscreen
-bind = $mainMod, SPACE, togglefloating
-bind = $mainMod, S, exec, wofi --show drun
-bind = $mainMod SHIFT, S, exec, hyprshot -m region --clipboard-only
+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
+
+# generic audio control
+binde = , XF86AudioPlay, exec, playerctl play-pause
+binde = , XF86AudioStop, exec, playerctl stop
+binde = , XF86AudioPrev, exec, playerctl previous
+binde = , XF86AudioNext, exec, playerctl next
+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
 
 # Laptop binds
 binde = , XF86MonBrightnessDown, exec, brightnessctl set 5%-
 binde = , XF86MonBrightnessUp, exec, brightnessctl set 5%+
-binde = , XF86AudioMute, exec, pulseaudio-ctl mute
-binde = , XF86AudioLowerVolume, exec, pulseaudio-ctl down
-binde = , XF86AudioRaiseVolume, exec, pulseaudio-ctl up
 
-
-# Move focus 
+# move focus
 bind = $mainMod, h, movefocus, l
 bind = $mainMod, l, movefocus, r
 bind = $mainMod, k, movefocus, u
 bind = $mainMod, j, movefocus, d
 
-# Switch workspaces with mainMod + [0-9]
+# 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
-
-# Move active window to a workspace with mainMod + SHIFT + [0-9]
+bind = $mainMod, 6, workspace, 6
 bind = $mainMod SHIFT, 1, movetoworkspace, 1
 bind = $mainMod SHIFT, 2, movetoworkspace, 2
 bind = $mainMod SHIFT, 3, movetoworkspace, 3
 bind = $mainMod SHIFT, 4, movetoworkspace, 4
 bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+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
 
-# 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
 
-# sets repeatable binds for resizing the active window
-binde = $mainMod, right, resizeactive, 10 0
-binde = $mainMod, left, resizeactive, -10 0
-binde = $mainMod, up, resizeactive, 0 -10
-binde = $mainMod, down, resizeactive, 0 10
+# < End Section >
+
+
+
+# < Start Section >
+# environment variables
+
+env = XDG_CURRENT_DESKTOP,Hyprland
+env = XDG_SESSION_DESKTOP,Hyprland
+env = MOZ_ENABLE_WAYLAND,1
+env = HYPRCURSOR_THEME, rose-pine-hyprcursor
+env = HYPRCURSOR_SIZE, 24
+
+# < End Section >
 

hypr/hyprlock.conf

@@ -0,0 +1,79 @@
+source = $HOME/.config/hypr/frappe.conf
+
+$accent = $mauve
+$accentAlpha = $mauveAlpha
+$font = JetBrainsMono Nerd Font
+
+# GENERAL
+general {
+    disable_loading_bar = true
+    hide_cursor = true
+}
+
+# BACKGROUND
+background {
+    monitor = eDP-1
+    path = ~/.profile/background-locked.png
+    blur_passes = 0
+    color = $base
+}
+
+# TIME
+label {
+    monitor = eDP-1
+    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 = eDP-1
+    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 = eDP-1
+    path = ~/.profile/pfp.png
+    size = 100
+    border_color = $accent
+
+    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 = $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/hyprpaper.conf

@@ -1,5 +0,0 @@
-splash = false
-# Single monitor setup
-preload=~/pics/dharmx/nord/holy-arch-nordic.png
-wallpaper=eDP-1,~/pics/dharmx/nord/holy-arch-nordic.png
-ipc = off

hypr/mocha.conf

@@ -1,61 +0,0 @@
-$rosewaterAlpha = fff5e0dc
-$flamingoAlpha  = fff2cdcd
-$pinkAlpha      = fff5c2e7
-$mauveAlpha     = ffcba6f7
-$redAlpha       = fff38ba8
-$maroonAlpha    = ffeba0ac
-$peachAlpha     = fffab387
-$yellowAlpha    = fff9e2af
-$greenAlpha     = ffa6e3a1
-$tealAlpha      = ff94e2d5
-$skyAlpha       = ff89dceb
-$sapphireAlpha  = ff74c7ec
-$blueAlpha      = ff89b4fa
-$lavenderAlpha  = ffb4befe
-
-$textAlpha      = ffcdd6f4
-$subtext1Alpha  = ffbac2de
-$subtext0Alpha  = ffa6adc8
-
-$overlay2Alpha  = ff9399b2
-$overlay1Alpha  = ff7f849c
-$overlay0Alpha  = ff6c7086
-
-$surface2Alpha  = ff585b70
-$surface1Alpha  = ff45475a
-$surface0Alpha  = ff313244
-
-$baseAlpha      = ff1e1e2e
-$mantleAlpha    = ff181825
-$crustAlpha     = ff11111b
-
-$rosewater = 0xfff5e0dc
-$flamingo  = 0xfff2cdcd
-$pink      = 0xfff5c2e7
-$mauve     = 0xffcba6f7
-$red       = 0xfff38ba8
-$maroon    = 0xffeba0ac
-$peach     = 0xfffab387
-$yellow    = 0xfff9e2af
-$green     = 0xffa6e3a1
-$teal      = 0xff94e2d5
-$sky       = 0xff89dceb
-$sapphire  = 0xff74c7ec
-$blue      = 0xff89b4fa
-$lavender  = 0xffb4befe
-
-$text      = 0xffcdd6f4
-$subtext1  = 0xffbac2de
-$subtext0  = 0xffa6adc8
-
-$overlay2  = 0xff9399b2
-$overlay1  = 0xff7f849c
-$overlay0  = 0xff6c7086
-
-$surface2  = 0xff585b70
-$surface1  = 0xff45475a
-$surface0  = 0xff313244
-
-$base      = 0xff1e1e2e
-$mantle    = 0xff181825
-$crust     = 0xff11111b

update.sh

@@ -1,13 +1,12 @@
 #!/bin/bash
 
 echo "Syncing dotfiles with alacritty..."
-rsync --recursive ~/.config/alacritty $(dirname "$0")
+rsync --delete --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
+rsync --delete --recursive ~/.config/hypr $(dirname "$0")
+
 echo "Syncing dotfiles with waybar..."
-rsync --recursive ~/.config/waybar $(dirname "$0")
+rsync --delete --recursive ~/.config/waybar $(dirname "$0")
+
 echo "Syncing complete!"

waybar/config

@@ -1,51 +1,53 @@
 [
     {
         "name": "main",
-        "layer": "top",
+        "layer": "bottom",
         "position": "top",
-        "height": 38,
-        "spacing": 4,
-        "margin-top": 4,
-        "margin-bottom": 0,
+        "height": 40,
+        "spacing": 0,
         "output": "eDP-1",
+        "reload_style_on_change": true,
         "modules-left": [
+            "custom/appmenu",
             "disk", 
             "memory", 
             "cpu", 
-            "temperature",
-            "pulseaudio"
+            "custom/gpu",
+            "temperature"
+        ],
+        "modules-center": [
+            "hyprland/workspaces"
         ],
-        "modules-center": ["hyprland/workspaces"],
         "modules-right": [
             "tray", 
+            "wireplumber", 
             "network#wifi", 
-            "custom/weather", 
-            "battery",
             "clock",
             "custom/poweroff"
         ],
         "battery": {
-            "interval": 60,
+            "interval": 20,
             "states": {
                 "warning": 30,
                 "critical": 15
             },
             "format": "{icon} {capacity}%",
-            "format-icons": ["", "", "", "", "", ""],
+            "format-icons": [" ", " ", " ", " ", " "],
             "max-length": 25
         },
         "clock": {
             "interval": 1,
-            "format": "<b>{:%H:%M:%S}</b>",
+            "format": "<b>{:%I:%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": " {}%",
+            "format": " {percentage_used}%",
             "tooltip-format": "{used} / {total} used"
         },
         "idle_inhibitor": {
@@ -59,18 +61,28 @@
             "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/thermal/thermal_zone2/temp"
+            "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input"
         },
         "network#wifi": {
             "interface": "wlo1",
-            "format-wifi": " {essid} ({signalStrength})%",
-            "format-disconnected": "",
+            "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,
@@ -78,9 +90,9 @@
             "disable-scroll": true,
             "active-only": false,
             "format-icons": {
-                "default": "",
-                "persistent": "",
-                "active": ""
+                "active": "",
+                "default": "",
+                "persistent": "",
             },
             "persistent-workspaces": {
                 "1": [ ],
@@ -89,53 +101,29 @@
                 "4": [ ],
                 "5": [ ]
             }
+
         },
-        "wlr/taskbar": {
-            "format": "{name}",
-            "icon-size": 32,
-            "tooltip": false,
-            "on-click": "activate",
-            "on-click-right": "close",
-            "all-outputs": true,
-            "ignore-list": [
-                "xwaylandvideobridge"
-            ],
-            "rewrite": {
-                "(.*)Firefox Web Browser": "",
-                "(.*)Discord": "󰙯",
-                "(.*)Alacritty": "",
-                "Steam(.*)": "",
-                "(.*)Spotify": ""
-            }
-        },
-        "pulseaudio": {
+        "wireplumber": {
             "format": " {volume}%",
             "format-muted": " 0%",
+            "on-click": "pavucontrol",
+            "on-click-right": "helvum",
             "max-volume": 100,
-            "scroll-step": 0
+            "scroll-step": 5
         },
         "tray": {
             "icon-size": 21,
             "spacing": 10
         },
-        "custom/spotify": {
-            "interval": 1,
-            "return-type": "json",
-            "exec": "~/.config/waybar/scripts/spotify.sh",
-            "exec-if": "pgrep spotify",
-            "escape": true
+        "custom/appmenu": {
+            "format": "",
+            "on-click": "pkill -x rofi || rofi -show drun"
         },
         "custom/poweroff": {
             "tooltip": false,
             "format": " ",
-            "on-click": "bash ~/.config/waybar/scripts/poweroff.sh"
+            "on-click": "pgrep poweroff.sh || $HOME/.config/waybar/scripts/poweroff.sh"
         },
-        "custom/weather": {
-            "exec": "~/.config/waybar/scripts/get_weather.sh Belleville+Illinois",
-            "return-type": "json",
-            "format": "{}",
-            "tooltip": true,
-            "interval": 3600
-        }
     }
 ]
+

waybar/mocha.css

@@ -1,37 +0,0 @@
-/*
-*
-* Catppuccin Mocha palette
-* Maintainer: rubyowo
-*
-*/
-
-@define-color base   #1e1e2e;
-@define-color mantle #181825;
-@define-color crust  #11111b;
-
-@define-color text     #cdd6f4;
-@define-color subtext0 #a6adc8;
-@define-color subtext1 #bac2de;
-
-@define-color surface0 #313244;
-@define-color surface1 #45475a;
-@define-color surface2 #585b70;
-
-@define-color overlay0 #6c7086;
-@define-color overlay1 #7f849c;
-@define-color overlay2 #9399b2;
-
-@define-color blue      #89b4fa;
-@define-color lavender  #b4befe;
-@define-color sapphire  #74c7ec;
-@define-color sky       #89dceb;
-@define-color teal      #94e2d5;
-@define-color green     #a6e3a1;
-@define-color yellow    #f9e2af;
-@define-color peach     #fab387;
-@define-color maroon    #eba0ac;
-@define-color red       #f38ba8;
-@define-color mauve     #cba6f7;
-@define-color pink      #f5c2e7;
-@define-color flamingo  #f2cdcd;
-@define-color rosewater #f5e0dc;

waybar/style.css

@@ -4,58 +4,81 @@
     border: none;
     border-radius: 0px;
     min-height: 0;
+    font-weight: bold;
 	font-size: 14px;
 	font-family: "Hack Nerd Font";
 }
 
 window#waybar {
-    background-color: transparent;
-	color: @text;
-}
-
-#workspaces {
-    margin: 4px 0;
-    border-radius: 5px;
-    background: transparent;
+    background-color: alpha(@crust, 0.3);
+    border-radius: 0px;
+    border-bottom: 0px solid @overlay0;
 }
 
 #workspaces button {
-    color: @overlay0;
-    background: transparent;
-    transition: all 0.1s ease;
+    color: @peach;
+    border-radius: 8px;
+    margin: 4px 2px;
+    padding: 0px 8px;
+    padding-right: 12px; /* why?? */
+    transition: all 0.4s ease;
 }
 
 #workspaces button.active {
-    color: @lavender;
-    border-top: 2px solid @lavender;
-    transition: all 0.1s ease;
+    background-color: alpha(@peach, 0.2);
+    transition: all 0.4s ease;
+}
+
+.modules-left,
+.modules-center,
+.modules-right {
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
+
+.modules-left {
+    padding-left: 0px;
+}
+
+.modules-right {
+    padding-right: 0px;
 }
 
 #clock,
 #cpu,
 #disk,
 #memory,
-#network,
 #temperature,
 #tray,
-#pulseaudio,
+#wireplumber,
+#workspaces,
+#network,
+#custom-appmenu,
+#custom-gpu,
 #custom-poweroff,
 #custom-weather {
-	padding: 0 10px;
+    background-color: transparent;
+    border-radius: 10px;
+    border: ;
+    margin-left: 6px;
+    margin-right: 6px;
+    color: @peach;
+    min-width: 45px;
 }
 
-#pulseaudio {
-	color: @sapphire;
+#network {
+    margin: 0px;
+    padding: 0px;
 }
-#disk {
-	color: @peach;
+
+#custom-appmenu,
+#workspaces label,
+#network {
+    font-size: 14px;
 }
-#memory {
-	color: @teal;
-}
-#cpu {
-	color: @lavender;
-}
-#temperature {
-    color: @sky;
+
+
+#clock {
+    min-width: 80px;
 }
+