fix(gtk4): theming (hopefully)

.gitignore

@@ -0,0 +1,12 @@
+zsh/.zcompdump*
+FiraCode.zip
+systemd/user/default.target.wants/*
+systemd/user/graphical-session.target.wants/*
+systemd/user/sockets.target.wants/*
+nvim/lazy-lock.json
+gtk-4.0/servers
+pulse/cookie
+kdeconnect
+dconf
+pavucontrol.ini
+waybar/config

dconf-export/gedit.dconf

@@ -12,7 +12,10 @@ statusbar-visible=true
 
 [state/window]
 bottom-panel-size=140
+height=979
+maximized=true
 side-panel-active-page='GeditWindowDocumentsPanel'
 side-panel-size=200
-size=(635, 285)
+size=(950, 975)
 state=43908
+width=956

dconf-export/gtk4.dconf

@@ -1,7 +1,7 @@
 [settings/file-chooser]
 date-format='regular'
 location-mode='path-bar'
-show-hidden=true
+show-hidden=false
 show-size-column=true
 show-type-column=true
 sidebar-width=140

dconf-export/nautilus.dconf

@@ -1,3 +1,6 @@
+[compression]
+default-compression-format='tar.xz'
+
 [icon-view]
 default-zoom-level='small'
 
@@ -6,6 +9,8 @@ default-folder-viewer='icon-view'
 migrated-gtk-settings=true
 search-filter-time-type='last_modified'
 search-view='list-view'
+show-create-link=true
+show-delete-permanently=true
 
 [window-state]
 initial-size=(1280, 720)

fedora.sh

@@ -15,14 +15,6 @@ set_unit () {
     systemctl --user enable --now $*
 }
 
-replace_config_line "/etc/dnf/dnf.conf" "installonly_limit" "3"
-replace_config_line "/etc/dnf/dnf.conf" "best" "False"
-replace_config_line "/etc/dnf/dnf.conf" "skip_unavailable" "True"
-replace_config_line "/etc/dnf/dnf.conf" "fastestmirror" "True"
-replace_config_line "/etc/dnf/dnf.conf" "defaultyes" "True"
-replace_config_line "/etc/dnf/dnf.conf" "keepcache" "True"
-replace_config_line "/etc/dnf/dnf.conf" "max_parallel_downloads" "5"
-
 ensure_installed () {
     for dep in $*; do
         if $(dnf list --installed "$dep" 2>&1 | grep -q "$dep") ; then
@@ -33,9 +25,21 @@ ensure_installed () {
     done
 }
 
+# Select install type
+
+type="${1:-desktop}"
+
+replace_config_line "/etc/dnf/dnf.conf" "installonly_limit" "3"
+replace_config_line "/etc/dnf/dnf.conf" "best" "False"
+replace_config_line "/etc/dnf/dnf.conf" "skip_unavailable" "True"
+replace_config_line "/etc/dnf/dnf.conf" "fastestmirror" "True"
+replace_config_line "/etc/dnf/dnf.conf" "defaultyes" "True"
+replace_config_line "/etc/dnf/dnf.conf" "keepcache" "True"
+replace_config_line "/etc/dnf/dnf.conf" "max_parallel_downloads" "10"
+
 # Enable extra repos
 sudo dnf update
-sudo dnf copr enable solopasha/hyprland
+sudo dnf copr enable lionheartp/Hyprland
 sudo dnf copr enable tofik/sway
 sudo dnf copr enable derisis13/ani-cli
 sudo dnf copr enable rezso/hdl
@@ -56,7 +60,7 @@ mkdir -p ~/.local/state/zsh/
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 mv ~/.oh-my-zsh ~/.local/share/oh-my-zsh/   # TODO: figure out how to contol install location of script above. Maybe reboot/relog after xgd_user_dirs is installed?
 git clone https://github.com/Aloxaf/fzf-tab ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/fzf-tab
-curl -O -fsSL https://github.com/ryanoasis/nerd-fonts/releases/download/v3.3.0/FiraCode.zip && unzip FiraCode.zip *.ttf -d ~/.local/share/fonts/
+curl -O -fsSL https://github.com/ryanoasis/nerd-fonts/releases/download/v3.3.0/FiraCode.zip && unzip FiraCode.zip "*.ttf" -d ~/.local/share/fonts/
 printf "You'll need to relog to have your default shell changed\n"
 
 # Install background and hyprland stuff
@@ -65,10 +69,16 @@ mkdir -p ~/.local/share/backgrounds/
 curl -o ~/.local/share/backgrounds/eKxlw8.jpg -fsSL "https://live.staticflickr.com/5077/5914101671_d80c6591e8_k.jpg"
 set_unit hypridle.service hyprpaper.service hyprpolkitagent.service hyprsunset.service
 set_unit pipewire.service pipewire-pulse.service
+
 # desktop elements that just work
 ensure_installed swaync
 set_unit swaync.service
-ensure_installed waybar fontawesome4-fonts
+ensure_installed waybar fontawesome4-fonts pavucontrol powerprofilesctl blueman
+if [ "$type" = "laptop" ]; then
+    cp ~/.config/waybar/config_laptop.json ~/.config/waybar/config
+else
+    cp ~/.config/waybar/config_desktop.json ~/.config/waybar/config
+fi
 set_unit waybar.service
 ensure_installed cliphist
 set_unit cliphist.service
@@ -76,14 +86,14 @@ set_unit cliphist.service
 # Install ReGreet
 ensure_installed cargo gtk4-devel cairo-gobject-devel pango-devel greetd
 sudo usermod -a -G video greetd
-sudo cp -r ~/.config/regreet/greetd /etc/greetd/
+sudo cp -r ~/.config/regreet/greetd/* /etc/greetd/
 sudo cp ~/.local/share/backgrounds/eKxlw8.jpg /etc/greetd/
 sudo cp ~/.config/gtk-4.0/gtk.css /etc/greetd/regreet.css
 sudo cp ~/.config/regreet/tmpfiles.conf /etc/tmpfiles.d/regreet.conf
-mkdir -p "~/.local/bin/build_stage/"
-git clone https://github.com/rharish101/ReGreet.git "~/.local/bin/build_stage/" &&
+mkdir -p ~/.local/bin/build_stage/
+git clone https://github.com/rharish101/ReGreet.git ~/.local/bin/build_stage/ReGreet &&
     cd ~/.local/bin/build_stage/ReGreet/ &&
-    cargo build -F gtk4_8 --release &&
+    cargo build --release &&
     sudo cp ./target/release/regreet /usr/bin/ &&
     systemctl enable greetd.service
 cd
@@ -107,8 +117,8 @@ dconf load /org/gnome/nautilus/ < ~/.config/dconf-export/nautilus.dconf
 dconf load /org/gnome/gedit/ < ~/.config/dconf-export/gedit.dconf
 
 # rofi & rofi-calc (compilation, because why not)
-ensure_installed rofi-wayland rofi-devel qalculate automake libtool
-git clone https://github.com/svenstaro/rofi-calc "~/.local/bin/build_stage/rofi-calc" && cd "~/.local/bin/build_stage/rofi-calc" && mkdir m4 && autoreconf -i && mkdir build && cd build && ../configure && make && sudo make install 
+ensure_installed rofi-wayland rofi-devel qalculate meson libtool cairo-devel
+git clone https://github.com/svenstaro/rofi-calc ~/.local/bin/build_stage/rofi-calc && cd ~/.local/bin/build_stage/rofi-calc && meson setup build && meson compile -C build && sudo meson install
 cd
 
 # kdeconnect

gtk-4.0/gtk-dark.css

@@ -0,0 +1 @@
+/usr/share/themes/adw-gtk3-dark/gtk-4.0/gtk-dark.css

hypr/exec.conf

@@ -8,7 +8,7 @@
 # exec-once = waybar & hyprpaper & firefox
 
 
-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP DISPLAY
 #exec-once = uwsm app hyprpaper
 #exec-once = uwsm app waybar
 #exec-once = uwsm app swaync

hypr/hyprland.conf

@@ -27,8 +27,13 @@ source=./macchiato.conf
 
 # Window rules
 
-windowrulev2 = center, class:^(Rofi)$
-windowrulev2 = stayfocused, class:^(Rofi)$
+windowrule {
+  name = windowrule-1
+  center = on
+  stay_focused = on
+  match:class = ^(Rofi)$
+}
+
 
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
@@ -98,7 +103,7 @@ animations {
 
 dwindle {
     # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
-    pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
+    #pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
     preserve_split = yes # you probably want this
 }
 
@@ -109,9 +114,9 @@ master {
 
 gestures {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    workspace_swipe = on
-    workspace_swipe_fingers = 3
-    workspace_swipe_invert = false
+    # workspace_swipe = on
+    # workspace_swipe_fingers = 3
+    # workspace_swipe_invert = false
 }
 
 xwayland {
@@ -126,18 +131,6 @@ misc {
     #force_hypr_chan = true # there is suddenly an anime girl on the background :D
 }
 
-# Example per-device config
-# See https://wiki.hyprland.org/Configuring/Keywords/#executing for more
-# device:epic-mouse-v1 {
-#     sensitivity = -0.5
-# }
-
-# Example windowrule v1
-# windowrule = float, ^(kitty)$
-# Example windowrule v2
-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-
 
 source=./keybinds.conf
 debug:disable_logs = false

hypr/hyprpaper.conf

@@ -1,6 +1,7 @@
-preload = /home/ha5pls/.local/share/backgrounds/eKxlw8.jpg
-
-wallpaper = ,/home/ha5pls/.local/share/backgrounds/eKxlw8.jpg
+wallpaper {
+    monitor = 
+    path = /home/ha5pls/.local/share/backgrounds/eKxlw8.jpg
+}
 
 splash = false
 

hypr/keybinds.conf

@@ -13,7 +13,7 @@ bind = $mainMod SHIFT, Y, workspaceopt, allfloat
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod SHIFT, P, pin
 bind = $mainMod SHIFT, P, workspaceopt, allpseudo
-bind = $mainMod, O, togglesplit, # dwindle
+#bind = $mainMod, O, togglesplit, # dwindle
 bind = $mainMod, E, fullscreen, 1
 bind = $mainMod SHIFT, E, fullscreen, 0
 # bind = $mainMod CTRL, E, fakefullscreen

nvim/lua/chadrc.lua

@@ -1,7 +1,7 @@
 local options = {
 
   base46 = {
-    theme = "chadracula-evondev", -- default theme
+    theme = "eldritch", -- default theme
     hl_add = {},
     hl_override = {},
     integrations = {},
@@ -11,7 +11,7 @@ local options = {
       },
     },
     transparency = true,
-    theme_toggle = { "chadracula-evondev", "one_light" },
+    theme_toggle = { "eldritch", "one_light" },
   },
 
   ui = {

nvim/lua/myinit.lua

@@ -6,10 +6,13 @@ local autocmd = vim.api.nvim_create_autocmd
 --   command = "tabdo wincmd =",
 -- })
 
--- Auto unfold all when entering a buffer
--- autocmd("BufWinEnter", { pattern = "*", command = "silent! :%foldopen!" })
 
--- Hyrplang filetype 
+-- disable folding on startup
+vim.opt.foldenable = false
+-- disable folding on loading
+vim.opt.foldlevel = 20
+
+-- Hyrplang filetype
 vim.filetype.add({
   pattern = { [".*/hypr/.*%.conf"] = "hyprlang" },
 })

