Merge remote-tracking branch 'origin/main'

common/bash/rc

@@ -9,3 +9,5 @@ command -v fish >/dev/null 2>&1 && grep fish /etc/shells >/dev/null 2>&1 && {
 	echo "  If you're in bash intentionally for some reason, then ignore this message."
 }
 . "$HOME/.cargo/env"
+
+source /home/daniel/.home/.config/broot/launcher/bash/br

common/bin/dotfiles-setup

@@ -51,6 +51,7 @@ l common/scim/lua $h/.scim/lua
 l common/nnn $c/nnn
 l common/kak $c/kak
 l common/helix $c/helix
+l common/gitui $c/gitui
 l common/gpg/agent.conf $h/.gnupg/gpg-agent.conf
 chmod og-rwx ~/.gnupg
 l common/htop/rc $c/htop/htoprc
@@ -62,6 +63,7 @@ l common/git/config $h/.gitconfig
 l common/elixir/iex.exs $h/.iex.exs
 l common/blender/userpref.blend $c/blender/2.93/config/userpref.blend
 l common/lemonade/config.toml $c/lemonade.toml
+l common/tig/rc $h/.tigrc
 popd
 
 for s in $c/lytedev-env/*/dotfiles-setup.d.fish

common/fish/functions.fish

@@ -18,6 +18,10 @@ if has_command exa
 	alias lD 'la --only-dirs'
 end
 
+if has_command rm-improved
+	alias rm rm-improved
+end
+
 function scount --wraps=count --description "Silent count exits with a non-zero status if no arguments given to count"
 	count $argv > /dev/null
 end
@@ -195,6 +199,10 @@ function __ssh_agent_start -d "start a new ssh agent"
    true  # suppress errors from setenv, i.e. set -gx
 end
 
+if set --query KITTY_PID
+	alias ssh "kitty +kitten ssh"
+end
+
 function fish_ssh_agent --description "Start ssh-agent if not started yet, or uses already started ssh-agent."
    if test -z "$SSH_ENV"
       set -xg SSH_ENV $HOME/.ssh/environment

common/gitui/mocha.ron

@@ -0,0 +1,23 @@
+(
+    selected_tab: Reset,
+    command_fg: Rgb(205, 214, 244),
+    selection_bg: Rgb(88, 91, 112),
+    selection_fg: Rgb(205, 214, 244),
+    cmdbar_bg: Rgb(24, 24, 37),
+    cmdbar_extra_lines_bg: Rgb(24, 24, 37),
+    disabled_fg: Rgb(127, 132, 156),
+    diff_line_add: Rgb(166, 227, 161),
+    diff_line_delete: Rgb(243, 139, 168),
+    diff_file_added: Rgb(249, 226, 175),
+    diff_file_removed: Rgb(235, 160, 172),
+    diff_file_moved: Rgb(203, 166, 247),
+    diff_file_modified: Rgb(250, 179, 135),
+    commit_hash: Rgb(180, 190, 254),
+    commit_time: Rgb(186, 194, 222),
+    commit_author: Rgb(116, 199, 236),
+    danger_fg: Rgb(243, 139, 168),
+    push_gauge_bg: Rgb(137, 180, 250),
+    push_gauge_fg: Rgb(30, 30, 46),
+    tag_fg: Rgb(245, 224, 220),
+    branch_fg: Rgb(148, 226, 213)
+)

common/gitui/theme.ron

@@ -0,0 +1,23 @@
+(
+    selected_tab: Reset,
+    command_fg: Rgb(205, 214, 244),
+    selection_bg: Rgb(88, 91, 112),
+    selection_fg: Rgb(205, 214, 244),
+    cmdbar_bg: Rgb(24, 24, 37),
+    cmdbar_extra_lines_bg: Rgb(24, 24, 37),
+    disabled_fg: Rgb(127, 132, 156),
+    diff_line_add: Rgb(166, 227, 161),
+    diff_line_delete: Rgb(243, 139, 168),
+    diff_file_added: Rgb(249, 226, 175),
+    diff_file_removed: Rgb(235, 160, 172),
+    diff_file_moved: Rgb(203, 166, 247),
+    diff_file_modified: Rgb(250, 179, 135),
+    commit_hash: Rgb(180, 190, 254),
+    commit_time: Rgb(186, 194, 222),
+    commit_author: Rgb(116, 199, 236),
+    danger_fg: Rgb(243, 139, 168),
+    push_gauge_bg: Rgb(137, 180, 250),
+    push_gauge_fg: Rgb(30, 30, 46),
+    tag_fg: Rgb(245, 224, 220),
+    branch_fg: Rgb(148, 226, 213)
+)

common/tig/rc

@@ -0,0 +1,5 @@
+set git-colors = no
+
+color cursor default black
+color title-blur default black
+color title-focus default black

os/linux/arch/provision.d/20-install-packages.bash

@@ -7,14 +7,10 @@
 # 	sudo sh -c 'echo -e "\n\n[multilib]\nInclude = /etc/pacman.d/mirrorlist" >> /etc/pacman.conf'
 # fi
 
-paru -Sy --needed --noconfirm \
+pacman -Sy --needed --noconfirm \
 	watchexec `# Filesystem Event Wacher` \
 	fwupd `# Firmware Update Manager` \
-	ncdu `# Disk Usage Analyzer` \
 	efibootmgr efivar `# UEFI Boot CLI Stuff` \
-	weechat `# IRC Client` \
-	aria2 `# Downloads Manager` \
-	wezterm `# Terminal` \
 	tailscale `# VPN` \
 	ripgrep `# Code Search Utilities` \
 	git-delta `# Better Diff Viewer` \
@@ -26,19 +22,12 @@ paru -Sy --needed --noconfirm \
 	htop bottom `# Process Management and System Resources Monitoring` \
 	openssh mosh `# Remote Access` \
 	openssl `# Crypto` \
-	rtx-bin `# Version Manager` \
-	oath-toolkit `# TOTP Utility` \
-	pass pass-otp `# Password Management` \
-	sc-im `# Spreadsheets` \
-	cloc `# For counting lines of code` \
-	pigz `# Multicore Compression Utility` \
 	hexyl `# CLI Hex Viewer` \
 	rsync rclone `# File Transfer` \
 	helix `# Text Editors` \
 	unzip `# Simple Unzipping` \
 	zellij `# Terminal Multiplexer` \
-	nmap traceroute iputils `# Networking Utilities` \
+	dog bind nmap traceroute iputils `# Networking Utilities` \
-	kitty-terminfo `# Better Terminal Emulator` \
 	curl wget xh `# HTTP Utilities` \
 	w3m `# Web Browser` \
 	jq gron `# JSON Utilities` \
@@ -46,11 +35,14 @@ paru -Sy --needed --noconfirm \
 	inotify-tools `# Filesystem Watching` \
 	fish `# Shell` \
 	time `# GNU Time` \
-	fortune-mod fortune-mod-archlinux `# Fortune` \
+	fortune-mod `# Fortune` \
 	sysstat `# System Statistics` \
 	reflector `# Simple Pacman Mirror Management` \
 	gnu-netcat socat websocat `# Socket Utilities` \
 	nnn `# CLI File Manager` \
 	avahi	nss-mdns `# mDNS and Network Discovery Utilities` \
 	git git-lfs `# Version Control` \
+	dua-cli `# Disk Usage Abalyzer` \
 	man-db man-pages `# Come On, Man!`
+
+# TODO: if paru? rtx-bin

os/linux/arch/provision.d/70-optional-packages.bash

@@ -11,3 +11,16 @@ yn() {
 }
 
 yn "Do you want to install UI packages?" && "$dir/optional/ui-packages.bash"
+
+paru -Sy --needed --noconfirm \
+	weechat `# IRC Client` \
+	rtx-bin `# Version Manager` \
+	bluetuith-bin `# Disk Usage Analyzer` \
+	aria2 `# Downloads Manager` \
+	oath-toolkit `# TOTP Utility` \
+	pass pass-otp `# Password Management` \
+	sc-im `# Spreadsheets` \
+	cloc `# For counting lines of code` \
+	gitui `# Git TUI` \
+	tokei `# Counting Lines of Code (cloc alternative)` \
+	pigz `# Multicore Compression Utility` \

os/linux/arch/provision.d/optional/ui-packages.bash

@@ -28,7 +28,6 @@ paru -Sy --needed \
 	hunspell-en_US `# Firefox Spell Checking` \
 	passff-host `# pass integration in Firefox` \
 	kitty `# Terminal Emulator` \
-	wezterm `# Terminal Emulator` \
 	pulsemixer pavucontrol pamixer libpulse `# Pulseaudio Controls` \
 	playerctl `# Media Keys Controls` \
 	feh `# Image Viewer` \
@@ -40,5 +39,17 @@ paru -Sy --needed \
 	slurp grim wl-clipboard `# Screenshots and Clipboard Utilities` \
 	pipewire pipewire-pulse wireplumber `# Audio` \
 	xdg-desktop-portal xdg-desktop-portal-wlr `# Screensharing` \
-	obs-studio `# Live Streaming` \
+	obs-studio `# Live Streaming`
-	eww-wayland `# Bar & Widgets`
+
+# eww-wayland `# Bar & Widgets`
+# stopped using eww since it didn't _easily_ support wayland workspaces
+# laziness!
+
+# stopped using hyprland due to some weird glitchy stuff that would occasionally
+# start happening where keypresses would get doubled
+# I don't think I filed an issue
+
+# wezterm `# Terminal Emulator` \
+# stopped using wezterm due to issues with splits plus daemon sessions
+# https://github.com/wez/wezterm/issues/3771
+# there may have been other issues? not sure