diff --git a/alacritty.yml b/alacritty.yml index a896e33..78de8fa 100644 --- a/alacritty.yml +++ b/alacritty.yml @@ -51,35 +51,69 @@ window: # Colors (Solarized Light) +# colors: + # # Default colors + # primary: + # background: '0xfdf6e3' # base3 + # foreground: '0x657b83' # base00 +# + # # Cursor colors + # cursor: + # text: '0xfdf6e3' # base3 + # cursor: '0x657b83' # base00 +# + # # Normal colors + # normal: + # black: '0x073642' # base02 + # red: '0xdc322f' # red + # green: '0x859900' # green + # yellow: '0xb58900' # yellow + # blue: '0x268bd2' # blue + # magenta: '0xd33682' # magenta + # cyan: '0x2aa198' # cyan + # white: '0xeee8d5' # base2 +# + # # Bright colors + # bright: + # black: '0x002b36' # base03 + # red: '0xcb4b16' # orange + # green: '0x586e75' # base01 + # yellow: '0x657b83' # base00 + # blue: '0x839496' # base0 + # magenta: '0x6c71c4' # violet + # cyan: '0x93a1a1' # base1 + # white: '0xfdf6e3' # base3 +# +# colors: - # Default colors + primary: - background: '0xfdf6e3' # base3 - foreground: '0x657b83' # base00 + background: '#282a36' + foreground: '#eff0eb' - # Cursor colors cursor: - text: '0xfdf6e3' # base3 - cursor: '0x657b83' # base00 + cursor: '#97979b' + + selection: + text: '#282a36' + background: '#feffff' - # Normal colors normal: - black: '0x073642' # base02 - red: '0xdc322f' # red - green: '0x859900' # green - yellow: '0xb58900' # yellow - blue: '0x268bd2' # blue - magenta: '0xd33682' # magenta - cyan: '0x2aa198' # cyan - white: '0xeee8d5' # base2 + black: '#282a36' + red: '#ff5c57' + green: '#5af78e' + yellow: '#f3f99d' + blue: '#57c7ff' + magenta: '#ff6ac1' + cyan: '#9aedfe' + white: '#f1f1f0' - # Bright colors bright: - black: '0x002b36' # base03 - red: '0xcb4b16' # orange - green: '0x586e75' # base01 - yellow: '0x657b83' # base00 - blue: '0x839496' # base0 - magenta: '0x6c71c4' # violet - cyan: '0x93a1a1' # base1 - white: '0xfdf6e3' # base3 + black: '#686868' + red: '#ff5c57' + green: '#5af78e' + yellow: '#f3f99d' + blue: '#57c7ff' + magenta: '#ff6ac1' + cyan: '#9aedfe' + white: '#eff0eb' diff --git a/gitconfig b/gitconfig index b6e1b1b..e15c5dd 100644 --- a/gitconfig +++ b/gitconfig @@ -1,5 +1,5 @@ [core] - excludesfile = /Users/janwirth/.gitignore + excludesfile = /Users/janwirth-private/.gitignore ignorecase = false pager = diff-so-fancy | less --tabs=4 -RFX [user] diff --git a/kakrc b/kakrc index b587868..4173fc1 100644 --- a/kakrc +++ b/kakrc @@ -23,10 +23,11 @@ hook global NormalKey y|d|c %{ nop %sh{ printf %s "$kak_main_reg_dquote" | pbcopy }} -map global user p 'xsel clipboard' -# map global user p 'pbpaste' +# map global user p 'xsel clipboard' +map global user p 'pbpaste' map global user n ':buffer-next' +map global user s ':write' # paste large stuff from clipboard # extract rule from parse tree in latex tikz tree syntax @@ -41,7 +42,7 @@ map global user o F:H:b%{reg{.} hook global BufCreate .vue %{ set buffer filetype xml } hook global BufCreate .*.elm %{ set buffer filetype haskell } -hook global BufCreate .*.purs %{ set buffer filetype haskell } +# hook global BufCreate .*.purs %{ set buffer filetype haskell } hook global BufCreate .*.(es6|tsx?) %{ set buffer filetype javascript } # hook global BufCreate .*.js %{ rename-buffer 💩} diff --git a/zshrc b/zshrc index 46826a7..d349596 100644 --- a/zshrc +++ b/zshrc @@ -1,4 +1,7 @@ # If you come from bash you might have to change your $PATH. + + +ZSH_DISABLE_COMPFIX=true export PATH=$HOME/.npm/bin:$PATH export PATH=$HOME/.local/bin:$PATH export FPATH=$FPATH:/usr/local/share/zsh-navigation-tools @@ -114,7 +117,7 @@ zstyle ':completion::complete:n-kill::bits' matcher 'r:|=** l:|=*' ### END ### ### MY STUFF -alias kak=hx +# alias kak=hx alias ga="git add" alias amend="git commit --amend --no-edit" @@ -217,4 +220,4 @@ if [ -f '/Users/janwirth/google-cloud-sdk/path.zsh.inc' ]; then . '/Users/janwir # The next line enables shell command completion for gcloud. if [ -f '/Users/janwirth/google-cloud-sdk/completion.zsh.inc' ]; then . '/Users/janwirth/google-cloud-sdk/completion.zsh.inc'; fi -/usr/local/share/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh \ No newline at end of file +/usr/local/share/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh