yes

7 files changed, 51 insertions, 48 deletions

diff --git a/.bashrc b/.bashrc
index 6d28704..9a63c20 100644
--- a/.bashrc
+++ b/.bashrc
@@ -15,8 +15,8 @@ shopt -s nocaseglob
 shopt -s no_empty_cmd_completion
 
 export HISTFILE="$XDG_STATE_HOME/bash/history"
-export HISTSIZE=20
-export HISTFILESIZE=500
+export HISTSIZE=200
+export HISTFILESIZE=1000
 
 # aliases
 alias ls='exa'
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 51c6d3e..d3a8372 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -22,18 +22,6 @@ function set_envvars
   set -gx EDITOR 'nvim'
   set -gx VISUAL 'nvim'
   set -gx GPG_TTY (tty)
-  set -gx AUR_PAGER 'fff'
-  set -gx AUR_EXEC_PATH "$XDG_DATA_HOME/aurutils/lib:/usr/lib/aurutils"
-
-  # flags
-  set -gx CFLAGS "-march=native -mtune=native -O3 -pipe -fno-plt -fexceptions \
-          -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-          -fstack-clash-protection -fcf-protection"
-  set -gx CXXFLAGS "$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
-  set -gx LDFLAGS "-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
-  set -gx LTOFLAGS "-flto=12"
-  set -gx RUSTFLAGS "-C target-cpu=native -C opt-level=3"
-  set -gx MAKEFLAGS "-j12"
 
   # paths
   set -gx CARGO_HOME "$XDG_DATA_HOME/cargo"
@@ -44,7 +32,7 @@ function set_envvars
 end
 
 function load_plugins
-  starship init fish | source
+  #starship init fish | source
 end
 
 if status is-login
@@ -52,6 +40,4 @@ if status is-login
   load_plugins
 else if status is-interactive
   load_plugins
-else
-  set_envvars
 end
diff --git a/.config/git/config b/.config/git/config
index 1d7fad7..d6f6f5a 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -6,5 +6,3 @@
 	gpgsign = true
 [gpg]
 	program = gpg
-[core]
-	pager = bat --style=changes
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index cbedb8e..ed3883e 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -2,16 +2,20 @@
 " getchoo's neovim config
 "
 
-" plugins
-call plug#begin()
+set nocompatible
 
-Plug 'itchyny/lightline.vim'
-Plug 'joshdick/onedark.vim'
-Plug 'arcticicestudio/nord-vim'
-Plug 'rose-pine/neovim', {'as': 'rose-pine'}
-Plug 'neoclide/coc.nvim', {'branch': 'release'}
+set runtimepath+=/home/seth/.local/share/dein/repos/github.com/Shougo/dein.vim
+call dein#begin('~/.local/share/dein')
 
-call plug#end()
+call dein#add('~/.local/share/dein/repos/github.com/Shougo/dein.vim')
+call dein#add('wsdjeg/dein-ui.vim')
+call dein#add('itchyny/lightline.vim')
+call dein#add('joshdick/onedark.vim')
+call dein#add('arcticicestudio/nord-vim')
+call dein#add('rose-pine/neovim', {'name': 'rose-pine'})
+call dein#add('neoclide/coc.nvim', { 'merged': 0, 'rev': 'release' })
+
+call dein#end()
 
 " coc settings
 "" use <tab> for trigger completion and navigate to the next complete item
@@ -42,9 +46,9 @@ set smartindent
 syntax on
 filetype plugin indent on
 set termguicolors
-colorscheme onedark
+colorscheme nord
 let g:lightline = {
-      \ 'colorscheme': 'onedark',
+      \ 'colorscheme': 'nord',
       \ 'active': {
       \   'left': [ [ 'mode', 'paste' ],
       \             [ 'cocstatus', 'currentfunction', 'readonly', 'filename', 'modified' ] ]
diff --git a/.config/shell/profile b/.config/shell/profile
index 72a0601..e8d80d7 100644
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -10,21 +10,11 @@ export XDG_CONFIG_DIRS="/etc/xdg"
 export EDITOR='nvim'
 export VISUAL='nvim'
 export GPG_TTY=$(tty)
-export AUR_PAGER='fff'
-export AUR_EXEC_PATH="$XDG_DATA_HOME/aurutils/lib:/usr/lib/aurutils"
-
-# flags
-export CFLAGS="-march=native -mtune=native -O3 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
-        -fstack-clash-protection -fcf-protection"
-export CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
-export LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
-export LTOFLAGS="-flto=12"
-export RUSTFLAGS="-C target-cpu=native -C opt-level=3"
-export MAKEFLAGS="-j12"
 
 # paths
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
 export LESSHISTFILE="$XDG_STATE_HOME/less/history"
 export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
+export ZPLUG_HOME="$XDG_DATA_HOME/zplug"
+#source "$CARGO_HOME/env"
diff --git a/.config/zsh/.zsh_plugins.txt b/.config/zsh/.zsh_plugins.txt
new file mode 100644
index 0000000..70680f0
--- /dev/null
+++ b/.config/zsh/.zsh_plugins.txt
@@ -0,0 +1,4 @@
+zsh-users/zsh-completions
+zdharma-continuum/fast-syntax-highlighting
+#zsh-users/zsh-autosuggestions
+romkatv/powerlevel10k
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 299fbc7..25be2d1 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -2,14 +2,35 @@
 # getchoo's zshrc
 #
 
+# plugins :)
+if ! [[ -e ${ZDOTDIR:-~}/.antidote ]]; then
+  git clone https://github.com/mattmc3/antidote.git ${ZDOTDIR:-~}/.antidote
+fi
+
+# source antidote and load plugins from `${ZDOTDIR:-~}/.zsh_plugins.txt`
+zhome=${ZDOTDIR:-$HOME}
+if [[ ! $zhome/.zsh_plugins.zsh -nt $zhome/.zsh_plugins.txt ]]; then
+  [[ -e $zhome/.antidote ]] \
+    || git clone --depth=1 https://github.com/mattmc3/antidote.git $zhome/.antidote
+  [[ -e $zhome/.zsh_plugins.txt ]] || touch $zhome/.zsh_plugins.txt
+  (
+    source $zhome/.antidote/antidote.zsh
+    antidote bundle <$zhome/.zsh_plugins.txt >$zhome/.zsh_plugins.zsh
+  )
+fi
+
+autoload -Uz $zhome/.antidote/functions/antidote
+
+source $zhome/.zsh_plugins.zsh
+unset zhome
 
 # zmodules
-autoload -U compinit promptinit
+autoload -U compinit #promptinit
 zmodload zsh/complist
 zstyle ':completion:*' menu select reshash true
 compinit
-promptinit
-prompt walters
+#promptinit
+#prompt walters
 
 # options
 setopt append_history
@@ -34,12 +55,12 @@ bindkey '^L' clear-screen-and-scrollback
 
 # enable history
 HISTFILE="$XDG_STATE_HOME/zsh/history"
-HISTSIZE=20
-SAVEHIST=500
+HISTSIZE=200
+SAVEHIST=1000
 
 # aliases
 alias ls='exa'
 alias dotfiles='git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME'
 
-# plugins
-source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+# To customize prompt, run `p10k configure` or edit ~/.config/zsh/.p10k.zsh.
+[[ ! -f ~/.config/zsh/.p10k.zsh ]] || source ~/.config/zsh/.p10k.zsh