From c6ab37d7d59b7c1d6f7df76573e0ccb44a4b3088 Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Mon, 16 Oct 2023 21:28:11 -0400
Subject: [PATCH] setup: clean up readability and clean some packages

---
 Kvantum/kvantum.kvconfig                      |  2 +-
 archpkgs                                      | 38 ++++-----------
 bin/clean                                     |  1 +
 bin/nse                                       |  2 +-
 bin/optiall                                   |  2 +-
 bin/setup                                     | 48 +++++++++----------
 ...solus-project.toml => :com:solus-project:} | 25 ++++++++--
 ...oml => :org:gnome:desktop:wm:keybindings:} |  0
 ...gs.toml => :org:gnome:mutter:keybindings:} |  0
 ...gnome:settings-daemon:plugins:media-keys:} |  0
 git/config.toml                               |  1 -
 11 files changed, 56 insertions(+), 63 deletions(-)
 rename dconf/{com.solus-project.toml => :com:solus-project:} (72%)
 rename dconf/{org.gnome.desktop.wm.keybindings.toml => :org:gnome:desktop:wm:keybindings:} (100%)
 rename dconf/{org.gnome.mutter.keybindings.toml => :org:gnome:mutter:keybindings:} (100%)
 rename dconf/{org.gnome.settings-daemon.plugins.media-keys.toml => :org:gnome:settings-daemon:plugins:media-keys:} (100%)
 delete mode 120000 git/config.toml

diff --git a/Kvantum/kvantum.kvconfig b/Kvantum/kvantum.kvconfig
index 2171a8d..48238bd 100644
--- a/Kvantum/kvantum.kvconfig
+++ b/Kvantum/kvantum.kvconfig
@@ -1,2 +1,2 @@
 [General]
-theme=Dracula-purple-solid
+theme=Dracula-Solid
diff --git a/archpkgs b/archpkgs
index fd39afd..358e4c6 100644
--- a/archpkgs
+++ b/archpkgs
@@ -1,13 +1,13 @@
 advancecomp
-android-tools
+alhp-keyring
+alhp-mirrorlist
+android-file-transfer
 anime4k
 apparmor
 arch-install-scripts
 aria2
 asciinema
-audacious
 autojump
-avidemux-qt
 base
 base-devel
 bat
@@ -25,7 +25,6 @@ chaotic-mirrorlist
 cmake
 cpupower
 dart-sass
-debootstrap
 dolphin-emu
 dracula-gtk-theme-git
 dracula-kde-theme-git
@@ -34,13 +33,9 @@ expac
 fd
 fish
 flyctl-bin
-fq
 fzf
 gallery-dl
 game-devices-udev
-gamemode
-gdb
-ghex
 gifsicle
 git
 gitui
@@ -49,8 +44,6 @@ gnome-keyring
 gnome-online-accounts
 gnome-power-manager
 gnome-system-monitor
-gvfs-gphoto2
-gvfs-mtp
 hblock
 htop
 httrack
@@ -60,7 +53,6 @@ innoextract
 intel-media-driver
 intel-ucode
 inxi
-iwd
 jack2
 jdupes
 jless
@@ -70,29 +62,27 @@ keepassxc
 kitty
 kvantum
 lagrange
-libimobiledevice
+libheif
 libplist
 libpulse
 libusbmuxd
 libva-intel-driver
-libva-mesa-driver
 linux-firmware
 linux-hardened
 lrzip
+lxqt-archiver
 ly
 lynx
-man-db
 man-pages
+mandoc
 megatools
 meld
 moreutils
-mpv
 mpv-mpris
 msitools
 mupdf-tools
 musikcube
 ncdu
-nemo-fileroller
 neovim
 netsurf
 network-manager-applet
@@ -101,18 +91,18 @@ nicotine+
 ninja
 nnn
 noto-fonts-emoji
-nsz
 opendoas
 opus-tools
 oxipng
 p7zip
 parallel
+pcmanfm-qt
 perl-parallel-forkmanager
-pgbouncer
 php
 picocom
 pipewire
 pngquant
+poppler
 power-profiles-daemon
 powertop
 pulseaudio
@@ -125,9 +115,7 @@ python-adblock
 python-html2text
 python-pip
 python-pipx
-python-pyusb
 python-readability-lxml
-python-tqdm
 qpdf
 qrencode
 qt5-base
@@ -140,9 +128,7 @@ rsync
 signal-desktop
 smartmontools
 sof-firmware
-sof-tools
 squashfs-tools
-squashfuse
 starship
 stlink
 stow
@@ -151,7 +137,6 @@ sxiv
 syncthing
 system-config-printer
 tig
-tk
 torsocks
 ttf-arphic-ukai
 ttf-dejavu
@@ -159,24 +144,17 @@ ttf-ubuntu-font-family
 tuc
 upx
 usbutils
-valgrind
 vulkan-intel
 vulkan-radeon
 w3m
 webp-pixbuf-loader
 wget
 wimlib
-wireless_tools
-wit
-xdg-user-dirs
 xdg-utils
