From e0f5b6278244cda2e82fefc0fe259116cfd89da2 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Thu, 6 Jul 2023 11:41:19 -0500 Subject: [PATCH 1/3] Add some neat new tools --- common/bash/rc | 2 ++ common/bin/dotfiles-setup | 1 + common/fish/functions.fish | 4 ++++ common/gitui/mocha.ron | 23 +++++++++++++++++++ common/gitui/theme.ron | 23 +++++++++++++++++++ .../arch/provision.d/20-install-packages.bash | 20 +++++----------- .../provision.d/70-optional-packages.bash | 12 ++++++++++ .../provision.d/optional/ui-packages.bash | 17 +++++++++++--- 8 files changed, 85 insertions(+), 17 deletions(-) create mode 100644 common/gitui/mocha.ron create mode 100644 common/gitui/theme.ron diff --git a/common/bash/rc b/common/bash/rc index 34f4e2c..d96315f 100644 --- a/common/bash/rc +++ b/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 diff --git a/common/bin/dotfiles-setup b/common/bin/dotfiles-setup index 1a11c79..1e5affa 100755 --- a/common/bin/dotfiles-setup +++ b/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 diff --git a/common/fish/functions.fish b/common/fish/functions.fish index 4290d50..9d25f83 100644 --- a/common/fish/functions.fish +++ b/common/fish/functions.fish @@ -195,6 +195,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 diff --git a/common/gitui/mocha.ron b/common/gitui/mocha.ron new file mode 100644 index 0000000..1826dcf --- /dev/null +++ b/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) +) diff --git a/common/gitui/theme.ron b/common/gitui/theme.ron new file mode 100644 index 0000000..1826dcf --- /dev/null +++ b/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) +) diff --git a/os/linux/arch/provision.d/20-install-packages.bash b/os/linux/arch/provision.d/20-install-packages.bash index 3d18719..37ae19d 100755 --- a/os/linux/arch/provision.d/20-install-packages.bash +++ b/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` \ - kitty-terminfo `# Better Terminal Emulator` \ + dog bind nmap traceroute iputils `# Networking Utilities` \ curl wget xh `# HTTP Utilities` \ w3m `# Web Browser` \ jq gron `# JSON Utilities` \ @@ -46,10 +35,13 @@ 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` \ + dua-cli `# Disj Usage Abalyzer` \ man-db man-pages `# Come On, Man!` + +# TODO: if paru? rtx-bin diff --git a/os/linux/arch/provision.d/70-optional-packages.bash b/os/linux/arch/provision.d/70-optional-packages.bash index 8610cfd..d32c7e2 100755 --- a/os/linux/arch/provision.d/70-optional-packages.bash +++ b/os/linux/arch/provision.d/70-optional-packages.bash @@ -11,3 +11,15 @@ 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 `# 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` \ + pigz `# Multicore Compression Utility` \ diff --git a/os/linux/arch/provision.d/optional/ui-packages.bash b/os/linux/arch/provision.d/optional/ui-packages.bash index da25832..261f900 100755 --- a/os/linux/arch/provision.d/optional/ui-packages.bash +++ b/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` \ - eww-wayland `# Bar & Widgets` \ No newline at end of file + obs-studio `# Live Streaming` + +# 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 From 48976e78ce8c1351a430443b315919f387d0721f Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 7 Jul 2023 12:35:53 -0500 Subject: [PATCH 2/3] Stuff --- common/bin/dotfiles-setup | 1 + common/fish/functions.fish | 4 ++++ common/tig/rc | 5 +++++ os/linux/arch/provision.d/70-optional-packages.bash | 1 + 4 files changed, 11 insertions(+) create mode 100644 common/tig/rc diff --git a/common/bin/dotfiles-setup b/common/bin/dotfiles-setup index 1e5affa..2d95a9b 100755 --- a/common/bin/dotfiles-setup +++ b/common/bin/dotfiles-setup @@ -63,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 diff --git a/common/fish/functions.fish b/common/fish/functions.fish index 9d25f83..00ba8be 100644 --- a/common/fish/functions.fish +++ b/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 diff --git a/common/tig/rc b/common/tig/rc new file mode 100644 index 0000000..d26d3bf --- /dev/null +++ b/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 diff --git a/os/linux/arch/provision.d/70-optional-packages.bash b/os/linux/arch/provision.d/70-optional-packages.bash index d32c7e2..88d3c4a 100755 --- a/os/linux/arch/provision.d/70-optional-packages.bash +++ b/os/linux/arch/provision.d/70-optional-packages.bash @@ -22,4 +22,5 @@ paru -Sy --needed --noconfirm \ sc-im `# Spreadsheets` \ cloc `# For counting lines of code` \ gitui `# Git TUI` \ + tokei `# Counting Lines of Code (cloc alternative)` \ pigz `# Multicore Compression Utility` \ From 546ef45d61804be405b3993eef90517d0e3560db Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Fri, 7 Jul 2023 12:36:08 -0500 Subject: [PATCH 3/3] Bin --- os/linux/arch/provision.d/70-optional-packages.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/os/linux/arch/provision.d/70-optional-packages.bash b/os/linux/arch/provision.d/70-optional-packages.bash index 88d3c4a..d864b26 100755 --- a/os/linux/arch/provision.d/70-optional-packages.bash +++ b/os/linux/arch/provision.d/70-optional-packages.bash @@ -15,7 +15,7 @@ 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 `# Disk Usage Analyzer` \ + bluetuith-bin `# Disk Usage Analyzer` \ aria2 `# Downloads Manager` \ oath-toolkit `# TOTP Utility` \ pass pass-otp `# Password Management` \