Merge branch 'master' into nvim

8 years ago · c518ed3620
parent c6e6ca69f9 8e185c1b19
commit c518ed3620
10 changed files with 242 additions and 50 deletions
--- a/1
+++ b/1
@ -1,6 +1,5 @@
 _srcs
 log
-vendor
 tmp
 node_modules
 bower_compnents
--- a/config/nvim/leaderkeys.vim
+++ b/config/nvim/leaderkeys.vim
@ -26,3 +26,6 @@ nnoremap <leader>g /\v^[<\|=>]{7}( .*\|$)<CR>

 " paste keeping indentation
 nnoremap <leader>p p`[v`]=
+
+" toggle wrapping
+nnoremap <leader>w :set wrap! wrap?<CR>
--- a/hyper.js
+++ b/hyper.js
@ -40,15 +40,10 @@ module.exports = {
        font-weight: 500;
      }

-      .hyperterm_main {
+      .hyper_main {
        border: 0;
        border-radius: 0;
      }
-
-      .splitpane_divider {
-        background: #85678f !important;
-        border-color: #1d1f21 !important;
-      }
    `,

    // custom css to embed in the terminal window
@ -58,17 +53,10 @@ module.exports = {
          -webkit-font-smoothing: subpixel-antialiased !important;
        }
      }
-    `,
-
-    // plugins config
-    hyperclean: {
-      hideTabs: true,
-      hideFirstTabBorder: true
-    }
+    `
  },

  plugins: [
-    'hyperclean',
    'hyperterm-1password'
  ]

--- a/install/_install.sh
+++ b/install/_install.sh
@ -16,7 +16,7 @@ export PATH=/usr/local/bin:/usr/local/sbin:$PATH

 # install some neccessary brew packages
 brew install clipper
-brew install fasd
+brew install fzf
 brew install git
 brew install koekeishiya/kwm/kwm
 brew install koekeishiya/khd/khd
@ -30,9 +30,13 @@ pip3 install neovim
 curl https://raw.githubusercontent.com/Shougo/dein.vim/master/bin/installer.sh > installer.sh
 sh installer.sh ~/.config/nvim/dein

+# install fzf
+/usr/local/opt/fzf/install
+
 # this is the minimal software and fonts used
 brew cask install forklift
 brew cask install hyper
+brew cask install iterm2
 brew cask install owncloud
 brew cask install caskroom/fonts/font-hack
 brew linkapps
--- a/install/osx.sh
+++ b/install/osx.sh
@ -114,3 +114,6 @@ defaults write -g QLPanelAnimationDuration -float 0

 # deactivate stupid chrome mouse gestures
 defaults write com.google.Chrome AppleEnableSwipeNavigateWithScrolls -bool FALSE
+
+# dont show suggestions when typing l etc. multiple times
+defaults write -g ApplePressAndHoldEnabled -bool false
--- a/20
+++ b/20
@ -31,17 +31,14 @@ ralt - 2: kwmc space -t monocle
 ralt - 3: kwmc space -t float

 # set border color for different modes
-khd mode resizer color 0xffde935f
+khd mode resizer color 0xff5e8d87
 khd mode vimmode color 0xffa54242
-khd mode launcher color 0xff5e8d87

 # toggle between modes
 ralt - a: khd -e "mode activate resizer"; kwmc config border focused on;
 ralt - s: khd -e "mode activate vimmode"; kwmc config border focused on;
-ralt - d: khd -e "mode activate launcher"; kwmc config border focused on;
 resizer + ralt - a: khd -e "mode activate default"; kwmc config border focused off;
 vimmode + ralt - s: khd -e "mode activate default"; kwmc config border focused off;
-launcher + ralt - x: khd -e "mode activate default"; kwmc config border focused off;

 # resizer mode
 resizer - 1: kwmc window -c type bsp
@ -74,18 +71,3 @@ vimmode+shift - g: khd -p "alt - down"
 vimmode - x: khd -p "cmd - w"
 vimmode - q: khd -p "cmd - q"
 vimmode - 0x35: khd -e "mode activate default"; kwmc config border focused off;
-
-# basic launcher shortcuts
-launcher - q: khd -p "cmd - q"
-launcher - x: open -a /Applications/Firefox.app
-launcher - g: open -a /Applications/Google\ Chrome.app
-launcher - m: open -a /Applications/Mail.app
-launcher - 1: open -a /Applications/1Password.app
-launcher - d: open -a /Applications/Dash.app
-launcher - f: open -a /Applications/ForkLift.app
-launcher - v: open -a /Applications/MacVim.app
-launcher - i: open -a /Applications/iTunes.app
-launcher - t: open -a /Applications/Utilities/Terminal.app
-launcher - h: open -a /Applications/Hyper.app
-launcher - space: open -a /Applications/Hyper.app
-launcher - 0x35: khd -e "mode activate default"; kwmc config border focused off;
--- a/kwm/kwmrc
+++ b/kwm/kwmrc
@ -30,7 +30,7 @@ kwmc config display 1 mode monocle
 kwmc config display 1 float-dim 1200 800

 # add rules to apps that dont have tileable state by default
-# kwmc rule owner="iTerm2" properties={role="AXDialog"}
+kwmc rule owner="iTerm2" properties={role="AXDialog"}

 # blacklist applications from kwms tiling
 kwmc rule owner="1Password" properties={float="true"}
@ -48,6 +48,7 @@ kwmc rule owner="HyperTerm" properties={display="0"}
 kwmc rule owner="MacVim" properties={display="0"}
 kwmc rule owner="Safari" properties={display="0"}
 kwmc rule owner="Terminal" properties={display="0"}
+kwmc rule owner="iTerm2" properties={display="0"}

 # and those should be on the secondary display
 kwmc rule owner="Calendar" properties={display="1"}
--- a/other/Hybrid.itermcolors
+++ b/other/Hybrid.itermcolors
@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Ansi 0 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.13229149580001831</real>
+		<key>Green Component</key>
+		<real>0.12323731929063797</real>
+		<key>Red Component</key>
+		<real>0.11772859841585159</real>
+	</dict>
+	<key>Ansi 1 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.19966201484203339</real>
+		<key>Green Component</key>
+		<real>0.18515877425670624</real>
+		<key>Red Component</key>
+		<real>0.5740046501159668</real>
+	</dict>
+	<key>Ansi 10 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.33485174179077148</real>
+		<key>Green Component</key>
+		<real>0.69721812009811401</real>
+		<key>Red Component</key>
+		<real>0.65277093648910522</real>
+	</dict>
+	<key>Ansi 11 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.38143736124038696</real>
+		<key>Green Component</key>
+		<real>0.73312276601791382</real>
+		<key>Red Component</key>
+		<real>0.92229294776916504</real>
+	</dict>
+	<key>Ansi 12 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.69104295969009399</real>
+		<key>Green Component</key>
+		<real>0.56590473651885986</real>
+		<key>Red Component</key>
+		<real>0.43420237302780151</real>
+	</dict>
+	<key>Ansi 13 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.67776411771774292</real>
+		<key>Green Component</key>
+		<real>0.49912372231483459</real>
+		<key>Red Component</key>
+		<real>0.63456809520721436</real>
+	</dict>
+	<key>Ansi 14 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.65990132093429565</real>
+		<key>Green Component</key>
+		<real>0.69651854038238525</real>
+		<key>Red Component</key>
+		<real>0.47394692897796631</real>
+	</dict>
+	<key>Ansi 15 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.72799122333526611</real>
+		<key>Green Component</key>
+		<real>0.73772752285003662</real>
+		<key>Red Component</key>
+		<real>0.72378784418106079</real>
+	</dict>
+	<key>Ansi 2 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.19350560009479523</real>
+		<key>Green Component</key>
+		<real>0.51718360185623169</real>
+		<key>Red Component</key>
+		<real>0.47679561376571655</real>
+	</dict>
+	<key>Ansi 3 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.30180639028549194</real>
+		<key>Green Component</key>
+		<real>0.50180763006210327</real>
+		<key>Red Component</key>
+		<real>0.83306139707565308</real>
+	</dict>
+	<key>Ansi 4 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.54611688852310181</real>
+		<key>Green Component</key>
+		<real>0.42857363820075989</real>
+		<key>Red Component</key>
+		<real>0.3033672571182251</real>
+	</dict>
+	<key>Ansi 5 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.48750758171081543</real>
+		<key>Green Component</key>
+		<real>0.32038700580596924</real>
+		<key>Red Component</key>
+		<real>0.44386249780654907</real>
+	</dict>
+	<key>Ansi 6 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.45474731922149658</real>
+		<key>Green Component</key>
+		<real>0.48341637849807739</real>
+		<key>Red Component</key>
+		<real>0.30198413133621216</real>
+	</dict>
+	<key>Ansi 7 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.42652279138565063</real>
+		<key>Green Component</key>
+		<real>0.3944053053855896</real>
+		<key>Red Component</key>
+		<real>0.36455416679382324</real>
+	</dict>
+	<key>Ansi 8 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.19518557190895081</real>
+		<key>Green Component</key>
+		<real>0.17529888451099396</real>
+		<key>Red Component</key>
+		<real>0.16332042217254639</real>
+	</dict>
+	<key>Ansi 9 Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.32692217826843262</real>
+		<key>Green Component</key>
+		<real>0.31278485059738159</real>
+		<key>Red Component</key>
+		<real>0.74731773138046265</real>
+	</dict>
+	<key>Background Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.097707755863666534</real>
+		<key>Green Component</key>
+		<real>0.092142701148986816</real>
+		<key>Red Component</key>
+		<real>0.086937598884105682</real>
+	</dict>
+	<key>Bold Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.72941176470588232</real>
+		<key>Green Component</key>
+		<real>0.73725490196078436</real>
+		<key>Red Component</key>
+		<real>0.72156862745098038</real>
+	</dict>
+	<key>Cursor Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.72941176470588232</real>
+		<key>Green Component</key>
+		<real>0.73725490196078436</real>
+		<key>Red Component</key>
+		<real>0.72156862745098038</real>
+	</dict>
+	<key>Cursor Text Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.13528014719486237</real>
+		<key>Green Component</key>
+		<real>0.12312769144773483</real>
+		<key>Red Component</key>
+		<real>0.11772145330905914</real>
+	</dict>
+	<key>Foreground Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.72941176470588232</real>
+		<key>Green Component</key>
+		<real>0.73725490196078436</real>
+		<key>Red Component</key>
+		<real>0.72156862745098038</real>
+	</dict>
+	<key>Selected Text Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.097707755863666534</real>
+		<key>Green Component</key>
+		<real>0.092142701148986816</real>
+		<key>Red Component</key>
+		<real>0.086937598884105682</real>
+	</dict>
+	<key>Selection Color</key>
+	<dict>
+		<key>Blue Component</key>
+		<real>0.72941176470588232</real>
+		<key>Green Component</key>
+		<real>0.73725490196078436</real>
+		<key>Red Component</key>
+		<real>0.72156862745098038</real>
+	</dict>
+</dict>
+</plist>
--- a/zsh/aliases
+++ b/zsh/aliases
@ -15,16 +15,6 @@ alias ....='cd ../../..'
 alias .....='cd ../../../..'
 alias q='exit'

-# fasd
-alias a='fasd -a'        # any
-alias s='fasd -si'       # show / search / select
-alias d='fasd -d'        # directory
-alias f='fasd -f'        # file
-alias sd='fasd -sid'     # interactive directory selection
-alias sf='fasd -sif'     # interactive file selection
-alias z='fasd_cd -d'     # cd, same functionality as j in autojump
-alias zz='fasd_cd -d -i' # cd with interactive selection
-
 # suffix-aliases for file-types (zsh only)
 alias -s css=nvim
 alias -s scss=nvim
--- a/17
+++ b/17
@ -5,7 +5,7 @@ done
 unset file

 # a nice prompt
-autoload -U promptinit && promptinit
+autoload -U promptinit; promptinit
 prompt pure

 # completions
@ -64,12 +64,21 @@ source $HOME/dotfiles/zsh/zsh-completions/zsh-completions.plugin.zsh
 export CLICOLOR=1
 export LSCOLORS=gxBxhxDxfxhxhxhxhxcxcx

-# fasd
-eval "$(fasd --init auto)"
-
 # nvm
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm

 # rbenv
 eval "$(rbenv init -)"
+
+# fzf
+if [[ ! "$PATH" == */usr/local/opt/fzf/bin* ]]; then
+  export PATH="$PATH:/usr/local/opt/fzf/bin"
+fi
+
+if [[ ! "$MANPATH" == */usr/local/opt/fzf/man* && -d "/usr/local/opt/fzf/man" ]]; then
+  export MANPATH="$MANPATH:/usr/local/opt/fzf/man"
+fi
+
+[[ $- == *i* ]] && source "/usr/local/opt/fzf/shell/completion.zsh" 2> /dev/null
+source "/usr/local/opt/fzf/shell/key-bindings.zsh"