-xdotool
 xf86-input-evdev
 xf86-input-libinput
 xorg-server
-xorg-xev
 xorg-xinit
-xournalpp
 xsel
 yay
 yt-dlp
diff --git a/bin/clean b/bin/clean
index 4804eed..76e1586 100755
--- a/bin/clean
+++ b/bin/clean
@@ -1,4 +1,5 @@
 #!/bin/sh
+#shellcheck disable=SC2046
 yay -Scc
 fc-cache -frvs
 rm -r ~/.cache ~/.wine ~/.local/pipx/.cache/
diff --git a/bin/nse b/bin/nse
index c535c62..e237877 100755
--- a/bin/nse
+++ b/bin/nse
@@ -9,5 +9,5 @@ fd -e xhtml . "$d" -x mv {} '{.}'.html
 if test -z "$BROWSER"; then
     BROWSER=netsurf 
 fi
-eval $BROWSER "$(dirname "$t")"/index.html
+eval "$BROWSER" "$(dirname "$t")"/index.html
 rm -rf "$d"
diff --git a/bin/optiall b/bin/optiall
index 966662e..f036dea 100755
--- a/bin/optiall
+++ b/bin/optiall
@@ -7,6 +7,6 @@ fd -e webp -x cwebp -z 9 -mt {} -o {}
 fd -t f -x advzip -z3
 fd -t f -x advdef -z3
 
-fd -e mp3 -x mp3packer \; -x mv {.}-vbr.mp3 {}
+fd -e mp3 -x mp3packer \; -x mv '{.}'-vbr.mp3 {}
 
 fd -e so -x strip
diff --git a/bin/setup b/bin/setup
index b8b3917..1fba5ea 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,46 +1,46 @@
 #!/bin/sh
-# shellcheck disable=SC2086
 set -e
 alias s=sudo g=git
 
-s pacman -Syu
-s pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
+printf '[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist\n' | s tee -a /etc/pacman.conf
+s pacman-key  --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com
 s pacman-key --lsign-key 3056513887B78AEB
 s pacman -U 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst'
-printf '[chaotic-aur]\nInclude = /etc/pacman.d/chaotic-mirrorlist\n' | sudo tee -a /etc/pacman.conf
 s pacman -Syu
-s pacman -S $(cat ~/.dotfiles/archpkgs)
-yay -S dwarfs-git gurk-bin pandoc-bin proot shellcheck-bin spek
-
-stow --no-folding -d ~/.dotfiles -t ~/.config .
-mkdir -p ~/.parallel/will-cite
-
-wget https://github.com/dracula/rofi/raw/main/theme/config2.rasi -P ~/.config/rofi
-wget https://github.com/dracula/kitty/raw/master/dracula.conf -P ~/.config/kitty
-wget https://github.com/dracula/musikcube/raw/main/dracula.json -P ~/.config/musikcube/themes
-
-wget https://github.com/mrzool/bash-sensible/raw/master/sensible.bash -O ~/.bashrc
-wget https://github.com/savq/paq-nvim/raw/master/lua/paq.lua -P ~/.config/nvim/lua
-wget https://source.netsurf-browser.org/netsurf.git/plain/resources/adblock.css\
-    https://nitter.net/css/themes/dracula.css -P ~/.config/qutebrowser
-
+xargs -o sudo pacman -S --needed < ~/.dotfiles/archpkgs
+yay -S pandoc-bin shellcheck-bin
 chsh -s "$(which fish)"
-fish -c "aliases"
 