regreet/greetd/hyprland.conf

@@ -5,5 +5,4 @@ input {
 misc {
     disable_hyprland_logo = true
     disable_splash_rendering = true
-    disable_hyprland_qtutils_check = true
 }

rofi/applets/bin/ppd.sh

@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+
+## Author  : Aditya Shakya (adi1090x)
+## Github  : @adi1090x
+#
+## Applets : Power Menu
+
+# Import Current Theme
+source "$HOME"/.config/rofi/applets/shared/theme.bash
+theme="$type/$style"
+
+# Theme Elements
+prompt="Select power profile"
+mesg="Current power profile : `powerprofilesctl get`"
+
+if [[ ( "$theme" == *'type-1'* ) || ( "$theme" == *'type-3'* ) || ( "$theme" == *'type-5'* ) ]]; then
+    list_col='1'
+    list_row='3'
+elif [[ ( "$theme" == *'type-2'* ) || ( "$theme" == *'type-4'* ) ]]; then
+    list_col='3'
+    list_row='1'
+fi
+
+# Options
+layout=`cat ${theme} | grep 'USE_ICON' | cut -d'=' -f2`
+if [ "$layout" = 'NO' ]; then
+    option_1="󰡴 Performance"
+    option_2="󰊚 Balanced"
+    option_3="󰡳 Power saver"
+else
+    option_1="󰡴"
+    option_2="󰊚"
+    option_3="󰡳"
+fi
+
+# Rofi CMD
+rofi_cmd() {
+    rofi -theme-str "listview {columns: $list_col; lines: $list_row;}" \
+        -theme-str 'textbox-prompt-colon {str: "";}' \
+        -dmenu \
+        -p "$prompt" \
+        -mesg "$mesg" \
+        -markup-rows \
+        -theme ${theme}
+}
+
+# Pass variables to rofi dmenu
+run_rofi() {
+    echo -e "$option_1\n$option_2\n$option_3" | rofi_cmd
+}
+
+
+# Execute Command
+run_cmd() {
+    if [ "$1" = '--opt1' ]; then
+        powerprofilesctl set performance
+    elif [ "$1" = '--opt2' ]; then
+        powerprofilesctl set balanced
+    elif [ "$1" = '--opt3' ]; then
+        powerprofilesctl set power-saver
+    fi
+}
+
+# Actions
+chosen="$(run_rofi)"
+case ${chosen} in
+    $option_1)
+        run_cmd --opt1
+        ;;
+    $option_2)
+        run_cmd --opt2
+        ;;
+    $option_3)
+        run_cmd --opt3
+        ;;
+esac
+

