Various minor updates and fixes

- add ~/.gitconfig
  - update hardcoded home directory links to `~`
  - Switch to using cargo/rustup's auto-generated fish config file instead of handling it in custom.fish

backup.sh

@@ -106,3 +106,6 @@ fi
 
 # Wezterm
 cp ~/.wezterm.lua $GIT_DIR/wezterm.lua
+
+# Git config
+cp ~/.gitconfig $GIT_DIR/gitconfig

claws-mail/matcherrc

@@ -48,7 +48,7 @@ enabled rulename "Move more YouTube comments to low-priority" subject matchcase
 enabled rulename "Move Windscribe to spam and mark as read" from matchcase "noreply@windscribe.com" mark_as_read move "#mh/Mailbox/Spam"
 enabled rulename "Move GeeksforGeeks to spam and mark as read" from matchcase "no-reply@geeksforgeeks.org" mark_as_read move "#mh/Mailbox/Spam"
 enabled rulename "Move Tallo to spam and mark as read" from regexp ".*@tallo.com" mark_as_read move "#mh/Mailbox/Spam"
-enabled rulename "Run gpg-email-helper" test "grep -- \"-----BEGIN PGP SIGNATURE-----\" %F" execute "python3 /home/askiiart/gpg-email-helper/gpg-email-helper.py %F"
+enabled rulename "Run gpg-email-helper" test "grep -- \"-----BEGIN PGP SIGNATURE-----\" %F" execute "python3 ~/gpg-email-helper/gpg-email-helper.py %F"
 enabled rulename "Move Microsoft sign-ins to low-priority" from matchcase "account-security-noreply@accountprotection.microsoft.com" & subject matchcase "New sign-in detected" move "#mh/Mailbox/Low-priority"
 enabled rulename "Move GasBuddy to spam and mark as read" from regexpcase ".*@email.gasbuddy.com" mark_as_read move "#mh/Mailbox/Spam"
 enabled rulename "Move ScholarshipOwl to spam and mark as read" from regexpcase ".*@scholarshipowl.com" mark_as_read move "#mh/Mailbox/Spam"

fish/conf.d/custom.fish

@@ -1,6 +1,6 @@
 if status is-interactive
-    set -gx PATH $PATH ~/.cargo/bin/
     set -gx PATH $PATH /opt/clang-format-static
+    set -gx PATH $PATH ~/.local/bin/
     set -x GPG_TTY (tty)
     set -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
     set -x EDITOR nvim

i3/config

@@ -189,4 +189,5 @@ bar {
         status_command i3status
 }
 
-include /home/askiiart/.config/i3/config.d/*.conf
+# wait does this even work??? i thought i3 didn't support this...
+include ~/.config/i3/config.d/*.conf

other-files/lid-close/laptop-lid

@@ -1,2 +1,2 @@
 event=button/lid.*
-action=/home/askiiart/.config/i3/config.d/lid-close.sh
+action=~/.config/i3/config.d/lid-close.sh

restore.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-shopt -s extglob # i don't even know what still uses this, if anything, but whatever... i think it's line 12? (commit b8ad9ef339)
+shopt -s extglob  # used for not copying config.fish if it's nixos
 GIT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 
 command_exists() { type "$1" &>/dev/null; }
@@ -74,7 +74,7 @@ gsettings set org.gnome.desktop.interface gtk-theme Adwaita-dark
 # fix-gamepad.service
 if ! command_exists "nixos-rebuild" && command_exists "systemctl"; then
     sudo cp $GIT_DIR/systemd/fix-gamepad.service /etc/systemd/system/
-    sudo systemctl enable --now fix-gamepad.service
+    #sudo systemctl enable --now fix-gamepad.service
 fi
 
 # fontconfig
@@ -116,6 +116,9 @@ wezterm shell-completion --shell fish > ~/.config/fish/completions/wezterm.fish
 cp $GIT_DIR/wezterm.lua ~/.wezterm.lua
 gsettings set org.cinnamon.desktop.default-applications.terminal exec wezterm-gui
 
+# Git config
+cp $GIT_DIR/gitconfig ~/.gitconfig
+
 # VS code
 mkdir -p $HOME/.config/Code/User/
 mkdir -p $HOME/.vscode/

sway/config

@@ -25,7 +25,7 @@ for_window [window_role="pop-up"] floating enable
 for_window [window_role="task_dialog"] floating enable
 
 # shutdown / restart / suspend...
-set $lockwall "swaylock -i ~/.config/sway/backgrounds/widthxheight.png"
+set $lockwall "swaylock -i ~/.config/sway/backgrounds/2560x1440.png"
 set $mode_system System (l) lock, (e) logout, (r) reboot, (s) shutdown, (u) suspend
 
 mode "$mode_system" {

sway/config.d/lid-close

@@ -1,2 +1,2 @@
-bindswitch --reload --locked lid:on exec --no-startup-id /home/askiiart/.config/sway/lid-close.sh
+bindswitch --reload --locked lid:on exec --no-startup-id ~/.config/sway/lid-close.sh
 bindswitch --reload --locked lid:off output eDP-1 dpms on

sway/config.d/misc

@@ -75,3 +75,5 @@ bindsym Mod4+Mod1+Left exec "pactl set-sink-volume @DEFAULT_SINK@ -2%"
 exec "command_exists() { type '$1' &>/dev/null; }; if command_exists 'xbps-install'; then pipewire; fi"
 
 exec "kanshi"
+
+bindsym Mod4+Shift+N exec "pkill -9 swaync; swaync"

sway/config.d/outputs

@@ -2,4 +2,4 @@ output "Acer Technologies EK271U E 14160766B3W01" mode 2560x1440@100hz adaptive_
 output "Hewlett Packard HP ZR22w CN41250H24" transform 270
 output "AU Optronics 0x463D" mode 1920x1080@60hz
 
-output * bg ~/bg-generation/logo.png center #1E1E2E
+output * bg ~/.config/sway/backgrounds/logo.png center #1E1E2E

vesktop/settings.json

@@ -1,7 +1,7 @@
 {
-    "minimizeToTray": "on",
+    "minimizeToTray": true,
     "discordBranch": "stable",
-    "arRPC": "on",
+    "arRPC": true,
     "splashColor": "oklab(0.899401 -0.00192499 -0.00481987)",
     "splashBackground": "rgb(0, 7, 32)",
     "spellCheckLanguages": [

vscode/extensions.txt

@@ -41,6 +41,7 @@ joelcrosby.one-dark-darker
 jscearcy.rust-doc-viewer
 kisstkondoros.vscode-gutter-preview
 kokoscript.loopytheme
+l13rary.l13-diff
 lacroixdavid1.vscode-format-context-menu
 laurenclark.sappho
 lorettadevs.loretta-lua
@@ -112,7 +113,6 @@ usernamehw.errorlens
 vinaykumar.vice
 visualstudioexptteam.intellicode-api-usage-examples
 visualstudioexptteam.vscodeintellicode
-vsciot-vscode.vscode-arduino
 vscjava.vscode-gradle
 vscjava.vscode-java-debug
 vscjava.vscode-java-dependency

waybar/config

@@ -8,7 +8,8 @@
     "modules-left": [
         "sway/workspaces",
         "sway/mode",
-        "sway/scratchpad"
+        "sway/scratchpad",
+        "custom/polycat"
     ],
     "modules-right": [
         "pulseaudio",
@@ -38,6 +39,10 @@
     //         "default": ""
     //     }
     },
+    "custom/polycat": {
+        "exec": "polycat",
+        "restart-interval": 0
+    },
     "keyboard-state": {
         "numlock": true,
         "capslock": true,