Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Wirth committed Feb 2, 2022
1 parent 2506060 commit 040edc7
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 30 deletions.
82 changes: 58 additions & 24 deletions alacritty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion gitconfig
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
7 changes: 4 additions & 3 deletions kakrc
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,11 @@ hook global NormalKey y|d|c %{ nop %sh{
printf %s "$kak_main_reg_dquote" | pbcopy
}}

map global user p '<a-!>xsel <minus><minus>clipboard<ret>'
# map global user p '<a-!>pbpaste<ret>'
# map global user p '<a-!>xsel <minus><minus>clipboard<ret>'
map global user p '<a-!>pbpaste<ret>'
map global user n '<esc>:buffer-next<ret>'

map global user s ':write<ret>'

# paste large stuff from clipboard
# extract rule from parse tree in latex tikz tree syntax
Expand All @@ -41,7 +42,7 @@ map global user o F:<esc>H:b<space>%{<backspace>reg{.}<ret>

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 💩}

Expand Down
7 changes: 5 additions & 2 deletions zshrc
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"

Expand Down Expand Up @@ -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
/usr/local/share/zsh-navigation-tools/zsh-navigation-tools.plugin.zsh

0 comments on commit 040edc7

Please sign in to comment.