uwsm/env

@@ -0,0 +1,9 @@
+export XCURSOR_SIZE="24"
+export XCURSOR_THEME="Adwaita"
+export QT_QPA_PLATFORMTHEME="gtk3"
+export QT_QPA_PLATFORM="wayland;xcb"
+export GTK_THEME="adw-gtk3-dark"
+export SDL_VIDEODRIVER="wayland"
+export CLUTTER_BACKEND="wayland"
+export XDG_RUNTIME_DIR="/run/user/1000/"
+export GDK_BACKEND="wayland,x11,*"

waybar/config_desktop.json

@@ -4,7 +4,7 @@
   "include": [
     "~/.config/waybar/modules.jsonc"
   ],
-	"height": 40,
+  "height": 40,
   "margin-left": 3, 
   "margin-right": 3,
   "margin-top": 3,

waybar/config_laptop.json

@@ -0,0 +1,19 @@
+{
+  "layer": "top",
+  "position": "top",
+  "include": [
+    "~/.config/waybar/modules.jsonc"
+  ],
+  "height": 20,
+  "margin-left": 3, 
+  "margin-right": 3,
+  "margin-top": 3,
+  "margin-bottom": 3,
+  "modules-left": ["custom/junkyard", "hyprland/workspaces"],
+  "modules-center": ["clock"],
+  "modules-right": ["tray", "custom/notification", "pulseaudio", "bluetooth", "backlight", "network", "battery", "group/group-power" ],
+  "tray": {
+    "icon-size": 16,
+    "spacing": 10
+  },
+}

