Moving to $HOME/git/dotfiles

8 files changed, 35 insertions, 20 deletions

diff --git a/.gitconfig b/.gitconfig
index 88672f3..f3d697b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,9 +1,6 @@
 [user]
 	name = Charles
 	email = sircharlesaze@gmail.com
-[credential]
-	helper = store
-	username = HappyTramp
 [log]
 	decorate = full
 [pull]
diff --git a/.muttrc b/.muttrc
new file mode 100644
index 0000000..7bbcce8
--- /dev/null
+++ b/.muttrc
@@ -0,0 +1,12 @@
+set from      = 'me@cacharle.xyz'
+set realname  = 'Charles Cabergs'
+
+set smtp_url  = 'smtp://me@cacharle.xyz@mail.cacharle.xyz:587'
+set folder    = 'imaps://me@cacharle.xyz@mail.cacharle.xyz:993'
+set spoolfile = '+INBOX'
+
+set header_cache     = "~/.mutt/cache/headers"
+set message_cachedir = "~/.mutt/cache/bodies"
+set certificate_file = "~/.mutt/certificates"
+
+set ssl_force_tls = yes
diff --git a/.pluggins.vim b/.pluggins.vim
index db233cf..65d0361 100644
--- a/.pluggins.vim
+++ b/.pluggins.vim
@@ -9,13 +9,16 @@ call plug#begin()
     Plug 'itchyny/lightline.vim'              " minimal status bar
     Plug 'HappyTramp/vim-syntax-extra'        " syntax highlight of C operators
     Plug 'romainl/vim-cool'                   " disable highlight after search
-    Plug 'tikhomirov/vim-glsl'                " glsl highlight
-    Plug 'cespare/vim-toml'                   " toml highlight
+
+    " syntax highlight for languages that aren't supported by default
+    Plug 'tikhomirov/vim-glsl'                " glsl
+    Plug 'cespare/vim-toml'                   " toml
+    Plug 'ziglang/zig.vim'                    " zig
 
     " s19 at home
     Plug 'HappyTramp/vim-42header'            " 42 header
 
-    Plug 'HappyTramp/vim-htheader'            " my header
+    " Plug 'HappyTramp/vim-htheader'            " my header
 
     " themes
     " Plug 'joshdick/onedark.vim'             " onedark
diff --git a/.vimrc b/.vimrc
index 6a197c3..c7799b7 100644
--- a/.vimrc
+++ b/.vimrc
@@ -3,7 +3,7 @@
 """"""""""
 
 " load pluggins {{{
-source $HOME/dotfiles/.pluggins.vim
+source $DOTDIR/.pluggins.vim
 " }}}
 
 """""""""""
diff --git a/.zsh_aliases b/.zsh_aliases
index 69975d1..59933df 100644
--- a/.zsh_aliases
+++ b/.zsh_aliases
@@ -70,21 +70,21 @@ alias gss='git status --short'
 alias gco='git checkout'
 alias gsta='git stash push'
 alias gstp='git stash pop'
+alias gpa="git remote | xargs -L1 git push --all"
 
 # lpass (lastpass-cli)
 alias lpassp='lpass show --password --clip'  # put password in clipboard
 
 # helper to switch between dual and single monitor setup
-alias dual='xrandr --output LVDS1 --primary --below VGA1 --output VGA1 --auto'
+alias dual='xrandr --output LVDS1 --primary --left-of VGA1 --output VGA1 --auto'
 alias single='xrandr --output VGA1 --off'
 
 # edit config files
-alias zshrc="vim $DOTFILES/.zshrc && source $DOTFILES/.zshrc"
-alias zshaliasrc="vim $DOTFILES/.zsh_aliases && source $DOTFILES/.zshrc"
-alias vimrc="vim $DOTFILES/.vimrc"
-alias vimplugrc="vim $DOTFILES/.pluggins.vim"
-alias xmonadrc="vim $DOTFILES/xmonad.hs"
-
+alias zshrc="vim $DOTDIR/.zshrc && source $DOTDIR/.zshrc"
+alias zshaliasrc="vim $DOTDIR/.zsh_aliases && source $DOTDIR/.zshrc"
+alias vimrc="vim $DOTDIR/.vimrc"
+alias vimplugrc="vim $DOTDIR/.pluggins.vim"
+alias xmonadrc="vim $DOTDIR/xmonad.hs"
 
 # other
 alias date="date -R"
diff --git a/.zshrc b/.zshrc
index 59b7a4e..85fa78e 100644
--- a/.zshrc
+++ b/.zshrc
@@ -2,10 +2,11 @@
 # zshrc       #
 ###############
 
-export DOTFILES=$HOME/dotfiles
+
+[ -z $DOTDIR ] && export DOTDIR=$HOME/git/dotfiles # FIXME have to change path manually if install elsewhere
 
 # load aliases
-source $DOTFILES/.zsh_aliases
+source $DOTDIR/.zsh_aliases
 
 # prompt
 case `tty` in
@@ -101,4 +102,4 @@ tabs 4
 
 export LFS=/mnt
 
-export PATH='/usr/local/sbin:/usr/local/bin:/usr/bin'
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:$HOME/bin"
diff --git a/install.sh b/install.sh
index e6cff50..3cbe6a3 100755
--- a/install.sh
+++ b/install.sh
@@ -15,12 +15,13 @@ create_dotfile_link_same()
 ###########################
 
 # dotfiles directory
-[ -z $DOTDIR ] && DOTDIR=`pwd`
+[ -z $DOTDIR ] && export DOTDIR=`pwd`
 
 # Creating links
 create_dotfile_link_same .zshrc
 create_dotfile_link_same .bashrc
 create_dotfile_link_same .vimrc
+create_dotfile_link_same .pluggins.vim
 [ ! -d $HOME/.vim/plugin ] && mkdir -p $HOME/.vim/plugin
 create_dotfile_link grep.vim .vim/plugin/grep.vim
 
@@ -30,6 +31,7 @@ create_dotfile_link xmonad.hs .xmonad/xmonad.hs
 create_dotfile_link_same .gdbinit
 create_dotfile_link_same .ghci
 create_dotfile_link_same .gitconfig
+create_dotfile_link_same muttrc
 
 [ ! -d $HOME/.config ] && mkdir $HOME/.config
 create_dotfile_link redshift.conf .config/redshift.conf
diff --git a/xmonad.hs b/xmonad.hs
index a0ac671..bd4b2bd 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -41,7 +41,7 @@ myManageHook = insertPosition End Newer  -- insert new window at the end of the
 myKeys = [ ("<XF86AudioRaiseVolume>",  spawn "pulseaudio-ctl up")    -- volume up
          , ("<XF86AudioLowerVolume>",  spawn "pulseaudio-ctl down")  -- volume down
          , ("<XF86AudioMute>",         spawn "pulseaudio-ctl mute")  -- volume mute
-         , ("<XF86MonBrightnessUp>",   spawn "xbacklight -inc 5")    -- backlight up
-         , ("<XF86MonBrightnessDown>", spawn "xbacklight -dec 5")    -- backlight down
+         , ("<XF86MonBrightnessUp>",   spawn "light -A 5")    -- backlight up
+         , ("<XF86MonBrightnessDown>", spawn "light -U 5")    -- backlight down
          , ("<XF86ScreenSaver>",       spawn "slock")                -- lock screen
          ]