+echo kernel.core_pattern=/dev/null | s tee -a /etc/sysctl.d/50-coredump.conf
 echo options i915 enable_rc6=1 enable_fbc=1 lvds_downclock=1 enable__psr=1 | s tee -a /etc/modprobe.d/i915.conf
 echo options lsm=landlock,lockdown,yama,integrity,apparmor,bpf | s tee -a /boot/loader/entries/*.conf
-echo kernel.core_pattern=/dev/null | s tee -a /etc/sysctl.d/50-coredump.conf
+
+stow --no-folding -d ~/.dotfiles -t ~/.config .
+fish -c "aliases"
+
+wget https://github.com/dracula/kitty/raw/master/dracula.conf -P ~/.config/kitty
+wget https://github.com/dracula/musikcube/raw/main/dracula.json -P ~/.config/musikcube/themes
+wget https://github.com/dracula/rofi/raw/main/theme/config2.rasi -P ~/.config/rofi
+wget https://github.com/zedeus/nitter/raw/master/public/css/themes/dracula.css -P ~/.config/qutebrowser
+
+wget https://github.com/mrzool/bash-sensible/raw/master/sensible.bash -O ~/.bashrc
+wget https://source.netsurf-browser.org/netsurf.git/plain/resources/adblock.css -P ~/.config/qutebrowser
+
+wget https://github.com/savq/paq-nvim/raw/master/lua/paq.lua -P ~/.config/nvim/lua
+nvim +PaqInstall +q
 
 g g p:appdwarf ~/.appdwarf
 g g p:phantop.github.io ~/.site
 g g p:haiku-icons ~/.local/share/icons/Haiku
-nvim +PaqInstall +q
 
+mkdir -p ~/.parallel/will-cite
 parallel gsettings set org.gnome.desktop.interface {}-theme Haiku ::: cursor icon
+
 gsettings set org.gnome.desktop.interface gtk-theme Dracula
 gsettings set org.gnome.desktop.peripherals.touchpad disable-while-typing false
 
 for i in ~/.dotfiles/dconf/*; do
-    dconf reset -f "$(basename $i | sed 's/^/./;s#\.#/#g;s#.toml#/#')"
-    dconf load "$(basename $i | sed 's/^/./;s#\.#/#g;s#.toml#/#')" < "$i"
+    dconf reset -f "$(basename "$i" | tr : /)"
+    #shellcheck disable=SC2094
+    dconf load "$(basename "$i" | tr : /)" < "$i"
 done
diff --git a/dconf/com.solus-project.toml b/dconf/:com:solus-project:
similarity index 72%
rename from dconf/com.solus-project.toml
rename to dconf/:com:solus-project:
index f749a7b..7bd0aac 100644
--- a/dconf/com.solus-project.toml
+++ b/dconf/:com:solus-project:
@@ -1,5 +1,5 @@
 [budgie-panel]
-builtin-theme=false
+builtin-theme=true
 confirm-remove-applet=false
 dark-theme=true
 migration-level=1
@@ -30,11 +30,18 @@ alignment='start'
 name='Status Indicator'
 position=2
 
-[budgie-panel/applets/{c2dc2d46-57ab-11ed-b143-a864f1bbee5f}]
+[budgie-panel/applets/{cffbc7b0-6a9d-11ee-a69b-a864f1bbee5f}]
 alignment='start'
-name='User Indicator'
+name='Budgie Menu'
 position=4
 
+[budgie-panel/instance/budgie-menu/{cffbc7b0-6a9d-11ee-a69b-a864f1bbee5f}]
+menu-categories-hover=false
+menu-compact=true
+menu-headers=false
+menu-show-control-center-items=true
+use-default-menu-icon=true
+
 [budgie-panel/instance/status/{bee913aa-8256-11ec-83c0-a864f1bbee5f}]
 spacing=0
 
@@ -49,12 +56,13 @@ addbutton-visibility='always'
 item-size-multiplier='1.0'
 
 [budgie-panel/panels/{9bab0f82-7375-11ec-bbff-a864f1bbee5f}]
-applets=['bee913aa-8256-11ec-83c0-a864f1bbee5f', 'c2dc2d46-57ab-11ed-b143-a864f1bbee5f', '9be4a0da-7375-11ec-bbff-a864f1bbee5f', '8e4a9598-7edc-11ec-93a3-a864f1bbee5f', '7e3fdf9e-2f87-11ed-8771-a864f1bbee5f']
+applets=['bee913aa-8256-11ec-83c0-a864f1bbee5f', 'cffbc7b0-6a9d-11ee-a69b-a864f1bbee5f', '9be4a0da-7375-11ec-bbff-a864f1bbee5f', '8e4a9598-7edc-11ec-93a3-a864f1bbee5f', '7e3fdf9e-2f87-11ed-8771-a864f1bbee5f']
 autohide='intelligent'
 dock-mode=true
-enable-shadow=true
+enable-shadow=false
 location='top'
 size=22
+spacing=0
 theme-regions=false
 transparency='none'
 
@@ -64,6 +72,9 @@ show-calendar-widget=false
 show-power-strip=true
 
 [budgie-wm]
+button-layout='appmenu:minimize,maximize,close'
+caffeine-mode=false
+center-windows=false
 clear-notifications=['<Shift><Super>c']
 toggle-notifications=@as []
 
@@ -74,3 +85,7 @@ use-custom-format=true
 [software-center]
 check-updates=false
 fetch-media=false
+
+[tray/{7e3fdf9e-2f87-11ed-8771-a864f1bbee5f}]
+scaling=true
+spacing=0
diff --git a/dconf/org.gnome.desktop.wm.keybindings.toml b/dconf/:org:gnome:desktop:wm:keybindings:
similarity index 100%
rename from dconf/org.gnome.desktop.wm.keybindings.toml
rename to dconf/:org:gnome:desktop:wm:keybindings:
diff --git a/dconf/org.gnome.mutter.keybindings.toml b/dconf/:org:gnome:mutter:keybindings:
similarity index 100%
rename from dconf/org.gnome.mutter.keybindings.toml
rename to dconf/:org:gnome:mutter:keybindings:
diff --git a/dconf/org.gnome.settings-daemon.plugins.media-keys.toml b/dconf/:org:gnome:settings-daemon:plugins:media-keys:
similarity index 100%
rename from dconf/org.gnome.settings-daemon.plugins.media-keys.toml
rename to dconf/:org:gnome:settings-daemon:plugins:media-keys:
diff --git a/git/config.toml b/git/config.toml
deleted file mode 120000
index 30fa1ce..0000000
--- a/git/config.toml
+++ /dev/null
@@ -1 +0,0 @@
-config
\ No newline at end of file