waybar/modules.jsonc

@@ -20,39 +20,39 @@
         // "timezone": "America/New_York",
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
         "format": "{:%a, %d %b, %R}",
-				"on-click": ""
+        "on-click": ""
     },
 
     "pulseaudio": {
         // "scroll-step": 1, // %, can be a float
         //"reverse-scrolling": 1,
         "format": "{icon} {volume}% {format_source}",
-        "format-bluetooth": "{icon}  {volume}% {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
-        "format-muted": "婢 {format_source}",
+        "format-bluetooth": "{icon} {volume}% {format_source}",
+        "format-bluetooth-muted": "{icon} {format_source}",
+        "format-muted": "󰝟 {volume}% {format_source}",
         "format-source": " {volume}%",
         "format-source-muted": "",
         "format-icons": {
             "headphone": "󰋋",
-            "hands-free": "",
+            "hands-free": "󱡒",
             "headset": "󰋎",
             "phone": "",
-            "portable": "",
+            "portable": "󰓃",
             "car": "",
             "default": ["󰸈", "󰕿", "󰖀", "󰕾"]
         },
-        "on-click": "~/.config/rofi/applets/bin/volume.sh",
+        "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle",
         "on-click-right": "uwsm app pavucontrol"
     },
 
-		"bluetooth": {
-			"format": "",
-			"format-disabled": "",
-			"format-connected": " {num_connections}",
-			"tooltip-format-enumerate-connected": "{device_alias}",
-			"tooltip-format-connected": "{device_enumerate}",
-			"on-click": "uwsm app blueman-manager"
-		},
+    "bluetooth": {
+        "format": "",
+        "format-disabled": "",
+        "format-connected": " {num_connections}",
+        "tooltip-format-enumerate-connected": "{device_alias}",
+        "tooltip-format-connected": "{device_enumerate}",
+        "on-click": "uwsm app blueman-manager"
+    },
 
     "temperature": {
         // "thermal-zone": 2,
@@ -66,6 +66,7 @@
 
     "tray": {
         "icon-size": 13,
+        "show-passive-items": true,
         "spacing": 00
     },
 
@@ -73,14 +74,14 @@
         "tooltip": false,
         "format": "{icon}",
         "format-icons": {
-          "notification": "<span foreground='red'><sup></sup></span>",
-          "none": "",
-          "dnd-notification": "<span foreground='red'><sup></sup></span>",
-          "dnd-none": "",
-          "inhibited-notification": "<span foreground='red'><sup></sup></span>",
-          "inhibited-none": "",
-          "dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
-          "dnd-inhibited-none": ""
+            "notification": "<span foreground='red'><sup></sup></span>",
+            "none": "",
+            "dnd-notification": "<span foreground='red'><sup></sup></span>",
+            "dnd-none": "",
+            "inhibited-notification": "<span foreground='red'><sup></sup></span>",
+            "inhibited-none": "",
+            "dnd-inhibited-notification": "<span foreground='red'><sup></sup></span>",
+            "dnd-inhibited-none": ""
         },
         "return-type": "json",
         "exec-if": "which swaync-client",
@@ -91,94 +92,99 @@
         "escape": true
     },
 
