Merge branch 'main' of https://git.sagev.space/sage/dotfiles

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
 
@@ -77,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
@@ -95,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

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

fake_home/.shell_aliases

@@ -1,9 +1,9 @@
 #!/bin/bash
 
-if command -v yay &> /dev/null; then
+if command -v pikaur &> /dev/null; then
-    alias pacman="yay"
-elif 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
@@ -30,7 +30,11 @@ function hearch {
     history 0 | sed 's/[0-9 ]*//' | grep "$@"
 }
 
+alias j='journalctl -xefu'
 alias hsearch='hearch'
+alias d='docker'
+
+alias tmux="tmux attach || tmux"
 
 alias caddyfile="sudo vim /etc/caddy/Caddyfile"
 alias cf="sudo vim /etc/caddy/Caddyfile"

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 = "\<Esc>[38:2:%lu:%lu:%lum"

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]P0""2c2d27" # black       1
-    echo -en "\e]P1""dc4848" #darkgrey    2
+    echo -en "\e]P1""f92672" # darkgrey    2
-    echo -en "\e]P2""00aa00" #darkred     3
+    echo -en "\e]P2""00aa00" # darkred     3
-    echo -en "\e]P3""d99f4e" #red         4
+    echo -en "\e]P3""f92672" # red         4
-    echo -en "\e]P4""4444aa" #darkgreen   5
+    echo -en "\e]P4""4444aa" # darkgreen   5
-    echo -en "\e]P5""c436b9" #green       6
+    echo -en "\e]P5""a6e22e" # green       6
-    echo -en "\e]P6""00aaaa" #brown       7
+    echo -en "\e]P6""f59762" # brown       7
-    echo -en "\e]P7""d7d7d7" #yellow      8
+    echo -en "\e]P7""fdfff1" # yellow      8
-    echo -en "\e]P8""7b7b7b" #darkblue    9
+    echo -en "\e]P8""f92672" # darkblue    9
-    echo -en "\e]P9""6f6fff" #blue        10
+    echo -en "\e]P9""f92672" # blue        10
-    echo -en "\e]PA""55ff55" #darkmagenta 11
+    echo -en "\e]PA""55ff55" # darkmagenta 11
-    echo -en "\e]PB""ffed8b" #magenta     12
+    echo -en "\e]PB""f92672" # magenta     12
-    echo -en "\e]PC""5555ff" #darkcyan    13
+    echo -en "\e]PC""66d9ef" # darkcyan    13
-    echo -en "\e]PD""ff6eff" #cyan        14
+    echo -en "\e]PD""ae81ff" # cyan        14
-    echo -en "\e]PE""55ffff" #lightgray   15
+    echo -en "\e]PE""a1efe4" # lightgray   15
-    echo -en "\e]PF""aaaaaa" #white       16
+    echo -en "\e]PF""fdfff1" # white       16
     clear
 }