commit f39b48743ce9596620ea72088678b7b412d19cf3
parent 5a2bcca0613c54812eac4f5bd1126973433ffeaa
Author: jacob <jacobdoeslinux@protonmail.com>
Date: Sun, 24 Nov 2019 18:59:09 -0800
Merge branch 'master' of https://github.com/jacobsGit/dotfiles
Diffstat:
3 files changed, 53 insertions(+), 10 deletions(-)
diff --git a/vim/.vimrc b/vim/.vimrc
@@ -12,14 +12,11 @@ Plugin 'junegunn/limelight.vim'
Plugin 'sainnhe/edge'
Plugin 'kkpmw/sacredforest-vim'
Plugin 'davidbeckingsale/writegood.vim'
-
Plugin 'rhysd/vim-clang-format'
Plugin 'kovetskiy/vim-bash'
-
Plugin 'ap/vim-css-color'
Plugin 'm1foley/vim-expresso'
" Plugin 'vim-airline/vim-airline'
-
Plugin 'mbbill/undotree'
Plugin 'severin-lemaignan/vim-minimap'
call vundle#end() " required
@@ -42,6 +39,9 @@ set incsearch
set ignorecase
set nowrap
+:map <f9> zm
+:map <f10> zn
+:map <f11> za
let &t_ut=''
colorscheme edge
diff --git a/xmonad/.xmonad/xmonad.errors b/xmonad/.xmonad/xmonad.errors
@@ -1,6 +1,6 @@
xmonad.hs:21:16: warning: [-Wdeprecations]
- In the use of ‘defaultConfig’
+ In the use of `defaultConfig'
(imported from XMonad, but defined in XMonad.Config):
Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
|
@@ -8,7 +8,7 @@ xmonad.hs:21:16: warning: [-Wdeprecations]
| ^^^^^^^^^^^^^
xmonad.hs:79:101: warning: [-Wdeprecations]
- In the use of ‘defaultConfig’
+ In the use of `defaultConfig'
(imported from XMonad, but defined in XMonad.Config):
Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
|
@@ -16,7 +16,7 @@ xmonad.hs:79:101: warning: [-Wdeprecations]
| ^^^^^^^^^^^^^
xmonad.hs:80:131: warning: [-Wdeprecations]
- In the use of ‘defaultConfig’
+ In the use of `defaultConfig'
(imported from XMonad, but defined in XMonad.Config):
Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
|
@@ -24,7 +24,7 @@ xmonad.hs:80:131: warning: [-Wdeprecations]
| ^^^^^^^^^^^^^
xmonad.hs:81:101: warning: [-Wdeprecations]
- In the use of ‘defaultConfig’
+ In the use of `defaultConfig'
(imported from XMonad, but defined in XMonad.Config):
Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
|
@@ -32,7 +32,7 @@ xmonad.hs:81:101: warning: [-Wdeprecations]
| ^^^^^^^^^^^^^
xmonad.hs:93:82: warning: [-Wdeprecations]
- In the use of ‘defaultConfig’
+ In the use of `defaultConfig'
(imported from XMonad, but defined in XMonad.Config):
Deprecated: "Use def (from Data.Default, and re-exported by XMonad and XMonad.Config) instead."
|
diff --git a/zsh/.zshrc b/zsh/.zshrc
@@ -4,6 +4,7 @@
autoload
autoload -Uz compinit
zmodload zsh/complist
+
zstyle :compinstall filename '/home/jacob/.zshrc'
zstyle ':completion:*' menu select
@@ -22,10 +23,52 @@ export EDITOR='vim'
#>keys {{{
bindkey -v
-
bindkey "^[[1;5C" forward-word #crtl+left
bindkey "^[[1;5D" backward-word #crtl+rigth
-# }}}
+
+typeset -g -A key
+
+key[Home]="${terminfo[khome]}"
+key[End]="${terminfo[kend]}"
+key[Insert]="${terminfo[kich1]}"
+key[Backspace]="${terminfo[kbs]}"
+key[Delete]="${terminfo[kdch1]}"
+key[Up]="${terminfo[kcuu1]}"
+key[Down]="${terminfo[kcud1]}"
+key[Left]="${terminfo[kcub1]}"
+key[Right]="${terminfo[kcuf1]}"
+key[PageUp]="${terminfo[kpp]}"
+key[PageDown]="${terminfo[knp]}"
+key[ShiftTab]="${terminfo[kcbt]}"
+
+# setup key accordingly
+[[ -n "${key[Home]}" ]] && bindkey -- "${key[Home]}" beginning-of-line
+[[ -n "${key[End]}" ]] && bindkey -- "${key[End]}" end-of-line
+[[ -n "${key[Insert]}" ]] && bindkey -- "${key[Insert]}" overwrite-mode
+[[ -n "${key[Backspace]}" ]] && bindkey -- "${key[Backspace]}" backward-delete-char
+[[ -n "${key[Delete]}" ]] && bindkey -- "${key[Delete]}" delete-char
+[[ -n "${key[Up]}" ]] && bindkey -- "${key[Up]}" up-line-or-history
+[[ -n "${key[Down]}" ]] && bindkey -- "${key[Down]}" down-line-or-history
+[[ -n "${key[Left]}" ]] && bindkey -- "${key[Left]}" backward-char
+[[ -n "${key[Right]}" ]] && bindkey -- "${key[Right]}" forward-char
+[[ -n "${key[PageUp]}" ]] && bindkey -- "${key[PageUp]}" beginning-of-buffer-or-history
+[[ -n "${key[PageDown]}" ]] && bindkey -- "${key[PageDown]}" end-of-buffer-or-history
+[[ -n "${key[ShiftTab]}" ]] && bindkey -- "${key[ShiftTab]}" reverse-menu-complete
+
+# Finally, make sure the terminal is in application mode, when zle is
+# active. Only then are the values from $terminfo valid.
+if (( ${+terminfo[smkx]} && ${+terminfo[rmkx]} )); then
+ autoload -Uz add-zle-hook-widget
+ function zle_application_mode_start {
+ echoti smkx
+ }
+ function zle_application_mode_stop {
+ echoti rmkx
+ }
+ add-zle-hook-widget -Uz zle-line-init zle_application_mode_start
+ add-zle-hook-widget -Uz zle-line-finish zle_application_mode_stop
+fi
+ # }}}
#>history {{{
HISTFILE=~/.histfile