Add recent changesjesterpm

11 files changed, 23 insertions, 9 deletions

diff --git a/base/bash_aliases b/base/bash_aliases
index a5c77f3..a3cc622 100644
--- a/base/bash_aliases
+++ b/base/bash_aliases
@@ -1,2 +1,4 @@
 alias g="gvim --remote-silent"
-alias vi=vim
+alias vi=nvim
+alias vvim=/usr/bin/vim
+alias vim=nvim
diff --git a/base/bashrc b/base/bashrc
index 1938306..728e83a 100644
--- a/base/bashrc
+++ b/base/bashrc
@@ -130,3 +130,4 @@ if [ -f ~/.host-specific/bash_aliases ]; then
     source ~/.host-specific/bash_aliases
 fi
 
+export PATH="/home/jesterpm/.local/bin:$PATH"
diff --git a/base/config/i3/config.d/00_base_config b/base/config/i3/config.d/00_base_config
index c373851..f31b504 100644
--- a/base/config/i3/config.d/00_base_config
+++ b/base/config/i3/config.d/00_base_config
@@ -169,6 +169,8 @@ bindsym $mod+g     exec sshclip
 bindsym $mod+c     exec clipmv
 
 ### Music
+bindsym $mod+F7 exec bluetoothctl connect 24:2C:00:1A:C8:BE
+bindsym $mod+Shift+F7 exec bluetoothctl disconnect 24:2C:00:1A:C8:BE
 bindsym XF86AudioPlay exec xmms2 toggle
 bindsym $mod+End exec xmms2 toggle
 bindsym XF86AudioNext exec xmms2 next
diff --git a/base/config/nvim/init.vim b/base/config/nvim/init.vim
index 18324af..c71360c 100644
--- a/base/config/nvim/init.vim
+++ b/base/config/nvim/init.vim
@@ -17,8 +17,8 @@ Plug 'hrsh7th/cmp-nvim-lsp'
 Plug 'hrsh7th/cmp-vsnip'
 
 " Other usefull completion sources
-Plug 'hrsh7th/cmp-path'
-Plug 'hrsh7th/cmp-buffer'
+" Plug 'hrsh7th/cmp-path'
+" Plug 'hrsh7th/cmp-buffer'
 
 " See hrsh7th's other plugins for more completion sources!
 
@@ -41,6 +41,9 @@ Plug 'vim-airline/vim-airline'
 Plug 'airblade/vim-gitgutter'
 Plug 'tpope/vim-fugitive'
 
+let g:ledger_is_hledger=v:false
+Plug 'ledger/vim-ledger'
+
 call plug#end()
 
 colorscheme nord
diff --git a/base/conkyrc-json b/base/conkyrc-json
index 5f01acb..523b0a4 100644
--- a/base/conkyrc-json
+++ b/base/conkyrc-json
@@ -29,7 +29,7 @@ TEXT
 
 { "full_text":"${loadavg 1}" },
 
-{ "full_text":"♪ ${exec amixer get Master | awk '/Mono/ {print substr($4, 2, index($4, "%") - 1)}'|tail -n 1}" },
+{ "full_text":"♪ ${exec amixer get Master | awk '/Left/ {print substr($5, 2, index($5, "%") - 1)}'|tail -n 1}" },
 
 { "full_text":"${time %a %d %b %Y} ${time %H:%M:%S} ${utime %H:%M}Z",
   "short_text":"${time %H:%M:%S}" }
diff --git a/base/mailcap b/base/mailcap
index f95fa25..9ba41b1 100644
--- a/base/mailcap
+++ b/base/mailcap
@@ -1,7 +1,7 @@
-text/calendar; mutt-ical.py -i -e "jesse@jesterpm.net" %s
-application/ics; mutt-ical.py -i -e "jesse@jesterpm.net" %s
+text/calendar; mutt-ical.py -i -e "jesse@jesterpm.net" -e "jesterpm@gmail.com" %s
+application/ics; mutt-ical.py -i -e "jesse@jesterpm.net" -e "jesterpm@gmail.com" %s
 
-text/html; w3m -I %{charset} -T text/html -dump; copiousoutput; description=HTML; compose=vim %s
+text/html; w3m -I %{charset} -o display_link_number=1 -T text/html -dump; copiousoutput; description=HTML; compose=vim %s
 
 application/pdf; evince %s; test=test -n "$DISPLAY"
 application/x-bzpdf; evince %s; test=test -n "$DISPLAY"
diff --git a/base/muttrc b/base/muttrc
index f795f61..2e899e7 100644
--- a/base/muttrc
+++ b/base/muttrc
@@ -3,7 +3,7 @@
 #
 
 # Mailbox Settings
-set mbox_type="Maildir"
+set mbox_type="mbox"
 set folder="~/.maildir"
 
 # Mutt settings
diff --git a/base/vim/ftplugin/rust.vim b/base/vim/ftplugin/rust.vim
new file mode 100644
index 0000000..da07faf
--- /dev/null
+++ b/base/vim/ftplugin/rust.vim
@@ -0,0 +1 @@
+set tw=100
diff --git a/base/xsession b/base/xsession
index 5c9e71f..79cdb99 100644
--- a/base/xsession
+++ b/base/xsession
@@ -3,6 +3,7 @@ export TERMINAL=urxvtc
 export EDITOR=vim
 export LANG=en_US.utf8
 export LC_ALL=en_US.utf8
+export MOZ_USE_XINPUT2=1
 
 systemctl --user import-environment DISPLAY PATH
 
@@ -19,6 +20,7 @@ fi
 xsetroot -solid "#111"
 ulimit -c unlimited
 setxkbmap -option compose:menu
+#xmodmap ~/.Xmodmap
 
 # Startup applications
 xrandr --dpi 96
@@ -33,7 +35,6 @@ xrdb -merge $HOME/.Xresources
 (sleep 5; system-config-printer-applet) &
 #(sleep 5; nitrogen --restore) &
 #gtk-theme-switch2 -i Ambiance
-(sleep 10; redshift-gtk) &
 (sleep 10; blueman-applet) &
 #(sleep 10; dropbox start) &
 
diff --git a/host-overrides/jesterpm.net/gitconfig b/host-overrides/jesterpm.net/gitconfig
index 0cba91a..643c439 100644
--- a/host-overrides/jesterpm.net/gitconfig
+++ b/host-overrides/jesterpm.net/gitconfig
@@ -12,3 +12,5 @@
 	gpgsign = false
 [init]
 	defaultBranch = master
+[sendemail]
+    smtpserver = /usr/bin/msmtp
diff --git a/host-overrides/jesterpm.net/host-specific/bashrc b/host-overrides/jesterpm.net/host-specific/bashrc
index 4d8c58b..22de26d 100644
--- a/host-overrides/jesterpm.net/host-specific/bashrc
+++ b/host-overrides/jesterpm.net/host-specific/bashrc
@@ -9,5 +9,7 @@ export MAILHOST="jesterpm.net"
 export MAIL=$HOME/.maildir/
 export MAILDIR=$MAIL
 
+export DEBMAIL="jesse@jesterpm.net"
+export DEBFULLNAME="Jesse Morgan"
 
 export AWS_ACCOUNT_ID=206578203396