-  "cpu": {
-    "interval": 1,
-    "format": "  {usage:02d}%{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}",
-    "format-icons": [
-      "<span color='#a6da95'>▁</span>", // green
-      "<span color='#8aadf4'>▂</span>", // blue
-      "<span color='#8aadf4'>▃</span>", // white
-      "<span color='#8aadf4'>▄</span>", // white
-      "<span color='#8aadf4'>▅</span>", // yellow
-      "<span color='#eed49f'>▆</span>", // yellow
-      "<span color='#f5a97f'>▇</span>", // orange
-      "<span color='#ed8796'>█</span>"  // red
-     ]
-  },
+    "cpu": {
+        "interval": 1,
+        "format": "  {usage:02d}%{icon0}{icon1}{icon2}{icon3}{icon4}{icon5}{icon6}{icon7}",
+        "format-icons": [
+            "<span color='#a6da95'>▁</span>", // green
+            "<span color='#8aadf4'>▂</span>", // blue
+            "<span color='#8aadf4'>▃</span>", // white
+            "<span color='#8aadf4'>▄</span>", // white
+            "<span color='#8aadf4'>▅</span>", // yellow
+            "<span color='#eed49f'>▆</span>", // yellow
+            "<span color='#f5a97f'>▇</span>", // orange
+            "<span color='#ed8796'>█</span>"  // red
+        ]
+    },
 
-  "memory": {
-      "interval": 5,
-      "format": "󰍛 {percentage}%"
-  },
+    "memory": {
+        "interval": 5,
+        "format": "󰍛 {percentage}%"
+    },
 
