diff --git a/common/colors/shell b/common/colors/shell index 889f8fb..c402a23 100755 --- a/common/colors/shell +++ b/common/colors/shell @@ -12,16 +12,6 @@ blue="66/d9/ef" magenta="ae/81/ff" cyan="a1/ef/e4" white="cccccc" -black2="75/71/5e" -white2="f8/f8/f8" - -# TODO: name these? -color16="fd/97/1f" # Base 09 -color17="cc/66/33" # Base 0F -color18="38/38/30" # Base 01 -color19="49/48/3e" # Base 02 -color20="a5/9f/85" # Base 04 -color21="f5/f4/f1" # Base 06 if [ -n "$TMUX" ]; then # tell tmux to pass the escape sequences through @@ -63,15 +53,6 @@ ct $blue 4 12 ct $magenta 5 13 ct $cyan 6 14 ct $white 7 10 -ct $black2 8 -ct $white2 15 - -ct $color16 16 -ct $color17 17 -ct $color18 18 -ct $color19 19 -ct $color20 20 -ct $color21 21 if [ -n "$ITERM_SESSION_ID" ]; then # iTerm2 proprietary escape codes @@ -101,15 +82,7 @@ unset blue unset magenta unset cyan unset white -unset black2 -unset white2 unset printf_template unset printf_template_var unset printf_template_custom -unset color16 -unset color17 -unset color18 -unset color19 -unset color20 -unset color21 diff --git a/common/colors/vconsole b/common/colors/vconsole index 02e23c1..0d95e6a 100755 --- a/common/colors/vconsole +++ b/common/colors/vconsole @@ -8,13 +8,13 @@ blue="66d9ef" # blue magenta="ae81ff" # magenta cyan="a1efe4" # cyan white="cccccc" # white -black2="75715e" # black -white2="f8f8f8" # white +black2="75715e" # black2 +white2="f8f8f8" # white2 c() { c="${1}"; shift for n in "$@"; do - echo -e "\e]P${n}${c}"; + printf "\e]P%d%s" "$n" "$c"; done } @@ -32,7 +32,7 @@ c $white2 F if [ -x /sbin/clear ]; then /sbin/clear else - echo -e "\e[H\e[2J" + printf "\e[H\e[2J" fi unset -f c diff --git a/common/fish/aliases.fish b/common/fish/aliases.fish index 5132838..6a682ea 100755 --- a/common/fish/aliases.fish +++ b/common/fish/aliases.fish @@ -107,6 +107,7 @@ alias dd "dd status=progress" alias wifi "sudo iwctl" alias year 'cal (date +%Y)' alias mount 'sudo -E mount' +alias umount 'sudo -E umount' alias pa pulsemixer alias mail neomutt alias wje work-journal-entry diff --git a/common/neovim/colors/base16-donokai.vim b/common/neovim/colors/base16-donokai.vim new file mode 120000 index 0000000..3af3c64 --- /dev/null +++ b/common/neovim/colors/base16-donokai.vim @@ -0,0 +1 @@ +/home/daniel/.home/.config/lytedev-dotfiles/common/colors/vim \ No newline at end of file diff --git a/common/neovim/colors/donokai.vim b/common/neovim/colors/donokai.vim index 420776d..aae6dab 100644 --- a/common/neovim/colors/donokai.vim +++ b/common/neovim/colors/donokai.vim @@ -8,7 +8,6 @@ " let s:blue = '04' " let s:magenta = '05' " let s:cyan = '06' -" let s:darkgrey = '18' " let s:cterm02 = '19' " let s:cterm04 = '20' @@ -22,21 +21,20 @@ syntax reset hi normal cterm=none ctermfg=7 hi bold cterm=bold -" hi statusline cterm=none ctermfg=7 ctermbg=18 -hi statusline cterm=none ctermfg=7 ctermbg=18 -hi statuslinenc cterm=none ctermfg=18 ctermbg=0 -hi inactivebuffer cterm=none ctermbg=18 ctermfg=7 +hi statusline cterm=none ctermfg=7 ctermbg=234 +hi statuslinenc cterm=none ctermfg=234 ctermbg=0 +hi inactivebuffer cterm=none ctermbg=234 ctermfg=7 hi activebuffer cterm=none ctermfg=0 ctermbg=4 hi dirtybuffer cterm=none ctermfg=0 ctermbg=1 hi activedirtybuffer cterm=none ctermfg=0 ctermbg=3 -hi linenr cterm=none ctermfg=18 -hi indentblanklinechar cterm=none ctermfg=18 -hi signcolumn cterm=none ctermfg=18 ctermbg=0 +hi linenr cterm=none ctermfg=236 +hi indentblanklinechar cterm=none ctermfg=236 +hi signcolumn cterm=none ctermfg=234 ctermbg=0 hi matchparen cterm=none ctermbg=5 ctermfg=0 hi search cterm=bold ctermbg=4 -hi todo cterm=none ctermfg=7 ctermbg=18 -hi comment cterm=none ctermfg=18 +hi todo cterm=none ctermfg=7 ctermbg=236 +hi comment cterm=none ctermfg=236 hi keyword cterm=none ctermfg=7 hi operator cterm=none ctermfg=7 hi repeat cterm=none ctermfg=1 @@ -57,12 +55,12 @@ hi nontext ctermfg=0 ctermbg=0 hi LspDiagnosticsSignWarning cterm=none ctermfg=1 ctermbg=0 hi lspdiagnosticsvirtualtextwarning cterm=none ctermfg=1 ctermbg=0 -hi TelescopeBorder ctermfg=18 -hi TelescopePromptBorder ctermfg=18 -hi TelescopeResultsBorder ctermfg=18 -hi TelescopePreviewBorder ctermfg=18 +hi TelescopeBorder ctermfg=234 +hi TelescopePromptBorder ctermfg=234 +hi TelescopeResultsBorder ctermfg=234 +hi TelescopePreviewBorder ctermfg=234 -hi TelescopeSelection ctermbg=18 ctermfg=7 +hi TelescopeSelection ctermbg=234 ctermfg=7 hi TelescopeSelectionCaret ctermfg=7 hi TelescopeMultiSelection ctermfg=7 hi TelescopeNormal ctermfg=7 diff --git a/os/linux/arch/provision.d/20-install-packages.bash b/os/linux/arch/provision.d/20-install-packages.bash index 2c7f8c8..accbe2c 100755 --- a/os/linux/arch/provision.d/20-install-packages.bash +++ b/os/linux/arch/provision.d/20-install-packages.bash @@ -31,6 +31,7 @@ yay -Sy --needed --noconfirm \ neovim-nightly-bin `# Text Editors` \ sc-im `# Spreadsheets` \ unzip `# Simple Unzipping` \ + ctags `# Tags` \ tmux `# Terminal Multiplexer` \ kitty `# Almost Better Terminal Emulator` \ curl `# HTTP Utility` \