diff --git a/editor/nvim/config/init.vim b/editor/nvim/config/init.vim index d54a2e3..0e24300 100644 --- a/editor/nvim/config/init.vim +++ b/editor/nvim/config/init.vim @@ -49,6 +49,7 @@ Plug 'Shougo/deoplete.nvim', { 'do': function('DoRemote') } " autocomplete let g:deoplete#enable_at_startup = 1 Plug 'scrooloose/syntastic' " syntax checker +Plug 'freitass/todo.txt-vim' " syntax checker Plug 'bkad/CamelCaseMotion' " camel case and underscore word movements Plug 'LargeFile' " gracefully handle very large files Plug 'tpope/vim-commentary' " toggle comments in code easily diff --git a/env/sh/bashrc b/env/sh/bashrc index d761c41..1ad0ca9 100644 --- a/env/sh/bashrc +++ b/env/sh/bashrc @@ -33,6 +33,7 @@ if [ -t 0 ]; then alias .....="cd ../../../.." alias ......="cd ../../../../.." alias todo="todo.sh" + alias td="todo" # tmux aliases alias tmux='TERM=screen-256color-bce tmux' # syntax higlighting for vim in tmux @@ -179,6 +180,5 @@ if [ -t 0 ]; then set -o vi # except we still want some things to work the old fashioned way - bind '"\C-p": history-search-backward' - bind '"\C-n": history-search-forward' + bind -f "$HOME/.inputrc" fi diff --git a/env/sh/inputrc b/env/sh/inputrc index 1cb6b03..2713052 100644 --- a/env/sh/inputrc +++ b/env/sh/inputrc @@ -1,6 +1,6 @@ "\eOd": backward-word "\eOc": forward-word - -$if editing-mode=vi - "\C-p": history-search-backward -$endif +"\C-p": history-search-backward +"\C-n": history-search-forward +"\C-a": beginning-of-line +"\C-e": end-of-line diff --git a/env/sh/tmux.conf b/env/sh/tmux.conf index 06e8981..19de3ca 100644 --- a/env/sh/tmux.conf +++ b/env/sh/tmux.conf @@ -65,10 +65,10 @@ set -g @plugin 'tmux-plugins/tmux-sessionist' # plugin options # enable continuum -set -g @continuum-restore 'on' +set -g @continuum-restore 'off' # let continuum startup on boot -set -g @continuum-boot 'on' +set -g @continuum-boot 'off' # initialize tmux plugin manager run '~/.tmux/plugins/tpm/tpm' diff --git a/os/arch_linux/email.bash b/os/arch_linux/email.bash index baf9fa7..621c5b6 100755 --- a/os/arch_linux/email.bash +++ b/os/arch_linux/email.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd) +DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd) source $DIR/variables.bash pacaur -S \ diff --git a/os/arch_linux/fonts.bash b/os/arch_linux/fonts.bash index 82f80f8..f6f6c42 100755 --- a/os/arch_linux/fonts.bash +++ b/os/arch_linux/fonts.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd) +DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd) source $DIR/variables.bash # sign keys for infinality diff --git a/os/arch_linux/gmusic.bash b/os/arch_linux/gmusic.bash index 458a91f..b2d58df 100755 --- a/os/arch_linux/gmusic.bash +++ b/os/arch_linux/gmusic.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd) +DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd) source $DIR/variables.bash sudo pacman -S mplayer --noconfirm diff --git a/os/arch_linux/music.bash b/os/arch_linux/music.bash index e1e2b14..6b7c8ce 100755 --- a/os/arch_linux/music.bash +++ b/os/arch_linux/music.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd) +DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd) source $DIR/variables.bash pacaur -S \ diff --git a/os/arch_linux/neovim.bash b/os/arch_linux/neovim.bash index 4c6175f..4f92989 100755 --- a/os/arch_linux/neovim.bash +++ b/os/arch_linux/neovim.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd) +DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd) source "$DIR/variables.bash" sudo pacman -S cmake vim unzip python2 python2-pip python python-pip xsel xclip --noconfirm diff --git a/os/arch_linux/pacaur.bash b/os/arch_linux/pacaur.bash index b402b5d..041f6b6 100755 --- a/os/arch_linux/pacaur.bash +++ b/os/arch_linux/pacaur.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd) +DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd) source "$DIR/variables.bash" sudo pacman -S curl openssl perl expac yajl --noconfirm diff --git a/os/arch_linux/shell.bash b/os/arch_linux/shell.bash index e224cf3..9a67162 100755 --- a/os/arch_linux/shell.bash +++ b/os/arch_linux/shell.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd) +DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd) source "$DIR/variables.bash" sudo pacman -S tmux --noconfirm diff --git a/os/arch_linux/todo.bash b/os/arch_linux/todo.bash new file mode 100755 index 0000000..369e79a --- /dev/null +++ b/os/arch_linux/todo.bash @@ -0,0 +1,27 @@ +#!/usr/bin/env bash + +DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd) +source $DIR/variables.bash + +pacaur -S \ + todotxt-git \ + --noconfirm --noedit + +if [ ! -f "$HOME/.todo/config" ]; then + cp /usr/share/todotxt/todo.cfg ~/.todo/config + vim "$HOME/.todo/config" +fi + +mkdir -p "$HOME/.todo.actions.d" + +curl -L http://github.com/fnd/todo.txt-cli/raw/extensions/commit > "$HOME/.todo.actions.d/commit" +curl -L https://raw.github.com/crobinsonut/todo_distributed/master/push > "$HOME/.todo.actions.d/push" +curl -L https://raw.github.com/crobinsonut/todo_distributed/master/pull > "$HOME/.todo.actions.d/pull" +curl -L https://raw.github.com/crobinsonut/todo_distributed/master/sync > "$HOME/.todo.actions.d/sync" +curl -L http://github.com/mbrubeck/todo.txt-cli/raw/master/todo.actions.d/edit > "$HOME/.todo.actions.d/edit" + +chmod +x "$HOME/.todo.actions.d/commit" +chmod +x "$HOME/.todo.actions.d/pull" +chmod +x "$HOME/.todo.actions.d/push" +chmod +x "$HOME/.todo.actions.d/sync" +chmod +x "$HOME/.todo.actions.d/edit" diff --git a/os/arch_linux/utils.bash b/os/arch_linux/utils.bash index d86bdae..b11e74a 100755 --- a/os/arch_linux/utils.bash +++ b/os/arch_linux/utils.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd) +DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd) source $DIR/variables.bash sudo pacman -S \ diff --git a/os/arch_linux/wm.bash b/os/arch_linux/wm.bash index b357d00..2755e41 100755 --- a/os/arch_linux/wm.bash +++ b/os/arch_linux/wm.bash @@ -1,6 +1,6 @@ #!/usr/bin/env bash -DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/.." && pwd) +DIR=$(cd "$(dirname "${BASH_SOURCE[0]}" )/../.." && pwd) source "$DIR/variables.bash" sudo pacman -S xcb-util xcb-util-keysyms xcb-util-wm xorg-xrandr xdotool feh --noconfirm