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/"
+mkdir -p ~/.local/bin/build_stage/
-git clone https://github.com/rharish101/ReGreet.git "~/.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
+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" && mkdir m4 && autoreconf -i && mkdir build && cd build && ../configure && make && sudo make install 
+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

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,22 +6,6 @@ local autocmd = vim.api.nvim_create_autocmd
 --   command = "tabdo wincmd =",
 -- })
 
-autocmd({ "FileType" }, {
-    callback = function()
-
-        -- check if treesitter has parser
-        if require("nvim-treesitter.parsers").has_parser() then
-
-            -- use treesitter folding
-            vim.opt.foldmethod = "expr"
-            vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
-        else
-
-            -- use alternative foldmethod
-            vim.opt.foldmethod = "syntax"
-        end
-    end,
-})
 
 -- disable folding on startup
 vim.opt.foldenable = false

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
+

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

@@ -27,21 +27,21 @@
         // "scroll-step": 1, // %, can be a float
         //"reverse-scrolling": 1,
         "format": "{icon} {volume}% {format_source}",
-        "format-bluetooth": "{icon}  {volume}% {format_source}",
+        "format-bluetooth": "{icon} {volume}% {format_source}",
-        "format-bluetooth-muted": " {icon} {format_source}",
+        "format-bluetooth-muted": "{icon} {format_source}",
-        "format-muted": "婢 {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"
     },
 
@@ -66,6 +66,7 @@
 
     "tray": {
         "icon-size": 13,
+        "show-passive-items": true,
         "spacing": 00
     },
 
@@ -157,17 +158,22 @@
             "warning": 20,
             "critical": 5
         },
-		"format": "{capacity}% {icon}",
+        "format": "{icon}{capacity}%",
         "format-charging": "{capacity}% 󰂄",
         "format-plugged": "{capacity}% 󰚥",
-		"format-alt": "{time} {icon}",
+        // "format-alt": "{time} {icon}",
         "format-icons": ["󰂎", "󰁺", "󰁻", "󰁼", "󰁽", "󰁾", "󰁿", "󰂀", "󰂁", "󰂁", "󰁹"],
-		"on-click": "~/.config/rofi/applets/bin/powermenu.sh"
+        "on-click": "~/.config/rofi/applets/bin/ppd.sh"
     },
     "battery#bat0": {
         "bat": "BAT0"
     },
 
+    "backlight": {
+        "format": "{icon}  {percent}%",
+        "format-icons": ["󰃞", "󰃟", "󰃠"]
+    },
+
     "network": {
         "format-wifi": "{icon}",
         "format-ethernet": "󰈀",

waybar/style.css

@@ -21,13 +21,26 @@ button {
 }
 
 
+#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: 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;
@@ -35,8 +48,7 @@ button {
     color: @base;
 }
 
-#clock,
+#clock {
-#battery{
     background-color: @base; /* Change this to any gray color you want */
     border-radius: 10px; /* Adjust as needed */
     padding: 3px 10px;
@@ -59,29 +71,46 @@ button {
 #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;
+    padding: 3px 3px;
     color: @text;
     margin: 0px;
 }
 
-#cpu {
+#pulseaudio {
-  background-color: @base; /* Change this to any gray color you want */
+    min-width: 110px
-  border-radius: 0px 10px 10px 0px; /* Adjust as needed */
+}
-  padding: 3px 10px;
+#backlight {
-  color: @text;
+    min-width: 60px
-  min-width: 80px;
 }
 
-#backlight {
+#cpu,
+#battery {
       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;
+}
+
+#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;
+}
+
 #custom-junkyard {
     background-color: @base; /* Change this to any gray color you want */
     border-radius: 10px 0px 0px 10px; /* Adjust as needed */
@@ -89,14 +118,6 @@ button {
     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;
@@ -112,19 +133,6 @@ button {
     color: @text;
 }
 
-#battery {
-  background-color: @base; /* Change this to any gray color you want */
-  color: @text;
-  margin-left: 7px;
-}
-
-#battery.charging, #battery.plugged {
-  color: @base;
-  background-color: @teal;
-  border-radius: 10px;
-  padding: 3px 10px;
-}
-
 @keyframes blink {
     to {
         background-color: @subtext1;
@@ -132,18 +140,6 @@ button {
     }
 }
 
-#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;
-}
-
 label:focus {
     background-color: @crust;
 }

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 bton='sudo /etc/init.d/bluetooth start'				# Turn the bluetooth daemon on
-alias btoff='doas /etc/init.d/bluetooth stop'				# Turn the bluetooth daemon off
+alias btoff='sudo /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 ani-hist='${EDITOR} "${XDG_STATE_HOME:-$HOME/.local/state}/ani-cli/ani-hsts"'		# Edit the history file of ani-cli
-alias ud="doas dnf upgrade; flatpak update -y;"			# ud for quick update
+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