-  "group/group-power": {
-      "orientation": "inherit",
-      "drawer": {
-          "transition-duration": 500,
-          "children-class": "not-power",
-          "transition-left-to-right": true
-      },
-      "modules": [
-          "custom/power", // First element is the "group leader" and won't ever be hidden
-          "custom/reboot",
-          "custom/quit",
-          "custom/suspend",
-          "custom/lock"
-      ]
-  },
-  "custom/quit": {
-      "format": " 󰗼 ",
+    "group/group-power": {
+        "orientation": "inherit",
+        "drawer": {
+            "transition-duration": 500,
+            "children-class": "not-power",
+            "transition-left-to-right": true
+        },
+        "modules": [
+            "custom/power", // First element is the "group leader" and won't ever be hidden
+            "custom/reboot",
+            "custom/quit",
+            "custom/suspend",
+            "custom/lock"
+        ]
+    },
+    "custom/quit": {
+        "format": " 󰗼 ",
+        "tooltip": false,
+        "on-click": "uwsm stop"
+    },
+    "custom/lock": {
+        "format": " 󰍁 ",
+        "tooltip": false,
+        "on-click": "loginctl lock-session"
+    },
+    "custom/suspend": {
+      "format": " 󰒲 ",
       "tooltip": false,
-      "on-click": "uwsm stop"
-  },
-  "custom/lock": {
-      "format": " 󰍁 ",
-      "tooltip": false,
-      "on-click": "loginctl lock-session"
-  },
-  "custom/suspend": {
-    "format": " 󰒲 ",
-    "tooltip": false,
-    "on-click": "systemctl suspend"
-  },
-  "custom/reboot": {
-      "format": " 󰜉 ",
-      "tooltip": false,
-      "on-click": "systemctl reboot"
-  },
-  "custom/power": {
-      "format": "  ",
-      "tooltip": false,
-      "on-click": "systemctl poweroff"
-  },
+      "on-click": "systemctl suspend"
+    },
+    "custom/reboot": {
+        "format": " 󰜉 ",
+        "tooltip": false,
+        "on-click": "systemctl reboot"
+    },
+    "custom/power": {
+        "format": "  ",
+        "tooltip": false,
+        "on-click": "systemctl poweroff"
+    },
 
-	"battery": {
-		"states": {
-			"warning": 20,
-			"critical": 5
-		},
-		"format": "{capacity}% {icon}",
-		"format-charging": "{capacity}% 󰂄",
-		"format-plugged": "{capacity}% 󰚥",
-		"format-alt": "{time} {icon}",
-		"format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂁", "󰁹"],
-		"on-click": "~/.config/rofi/applets/bin/powermenu.sh"
-	},
-	"battery#bat0": {
-		"bat": "BAT0"
-	},
+    "battery": {
+        "states": {
+            "warning": 20,
+            "critical": 5
+        },
+        "format": "{icon}{capacity}%",
+        "format-charging": "{capacity}% 󰂄",
+        "format-plugged": "{capacity}% 󰚥",
+        // "format-alt": "{time} {icon}",
+        "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂁", "󰁹"],
+        "on-click": "~/.config/rofi/applets/bin/ppd.sh"
+    },
+    "battery#bat0": {
+        "bat": "BAT0"
+    },
 
-	"network": {
-		"format-wifi": "{icon}",
-		"format-ethernet": "󰈀",
-		"format-linked": "󰤩",
-		"format-disconnected": "󰤮",
-		"tooltip-format": "{ifname}",
-		"tooltip-format-wifi": "{essid} {signaldBm}dBm | Downlink: {bandwidthDownBits}, Uplink: {bandwidthUpBits}",
-		"tooltip-format-ethernet": "{essid} | Downlink: {bandwidthDownBits}, Uplink: {bandwidthUpBits} | IP: {ipaddr} GW:{gwaddr}",
-		"tooltip-format-disconnected": "Disconnected",
-		"format-icons": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"],
-		"on-click": "~/.config/rofi/applets/bin/rofi-wifi-menu.sh",
-		"on-click-right": "nm-connection-editor"
-	}
+    "backlight": {
+        "format": "{icon}  {percent}%",
+        "format-icons": ["󰃞", "󰃟", "󰃠"]
+    },
+
+    "network": {
+        "format-wifi": "{icon}",
+        "format-ethernet": "󰈀",
+        "format-linked": "󰤩",
+        "format-disconnected": "󰤮",
+        "tooltip-format": "{ifname}",
+        "tooltip-format-wifi": "{essid} {signaldBm}dBm | Downlink: {bandwidthDownBits}, Uplink: {bandwidthUpBits}",
+        "tooltip-format-ethernet": "{essid} | Downlink: {bandwidthDownBits}, Uplink: {bandwidthUpBits} | IP: {ipaddr} GW:{gwaddr}",
+        "tooltip-format-disconnected": "Disconnected",
+        "format-icons": ["󰤯", "󰤟", "󰤢", "󰤥", "󰤨"],
+        "on-click": "~/.config/rofi/applets/bin/rofi-wifi-menu.sh",
+        "on-click-right": "nm-connection-editor"
+    }
 }

