From 806b44c192481cf77b1a20bda37bd3390e5d225f Mon Sep 17 00:00:00 2001 From: Sage Vaillancourt Date: Wed, 27 Dec 2023 16:25:08 -0500 Subject: [PATCH 1/6] Pikaur > yay. Try tmux attach first --- fake_home/.shell_aliases | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fake_home/.shell_aliases b/fake_home/.shell_aliases index b5132ae..1614e66 100755 --- a/fake_home/.shell_aliases +++ b/fake_home/.shell_aliases @@ -1,9 +1,9 @@ #!/bin/bash -if command -v yay &> /dev/null; then - alias pacman="yay" -elif command -v pikaur &> /dev/null; then +if command -v pikaur &> /dev/null; then alias pacman="sudo pikaur" +elif command -v yay &> /dev/null; then + alias pacman="yay" else alias pacman="sudo pacman" fi @@ -32,6 +32,8 @@ function hearch { alias hsearch='hearch' +alias tmux="tmux attach || tmux" + alias caddyfile="sudo vim /etc/caddy/Caddyfile" alias cf="sudo vim /etc/caddy/Caddyfile" From a0f65b023bafb0c37939d3e7d1573751bb7ab03a Mon Sep 17 00:00:00 2001 From: Sage Vaillancourt Date: Thu, 28 Dec 2023 15:32:34 -0500 Subject: [PATCH 2/6] Add d->docker alias --- fake_home/.shell_aliases | 1 + 1 file changed, 1 insertion(+) diff --git a/fake_home/.shell_aliases b/fake_home/.shell_aliases index 1614e66..0a4b868 100755 --- a/fake_home/.shell_aliases +++ b/fake_home/.shell_aliases @@ -31,6 +31,7 @@ function hearch { } alias hsearch='hearch' +alias d='docker' alias tmux="tmux attach || tmux" From 6d995de851c8766fc1863de08210a711b3b11f47 Mon Sep 17 00:00:00 2001 From: Sage Vaillancourt Date: Fri, 29 Dec 2023 14:33:28 -0500 Subject: [PATCH 3/6] j -> journalctl -xefu --- fake_home/.shell_aliases | 1 + 1 file changed, 1 insertion(+) diff --git a/fake_home/.shell_aliases b/fake_home/.shell_aliases index 0a4b868..e4a620e 100755 --- a/fake_home/.shell_aliases +++ b/fake_home/.shell_aliases @@ -30,6 +30,7 @@ function hearch { history 0 | sed 's/[0-9 ]*//' | grep "$@" } +alias j='journalctl -xefu' alias hsearch='hearch' alias d='docker' From ddf58318626740fcb16a012c264fb6d3c4231fde Mon Sep 17 00:00:00 2001 From: Sage Vaillancourt Date: Mon, 8 Jan 2024 17:53:16 -0500 Subject: [PATCH 4/6] Add wget check --- copy.sh | 5 +++++ fake_home/.bashrc | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/copy.sh b/copy.sh index d99dea7..644bfc8 100755 --- a/copy.sh +++ b/copy.sh @@ -3,6 +3,11 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" FAKE_HOME="$SCRIPT_DIR/fake_home" +if ! command -v wget &> /dev/null; then + echo "wget must be installed!" + exit 1 +fi + git submodule init git submodule update diff --git a/fake_home/.bashrc b/fake_home/.bashrc index b3d18fc..7e755db 100644 --- a/fake_home/.bashrc +++ b/fake_home/.bashrc @@ -141,3 +141,7 @@ ex () source ~/.shell_aliases . "$HOME/.cargo/env" + +export NVM_DIR="$HOME/.nvm" +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion From 1d8e670b109dba88dd83efa1236125eba4cfa9b5 Mon Sep 17 00:00:00 2001 From: Sage Vaillancourt Date: Mon, 8 Jan 2024 18:49:57 -0500 Subject: [PATCH 5/6] Add font download to copy.sh --- copy.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/copy.sh b/copy.sh index 644bfc8..daa0897 100755 --- a/copy.sh +++ b/copy.sh @@ -82,7 +82,6 @@ echo -n "starship is " if ! command -v starship &> /dev/null; then echo "not installed. Installing..." curl -sS https://starship.rs/install.sh | sh - echo "Starship requires an NFont: https://github.com/ryanoasis/nerd-fonts/releases/download/v2.1.0/FiraCode.zip" else echo "already installed." fi @@ -100,6 +99,19 @@ else echo "already installed." fi +mkdir -p "$HOME/.local/share/fonts" +echo -n "FiraCode is " +if ! test -f "$HOME/.local/share/fonts/FiraCodeNerdFontMono-Medium.ttf"; then + echo "not installed. Installing..." + wget -O /tmp/firacode.zip "https://github.com/ryanoasis/nerd-fonts/releases/download/v3.1.1/FiraCode.zip" + unzip -d "$HOME/.local/share/fonts" /tmp/firacode.zip + rm /tmp/firacode.zip + fc-cache -f -v + +else + echo "already installed." +fi + if ! command -v fzf &> /dev/null; then echo "You may wish to install fzf for sofi and other search" else From d2cb7900afb04892b6817b1c34b48c0836470d8b Mon Sep 17 00:00:00 2001 From: Sage Vaillancourt Date: Tue, 9 Jan 2024 10:12:38 -0500 Subject: [PATCH 6/6] Always use monokai in vim Switch TTY colorscheme to something monokai-esque --- fake_home/.vimrc | 3 ++- fake_home/.zshrc | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/fake_home/.vimrc b/fake_home/.vimrc index 94c76b6..358dd30 100644 --- a/fake_home/.vimrc +++ b/fake_home/.vimrc @@ -12,7 +12,8 @@ set updatetime=100 set clipboard=unnamedplus " Use system clipboard if empty($DISPLAY) && empty($SSH_CONNECTION) - colorscheme elflord + colorscheme monokai + syntax enable else set termguicolors let &t_8f = "\[38:2:%lu:%lu:%lum" diff --git a/fake_home/.zshrc b/fake_home/.zshrc index 540c1f9..a5cb140 100644 --- a/fake_home/.zshrc +++ b/fake_home/.zshrc @@ -41,22 +41,22 @@ export PATH=~/.bin:$HOME/.dotnet:~/.local/bin:/usr/local/go/bin:$PATH fignore=(o) function SetTtyColors() { - echo -en "\e]P0""292e2f" #black 1 - echo -en "\e]P1""dc4848" #darkgrey 2 - echo -en "\e]P2""00aa00" #darkred 3 - echo -en "\e]P3""d99f4e" #red 4 - echo -en "\e]P4""4444aa" #darkgreen 5 - echo -en "\e]P5""c436b9" #green 6 - echo -en "\e]P6""00aaaa" #brown 7 - echo -en "\e]P7""d7d7d7" #yellow 8 - echo -en "\e]P8""7b7b7b" #darkblue 9 - echo -en "\e]P9""6f6fff" #blue 10 - echo -en "\e]PA""55ff55" #darkmagenta 11 - echo -en "\e]PB""ffed8b" #magenta 12 - echo -en "\e]PC""5555ff" #darkcyan 13 - echo -en "\e]PD""ff6eff" #cyan 14 - echo -en "\e]PE""55ffff" #lightgray 15 - echo -en "\e]PF""aaaaaa" #white 16 + echo -en "\e]P0""2c2d27" # black 1 + echo -en "\e]P1""f92672" # darkgrey 2 + echo -en "\e]P2""00aa00" # darkred 3 + echo -en "\e]P3""f92672" # red 4 + echo -en "\e]P4""4444aa" # darkgreen 5 + echo -en "\e]P5""a6e22e" # green 6 + echo -en "\e]P6""f59762" # brown 7 + echo -en "\e]P7""fdfff1" # yellow 8 + echo -en "\e]P8""f92672" # darkblue 9 + echo -en "\e]P9""f92672" # blue 10 + echo -en "\e]PA""55ff55" # darkmagenta 11 + echo -en "\e]PB""f92672" # magenta 12 + echo -en "\e]PC""66d9ef" # darkcyan 13 + echo -en "\e]PD""ae81ff" # cyan 14 + echo -en "\e]PE""a1efe4" # lightgray 15 + echo -en "\e]PF""fdfff1" # white 16 clear }