6 files changed, 7 insertions(+), 41 deletions(-)

M .gitconfig
M .xinitrc
M .zshrc
M config/nvim/init.vim
A scripts/new-install.sh
M zsh/path-exports-options.zsh

@@ 76,8 76,6 @@
     added = yellow
     changed = green
     untracked = red
-[commit]
-    gpgsign = true
 
 # shorthand URLs
 [url "https://github.com/"]

@@ 1,17 1,7 @@
 export LANG=en_US.UTF-8
 
-export apmd_flags="-A -Z 8"
-
 xrdb -merge $HOME/.resources
 
-xidle -timeout 300 &
-
-while true; do
-    batt="$(sysctl -n hw.sensors.acpibat0.watthour3 | cut -f1,2 -d" ")"
-    xsetroot -name "$batt"
-    sleep 60
-done &
-
 xset b off
 
 xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation" 1

@@ 4,11 4,11 @@ source ~/.dotfiles/zsh/aliases.zsh
 source ~/.dotfiles/zsh/config.zsh
 source ~/.dotfiles/zsh/functions.zsh
 source ~/.dotfiles/zsh/path-exports-options.zsh
-source ~/.dotfiles/zsh/secret-exports.zsh
+test -f ~/.dotfiles/zsh/secret-exports.zsh && source ~/.dotfiles/zsh/secret-exports.zsh
 source ~/.dotfiles/zsh/zsh-configuration.zsh
 
 ZSH_THEME="zah"
-source $ZSH/oh-my-zsh.sh
+test -f $ZSH/oh-my-zsh.sh && source $ZSH/oh-my-zsh.sh
 
 plugins=(gitfast)
 

@@ 6,25 6,6 @@ end
 
 call plug#begin('~/.vim/plugged')
 
-""" Language/Syntax
-"Plug 'l04m33/vlime', {'rtp': 'vim/'}
-Plug 'ElmCast/elm-vim', { 'for': 'elm' }
-Plug 'cespare/vim-toml', { 'for': 'toml' }
-Plug 'chrisbra/csv.vim', { 'for': 'csv' }
-Plug 'elixir-editors/vim-elixir', { 'for': 'elixir' }
-Plug 'elorest/vim-slang', { 'for': 'slang' }
-Plug 'fatih/vim-go', { 'for': 'go' }
-Plug 'isobit/vim-caddyfile', { 'for': 'caddyfile' }
-Plug 'kchmck/vim-coffee-script', { 'for': 'coffee' }
-Plug 'leafgarland/typescript-vim', { 'for': 'typescript' }
-Plug 'ledger/vim-ledger'
-Plug 'maxmellon/vim-jsx-pretty', { 'for': 'javascript' }
-Plug 'pangloss/vim-javascript', { 'for': 'javascript' }
-Plug 'rhysd/vim-crystal', { 'for': 'crystal' }
-Plug 'rust-lang/rust.vim', { 'for': 'rust' }
-Plug 'slim-template/vim-slim', { 'for': 'slim' }
-Plug 'LnL7/vim-nix', { 'for': 'nix' }
-
 """ Vim Behavior/Functionality
 Plug 'bkad/CamelCaseMotion'
 Plug 'bhurlow/vim-parinfer', {'for': 'clojure' }


@@ 37,17 18,12 @@ Plug 'machakann/vim-sandwich'
 Plug 'mattn/emmet-vim'
 Plug 'mhinz/vim-grepper', { 'on': ['Grepper', '<plug>(GrepperOperator)'] }
 Plug 'nathanaelkane/vim-indent-guides', { 'for': ['yaml', 'python', 'haml', 'slim', 'slang'] }
-Plug 'radenling/vim-dispatch-neovim'
 Plug 'scrooloose/nerdcommenter'
-Plug 'tpope/vim-dispatch'
 Plug 'tpope/vim-fugitive'
 Plug 'vim-scripts/VisIncr'
-"Plug 'w0rp/ale'
 
 "" og theme
 Plug 'morhetz/gruvbox'
-"" new themes to try
-Plug 'KKPMW/moonshine-vim'
 
 " used for testing/debug
 "Plug 'gerw/vim-HiLinkTrace'


@@ 63,9 39,8 @@ set history=1000
 
 " theme / colors
 set background=dark
-"colorscheme hybrid
 colorscheme gruvbox
-set termguicolors
+"set termguicolors
 
 set scrolloff=3
 

@@ 0,0 1,3 @@
+echo 'Downloading Plug for Neovim'
+curl -fLo ~/.local/share/nvim/site/autoload/plug.vim --create-dirs \
+    https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim

@@ 22,7 22,7 @@ export PATH=$GOROOT/bin:$GOPATH/bin:$PATH
 export PATH=/home/andrew/anaconda3/bin:$PATH
 
 # nix
-source ~/.nix-profile/etc/profile.d/nix.sh
+test -f ~/.nix-profile/etc/profile.d/nix.shsource && ~/.nix-profile/etc/profile.d/nix.sh
 
 # taskwarrior
 export TASKRC=~/.config/task/config