diff --git a/git/.gitconfig b/git/.gitconfig index e9493c4..f4cc208 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -12,4 +12,4 @@ ui = true [credential] - helper = /usr/lib/git-core/git-credential-gnome-keyring + helper = /usr/lib/git-core/git-credential-libsecret diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index e912805..afa6a45 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -13,7 +13,7 @@ call plug#begin('~/.dotfiles/nvim/.config/nvim/plugged') Plug 'junegunn/fzf', {'do': './install --bin'} Plug 'junegunn/fzf.vim' Plug 'tpope/vim-fugitive' - " @todo Is this really usefull + " @todo Is this really useful Plug 'ConradIrwin/vim-bracketed-paste' Plug 'prabirshrestha/async.vim' diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 0fcb51e..c63f30a 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -17,13 +17,12 @@ bind -n M-h if-shell "$is_vim" "send-keys M-h" "select-pane -L" bind -n M-j if-shell "$is_vim" "send-keys M-j" "select-pane -D" bind -n M-k if-shell "$is_vim" "send-keys M-k" "select-pane -U" bind -n M-l if-shell "$is_vim" "send-keys M-l" "select-pane -R" -bind -n M-\ if-shell "$is_vim" "send-keys M-\\" "select-pane -l" bind -n C-j new-window bind -n C-h prev bind -n C-l next -bind -n C-M-l swap-window -t +1 -bind -n C-M-h swap-window -t -1 +bind -n C-M-l swap-window -t +1 \; next +bind -n C-M-h swap-window -t -1 \; prev bind X kill-window set -g status-style "bg=colour237" diff --git a/zsh/.zcompcache/_home_tim_Projects_minecraft_hello_build_gradle b/zsh/.zcompcache/_home_tim_Projects_minecraft_hello_build_gradle new file mode 100644 index 0000000..0a0dd8f --- /dev/null +++ b/zsh/.zcompcache/_home_tim_Projects_minecraft_hello_build_gradle @@ -0,0 +1,8 @@ +gradle_group_tasks=( ${(Q)"${(z)$(<<\EO:gradle_group_tasks + +EO:gradle_group_tasks +)}"} ) +gradle_all_tasks=( ${(Q)"${(z)$(<<\EO:gradle_all_tasks + +EO:gradle_all_tasks +)}"} ) diff --git a/zsh/.zcompcache/svn-cmds b/zsh/.zcompcache/svn-cmds new file mode 100644 index 0000000..4249c73 --- /dev/null +++ b/zsh/.zcompcache/svn-cmds @@ -0,0 +1,4 @@ +_svn_cmds=( ${(Q)"${(z)$(<<\EO:_svn_cmds +'patch' ':patch:' 'status' ':status:stat:st:' 'help' ':help:?:h:' 'propdel' ':propdel:pdel:pd:' 'switch' ':switch:sw:' 'diff' ':diff:di:' 'x-shelve' ':x-shelve:' 'propget' ':propget:pget:pg:' 'changelist' ':changelist:cl:' 'x-shelf-list' ':x-shelf-list:x-shelves:' 'cat' ':cat:' 'x-shelf-log' ':x-shelf-log:' 'x-unshelve' ':x-unshelve:' 'move' ':move:mv:rename:ren:' 'unlock' ':unlock:' 'resolved' ':resolved:' 'propedit' ':propedit:pedit:pe:' 'propset' ':propset:pset:ps:' 'update' ':update:up:' 'add' ':add:' 'x-wc-copy-mods' ':x-wc-copy-mods:' 'list' ':list:ls:' 'x-shelf-drop' ':x-shelf-drop:' 'relocate' ':relocate:' 'cleanup' ':cleanup:' 'import' ':import:' 'auth' ':auth:' 'mkdir' ':mkdir:' 'blame' ':blame:praise:annotate:ann:' 'lock' ':lock:' 'proplist' ':proplist:plist:pl:' 'checkout' ':checkout:co:' 'delete' ':delete:del:remove:rm:' 'info' ':info:' 'x-shelf-save' ':x-shelf-save:' 'merge' ':merge:' 'export' ':export:' 'copy' ':copy:cp:' 'upgrade' ':upgrade:' 'mergeinfo' ':mergeinfo:' 'resolve' ':resolve:' 'revert' ':revert:' 'x-shelf-diff' ':x-shelf-diff:' 'commit' ':commit:ci:' 'x-shelf-list-by-paths' ':x-shelf-list-by-paths:' 'log' ':log:' +EO:_svn_cmds +)}"} ) diff --git a/zsh/.zcompcache/svn-log-args b/zsh/.zcompcache/svn-log-args new file mode 100644 index 0000000..2c4a522 --- /dev/null +++ b/zsh/.zcompcache/svn-log-args @@ -0,0 +1,4 @@ +args=( ${(Q)"${(z)$(<<\EO:args +'(--revision)-r+:arg:' '(-r)--revision=:arg:' '(--change)-c+:arg:' '(-c)--change=:arg:' '(--quiet)-q' '(-q)--quiet' '(--verbose)-v' '(-v)--verbose' '(--use-merge-history)-g' '(-g)--use-merge-history' '--targets=:arg:' '--stop-on-copy' '--incremental' '--xml' '(--limit)-l+:arg:' '(-l)--limit=:arg:' '--with-all-revprops' '--with-no-revprops' '--with-revprop=:arg:' '--depth=:operation depth (how far to recurse):(empty files immediates infinity)' '--diff' '--diff-cmd=:arg:' '--internal-diff' '(--extensions)-x+:arg:' '(-x)--extensions=:arg:' '--search=:arg:' '--search-and=:arg:' '--username=:arg:' '--password=:arg:' '--password-from-stdin' '--no-auth-cache' '--non-interactive' '--force-interactive' '--trust-server-cert' '--trust-server-cert-failures=:failures:_values -s , "certificate failures to ignore" "unknown-ca[unknown authority]" "cn-mismatch[hostname mismatch]" "expired[certificate expired]" "not-yet-valid[certificate not yet valid]" "other[all other failures]"' '--config-dir=:config dir:_directories' '*--config-option=: :_svn_config_options' +EO:args +)}"} ) diff --git a/zsh/.zcompcache/svn-log-usage b/zsh/.zcompcache/svn-log-usage new file mode 100644 index 0000000..107c484 --- /dev/null +++ b/zsh/.zcompcache/svn-log-usage @@ -0,0 +1 @@ +usage='usage: 1. log [PATH][@REV]' diff --git a/zsh/.zshrc b/zsh/.zshrc index 316ad23..b146a54 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -21,3 +21,4 @@ if [[ -s "${ZDOTDIR}/gitalias.zsh" ]]; then fi export GREP_COLORS="mt=01;32" +