waybar/style.css

@@ -1,158 +1,154 @@
 @import 'macchiato.css';
 * {
-  font-family: "Roboto";
-  font-size: 16px;
-  min-width: 15px;
+    font-family: "Roboto";
+    font-size: 16px;
+    min-width: 15px;
 }
 
 window#waybar {
-  background-color: transparent;
+    background-color: transparent;
 }
 
 window#waybar.hidden {
-  opacity: 0.5;
+    opacity: 0.5;
 }
 
 button {
-  box-shadow: inset 0 -3px transparent;
-  border: none;
-  border-radius: 10px;
-  color: @text;
+    box-shadow: inset 0 -3px transparent;
+    border: none;
+    border-radius: 10px;
+    color: @text;
 }
 
 
+#workspaces {
+    background-color: @base; /* Change this to any gray color you want */
+    border-radius: 0px 10px 10px 0px; /* Adjust as needed */
+    padding: 3px 10px;
+    color: @text;
+}
+
 #workspaces button.active { 
-  background-color:  	@blue;
-  border: 1px solid  	@blue;
-  border-radius: 10px;
-  color: @base;
+    background-color:  	@blue;
+    /* border: 1px solid  	@blue; */
+    border-radius: 10px;
+    color: @base;
+}
+
+#workspaces button:hover {
+    background: @crust;
+    color: @text;
+    border-radius: 10px;
 }
 
 #workspaces button.urgent {
-  background-color: @red;
-  border: 1px solid  	@red;
-  border-radius: 10px;
-  color: @base;
+    background-color: @red;
+    border: 1px solid  	@red;
+    border-radius: 10px;
+    color: @base;
 }
 
-#clock,
-#battery{
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 10px; /* Adjust as needed */
-  padding: 3px 10px;
-  color: @text;
+#clock {
+    background-color: @base; /* Change this to any gray color you want */
+    border-radius: 10px; /* Adjust as needed */
+    padding: 3px 10px;
+    color: @text;
 }
 
 #mpd {
-  padding: 0 10px;
-  color: @subtext1;
+    padding: 0 10px;
+    color: @subtext1;
 }
 
 #tray {
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 10px 0px 0px 10px; /* Adjust as needed */
-  padding: 3px 10px;
-  color: @text;
+    background-color: @base; /* Change this to any gray color you want */
+    border-radius: 10px 0px 0px 10px; /* Adjust as needed */
+    padding: 3px 10px;
+    color: @text;
 }
 
 #custom-notification,
 #pulseaudio,
 #network,
 #memory,
+#backlight,
 #bluetooth {
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 0px; /* Adjust as needed */
-  padding: 3px 7px;
-  color: @text;
-  margin: 0px;
+    background-color: @base; /* Change this to any gray color you want */
+    border-radius: 0px; /* Adjust as needed */
+    padding: 3px 3px;
+    color: @text;
+    margin: 0px;
 }
 
-#cpu {
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 0px 10px 10px 0px; /* Adjust as needed */
-  padding: 3px 10px;
-  color: @text;
-  min-width: 80px;
+#pulseaudio {
+    min-width: 110px
 }
-
 #backlight {
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 0px 10px 10px 0px; /* Adjust as needed */
-  padding: 3px 10px;
-  color: @text;
-}
-
-#custom-junkyard {
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 10px 0px 0px 10px; /* Adjust as needed */
-  padding: 3px 10px;
-  color: @text;
-}
-
-#workspaces {
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 0px 10px 10px 0px; /* Adjust as needed */
-  padding: 3px 10px;
-  color: @text;
-}
-
-
-#clock {
-  background-color: @base; /* Change this to any gray color you want */
-  border-radius: 10px;
-  padding: 3px 10px;
-  color: @text;
-}
-
-#group-power {
-  background-color: @base;
-  border-radius: 10px;
-  padding: 3px 5px;
-  margin-left: 3px;
-  color: @text;
+    min-width: 60px
 }
 
