Merge branch 'master' of ssh://git.beckmeyer.us:8101/TnSb/dotfiles

.chezmoiignore

@@ -1,6 +1,6 @@
 README.md
 
-{{ if or (eq .chezmoi.hostname "daybreak") (eq .chezmoi.hostname "epoch") (eq .chezmoi.hostname "UGC13335X84") (env "ANDROID_ROOT") }}
+{{ if or (eq .chezmoi.hostname "daybreak") (eq .chezmoi.hostname "epoch") (eq .chezmoi.hostname "UGC13335X84") (eq .chezmoi.hostname "UGCB2YBS33") (env "ANDROID_ROOT") }}
 .config/beets
 .config/davfs2/secrets
 .config/kitty
@@ -9,6 +9,6 @@ README.md
 .config/waybar
 {{ end }}
 
-{{ if or (eq .chezmoi.hostname "daybreak") (eq .chezmoi.hostname "epoch") (eq .chezmoi.hostname "UGC13335X84") }}
+{{ if or (eq .chezmoi.hostname "daybreak") (eq .chezmoi.hostname "epoch") (eq .chezmoi.hostname "UGC13335X84") (eq .chezmoi.hostname "UGCB2YBS33") }}
 .local/share/gnupg/sshcontrol
 {{ end }}

dot_config/environment

@@ -17,6 +17,7 @@ export SVDIR="$XDG_STATE_HOME"/service
 # editor
 export EDITOR=nvim
 export SUDO_EDITOR=nvim
+export PAGER=less
 
 # sway stuff
 #export XDG_CURRENT_DESKTOP=sway
@@ -41,7 +42,7 @@ export NPM_CONFIG_INIT_MODULE="$XDG_CONFIG_HOME"/npm/config/npm-init.js
 export NPM_CONFIG_TMP="$XDG_RUNTIME_DIR"/npm 
 export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
 export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
-export PATH="$HOME/.local/bin:$PATH:$XDG_DATA_HOME/xxtools:$XDG_DATA_HOME/flutter/bin"
+export PATH="$HOME/.local/bin:$PATH:$XDG_DATA_HOME/xxtools:$XDG_DATA_HOME/flutter/bin:$ANDROID_HOME/platform-tools:$HOME/platform-tools"
 export PYTHON_HISTORY="$XDG_STATE_HOME"/python_history
 export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
 export SQLITE_HISTORY="$XDG_CACHE_HOME"/sqlite_history
@@ -60,4 +61,4 @@ export XBPS_DISTDIR="$HOME"/repos/void-packages
 # Android build stuff
 export USE_CCACHE=1
 export CCACHE_EXEC=/usr/bin/ccache
-export ANDROID_STUDIO="$XDG_DATA_HOME"/flatpak/app/com.google.AndroidStudio/current/active/files/extra/android-studio
+export ANDROID_STUDIO=/opt/android-studio

dot_config/nvim/lua/plugins.lua

@@ -14,6 +14,12 @@ return require('packer').startup(function(use)
   -- LSP / COMPLETION --
   use {'neoclide/coc.nvim', branch = "release"}
 
+  -- automatically adjust tab based on current file
+  use 'tpope/vim-sleuth'
+
+  use 'junegunn/fzf'
+  use 'junegunn/fzf.vim'
+
   -- Gruvbox colorscheme
   use 'ellisonleao/gruvbox.nvim'
 

dot_config/zsh/dot_zshrc

@@ -39,6 +39,9 @@ if [[ -n "$SCHROOT_CHROOT_NAME" ]]; then
     PS1="[chroot:$SCHROOT_CHROOT_NAME] $PS1"
 fi
 
+# share history between open shells
+setopt share_history
+
 alias boinctui='boinctui --boinchost=localhost'
 alias bt='bluetoothctl'
 alias c='clear'