diff --git a/.chezmoiignore b/.chezmoiignore index 2ac8df4..4257e02 100644 --- a/.chezmoiignore +++ b/.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 }} diff --git a/dot_config/environment b/dot_config/environment index 4fcbe65..2ed6dc2 100644 --- a/dot_config/environment +++ b/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 diff --git a/dot_config/nvim/lua/plugins.lua b/dot_config/nvim/lua/plugins.lua index 5558b72..0f31f9b 100644 --- a/dot_config/nvim/lua/plugins.lua +++ b/dot_config/nvim/lua/plugins.lua @@ -11,15 +11,21 @@ return require('packer').startup(function(use) -- Packer can manage itself use 'wbthomason/packer.nvim' - -- LSP / COMPLETION -- - use {'neoclide/coc.nvim', branch = "release"} + -- LSP / COMPLETION -- + use {'neoclide/coc.nvim', branch = "release"} - -- Gruvbox colorscheme - use 'ellisonleao/gruvbox.nvim' + -- automatically adjust tab based on current file + use 'tpope/vim-sleuth' - use 'lukas-reineke/indent-blankline.nvim' + use 'junegunn/fzf' + use 'junegunn/fzf.vim' - use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} + -- Gruvbox colorscheme + use 'ellisonleao/gruvbox.nvim' + + use 'lukas-reineke/indent-blankline.nvim' + + use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} -- Automatically set up your configuration after cloning packer.nvim -- Put this at the end after all plugins diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc index 127b386..b000c65 100644 --- a/dot_config/zsh/dot_zshrc +++ b/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'