+#cpu,
 #battery {
-  background-color: @base; /* Change this to any gray color you want */
-  color: @text;
-  margin-left: 7px;
+      background-color: @base; /* Change this to any gray color you want */
+      border-radius: 0px 10px 10px 0px; /* Adjust as needed */
+      padding: 3px 10px;
+      color: @text;
 }
 
-#battery.charging, #battery.plugged {
-  color: @base;
-  background-color: @teal;
-  border-radius: 10px;
-  padding: 3px 10px;
-}
-
-@keyframes blink {
-  to {
-    background-color: @subtext1;
-    color: @crust;
-  }
+#battery.charging,
+#battery.plugged {
+    color: @base;
+    background-color: @teal;
 }
 
 #battery.critical:not(.charging) {
-  background-color: @red;
-  color: @subtext1;
-  animation-name: blink;
-  animation-duration: 0.5s;
-  animation-timing-function: linear;
-  animation-iteration-count: infinite;
-  animation-direction: alternate;
-  border-radius: 10px;
-  padding: 3px 10px;
+      background-color: @red;
+      color: @subtext1;
+      animation-name: blink;
+      animation-duration: 0.5s;
+      animation-timing-function: linear;
+      animation-iteration-count: infinite;
+      animation-direction: alternate;
+}
+
+#custom-junkyard {
+    background-color: @base; /* Change this to any gray color you want */
+    border-radius: 10px 0px 0px 10px; /* Adjust as needed */
+    padding: 3px 10px;
+    color: @text;
+}
+
+#clock {
+    background-color: @base; /* Change this to any gray color you want */
+    border-radius: 10px;
+    padding: 3px 10px;
+    color: @text;
+}
+
+#group-power {
+    background-color: @base;
+    border-radius: 10px;
+    padding: 3px 5px;
+    margin-left: 3px;
+    color: @text;
+}
+
+@keyframes blink {
+    to {
+        background-color: @subtext1;
+        color: @crust;
+    }
 }
 
 label:focus {
-  background-color: @crust;
+    background-color: @crust;
 }
 
 #tray > .passive {
-  -gtk-icon-effect: dim;
+    -gtk-icon-effect: dim;
 }
 
 #tray > .needs-attention {
-  -gtk-icon-effect: highlight;
-  background-color: @red;
+    -gtk-icon-effect: highlight;
+    background-color: @red;
 }

zsh/zsh_aliases

@@ -1,7 +1,6 @@
 # bash-aliases
 
 # command preferences
-alias sudo="doas"					# less bloated, more secure
 alias cp="cp -i"                                	# confirm before overwriting something
 alias df='df -h'                                	# human-readable sizes
 alias free='free -m'                            	# show sizes in MB
@@ -21,10 +20,10 @@ alias less='less -r' # retain color escapes
 #alias holoware='wine ~/Programs/holoware/Holoware\ v0.2/Holoware.exe'	# Fanmade Wario Ware style game with Hololive characters
 
 # one-liners
-alias bton='doas /etc/init.d/bluetooth start'				# Turn the bluetooth daemon on
-alias btoff='doas /etc/init.d/bluetooth stop'				# Turn the bluetooth daemon off
-alias ani-hist='${EDITOR} "${XDG_CACHE_HOME:-$HOME/.cache}/ani-hsts"'		# Edit the history file of ani-cli
-alias ud="doas dnf upgrade; flatpak update -y;"			# ud for quick update
+alias bton='sudo /etc/init.d/bluetooth start'				# Turn the bluetooth daemon on
+alias btoff='sudo /etc/init.d/bluetooth stop'				# Turn the bluetooth daemon off
+alias ani-hist='${EDITOR} "${XDG_STATE_HOME:-$HOME/.local/state}/ani-cli/ani-hsts"'		# Edit the history file of ani-cli
+alias ud="sudo dnf upgrade; flatpak update -y;"			# ud for quick update
 #alias toolbox='systemctl start iscsid open-iscsi'			# start the iSCSI services 
 cdwork () {
 	lxc list status=running | grep -q quarch || lxc start quarch