aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkatherine <shmibs@shmibbles.me>2017-02-19 00:05:04 -0700
committerkatherine <shmibs@shmibbles.me>2017-02-19 00:05:04 -0700
commit01cc1fd9f8d3484451fb33dc06d3eb76622dd7e0 (patch)
tree4c66447468cfd39bfeafdcb98b93c54de131f73f
parentd308281c01c9fc1ab4276dbccf6c411640379c49 (diff)
downloaddotfiles-01cc1fd9f8d3484451fb33dc06d3eb76622dd7e0.tar.gz
rearrange .zshrc modularity and switch to nvim
-rwxr-xr-x.config/herbstluftwm/autostart4
-rw-r--r--.vimrc9
-rw-r--r--.zshrc30
-rw-r--r--.zshrc-freebsd5
-rw-r--r--.zshrc-linux8
-rw-r--r--.zshrc-linux-desktop18
6 files changed, 41 insertions, 33 deletions
diff --git a/.config/herbstluftwm/autostart b/.config/herbstluftwm/autostart
index 01c99a2..1432460 100755
--- a/.config/herbstluftwm/autostart
+++ b/.config/herbstluftwm/autostart
@@ -143,7 +143,7 @@ hc keybind Mod4-Shift-Control-w spawn urxvtc -name "ranger" -e ranger ~/doc
# grab colour to clipboard
hc keybind Mod4-c spawn ~/.config/herbstluftwm/colourgrab.sh
-hc keybind Mod4-Shift-n spawn urxvtc -name "notes" -e vim ~/notes
+hc keybind Mod4-Shift-n spawn urxvtc -name "notes" -e $EDITOR ~/notes
# spawn
hc keybind Mod4-Return spawn urxvtc
@@ -157,7 +157,7 @@ hc keybind Mod4-Shift-m spawn mathematica
hc keybind Mod4-Shift-o spawn ~/stuffs/tor/start-tor-browser
hc keybind Mod4-Shift-p spawn urxvtc -e pms
hc keybind Mod4-Shift-t spawn transmission-gtk
-hc keybind Mod4-Shift-v spawn urxvtc -name "vim" -e vim
+hc keybind Mod4-Shift-v spawn urxvtc -name "$EDITOR" -e $EDITOR
hc keybind Mod4-Shift-w spawn urxvtc -name "weechat" -e weechat
# dmenu
diff --git a/.vimrc b/.vimrc
index 0f40cd0..9f38f20 100644
--- a/.vimrc
+++ b/.vimrc
@@ -46,9 +46,6 @@ Plugin 'dermusikman/sonicpi.vim'
Plugin 'tomtom/tcomment_vim'
-Plugin 'SirVer/ultisnips'
-Plugin 'kiith-sa/DSnips'
-
call vundle#end()
@@ -65,12 +62,6 @@ nmap ga <Plug>(EasyAlign)
"timeout on keycodes to prevent fcitx-switcher from lagging
set ttimeoutlen=100
-"vertical split ultisnips edit
-let g:UltiSnipsEditSplit="vertical"
-
-let g:UltiSnipsJumpForwardTrigger="<c-f>"
-let g:UltiSnipsJumpBackwardTrigger="<c-b>"
-
"lightline colours. modded from 16color
function! s:Lightline_palette_init()
let l:black = [ '#000000', 0 ]
diff --git a/.zshrc b/.zshrc
index e538f5c..8426fab 100644
--- a/.zshrc
+++ b/.zshrc
@@ -111,7 +111,37 @@ bindkey '^U' backward-kill-line
bindkey '^P' up-history
bindkey '^N' down-history
+################### ALIASES ##################
+
+alias :q='exit'
+
+if [[ "$(whence vim)" != "" ]] then
+ export EDITOR='vim'
+ alias svim='sudo -E vim'
+ alias svimdiff='sudo -E vim -d'
+fi
+
+if [[ "$(whence nvim)" != "" ]] then
+ alias svim='sudo -E nvim'
+ alias svimdiff='sudo -E nvim -d'
+ alias vim='nvim'
+ export EDITOR='nvim'
+fi
+
+[[ "$(whence sdcv)" != "" ]] && alias def='sdcv'
+[[ "$(whence mpv)" != "" ]] && alias dvd='mpv --deinterlace=yes dvd://'
+[[ "$(whence herbstclient)" != "" ]] && alias hc='herbstclient'
+[[ "$(whence aiksaurus)" != "" ]] && alias thesaurus='aiksaurus'
+[[ "$(whence ag)" != "" ]] && alias ag='ag --color-match "1;34"'
+[[ "$(whence latex)" != "" ]] && alias latex='latex -output-format=pdf'
+
+if [[ "$(whence udevil)" != "" ]] then
+ alias vmount='udevil mount'
+ alias vumount='udevil umount'
+fi
+
################# OS SPECIFIC #################
+
case $(uname) in
FreeBSD)
source ~/.zshrc-freebsd
diff --git a/.zshrc-freebsd b/.zshrc-freebsd
index 04cc950..7292e28 100644
--- a/.zshrc-freebsd
+++ b/.zshrc-freebsd
@@ -4,12 +4,7 @@ alias ll='ls -lGh'
alias grep='grep --color=auto'
alias diff='colordiff'
alias less='less -R'
-alias ag='ag --color-match "1;34"'
-alias svim='sudo -E vim'
-alias :q='exit'
-
-export EDITOR="vim"
export PAGER="less -R"
################## FUNCTIONS ##################
diff --git a/.zshrc-linux b/.zshrc-linux
index b5de6cd..904ee51 100644
--- a/.zshrc-linux
+++ b/.zshrc-linux
@@ -1,16 +1,12 @@
################### ALIASES ##################
-alias ag='ag --color-match "1;34"'
+
alias diff='colordiff'
alias grep='grep --color=auto'
-alias latex='latex -output-format=pdf'
alias less='less -R'
alias ls='ls --color=auto'
alias ll='ls -lh --color=auto'
-alias :q='exit'
-
-export EDITOR="vim"
-export PAGER="less -R"
+export PAGER='less -R'
################## FUNCTIONS ##################
diff --git a/.zshrc-linux-desktop b/.zshrc-linux-desktop
index c2701df..ec2a5fb 100644
--- a/.zshrc-linux-desktop
+++ b/.zshrc-linux-desktop
@@ -1,17 +1,13 @@
################### ALIASES ##################
-alias def='sdcv'
-alias dvd='mpv --deinterlace=yes dvd://'
-alias hc='herbstclient'
+
alias ssh-socks='ssh -C2qTnN -D 9853 shmibbles.me'
-alias svim='sudo -E vim'
-alias svimdiff='sudo -E vimdiff'
alias sx='startx'
-alias thesaurus='aiksaurus'
-alias vmount='udevil mount'
-alias vumount='udevil umount'
-alias smounth='mkdir -p ~/shmibbles.me; sshfs shmibbles.me: ~/shmibbles.me'
-alias smountw='mkdir -p ~/shmibbles.me; sshfs shmibbles.me:/usr/local/www/apache24/data/ ~/shmibbles.me'
-alias sumount='fusermount -u ~/shmibbles.me; rmdir ~/shmibbles.me'
+
+if [[ "$(whence sshfs)" != "" ]] then
+ alias smounth='mkdir -p ~/shmibbles.me; sshfs shmibbles.me: ~/shmibbles.me'
+ alias smountw='mkdir -p ~/shmibbles.me; sshfs shmibbles.me:/usr/local/www/apache24/data/ ~/shmibbles.me'
+ alias sumount='fusermount -u ~/shmibbles.me; rmdir ~/shmibbles.me'
+fi
################## FUNCTIONS ##################