diff --git a/.config/alacritty/alacritty-light.yml b/.config/alacritty/alacritty-light.yml index f71e190..6c306e3 100644 --- a/.config/alacritty/alacritty-light.yml +++ b/.config/alacritty/alacritty-light.yml @@ -30,7 +30,7 @@ window: y: 0 # Spread additional padding evenly around the terminal content. - dynamic_padding: true + dynamic_padding: false # Window decorations # diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json index dbf51b1..897d1f6 100644 --- a/.config/nvim/coc-settings.json +++ b/.config/nvim/coc-settings.json @@ -2,6 +2,19 @@ "coc.preferences.diagnostic.errorSign": "", "coc.preferences.diagnostic.warningSign": "", "coc.preferences.noselect": false, + "json.format.enable": true, + "json.schemas": [ + { + "fileMatch": [ + "/deployment.jsonnet", + "/deployment.json" + ], + "url": "https://raw.githubusercontent.com/garethr/kubernetes-json-schema/master/v1.12.2/deployment.json" + } + ], + "yaml.schemas": { + "kubernetes": "/*.yaml" + }, "languageserver": { "bash": { "command": "bash-language-server", @@ -26,6 +39,10 @@ "command": "bingo", "rootPatterns": ["go.mod", ".vim/", ".git/", ".hg/"], "filetypes": ["go"] + }, + "jsonnet": { + "command": "jsonnet-language-server", + "filetypes": ["jsonnet"] } } } diff --git a/.config/nvim/colors/dln-light.vim b/.config/nvim/colors/dln-light.vim index e0c070e..c454499 100644 --- a/.config/nvim/colors/dln-light.vim +++ b/.config/nvim/colors/dln-light.vim @@ -341,9 +341,9 @@ call hi("Type", s:cyan_700, "", "none") call hi("Typedef", "", "", "") call hi("goDeclaration", s:deep_purple_900, "", "none") call hi("goReceiverType", s:cyan_700, "", "none") -call hi("goMethodCall", s:brown_700, "", "none") +call hi("goMethodCall", s:purple_900, "", "none") call hi("goField", s:cyan_900, "", "none") -call hi("goFunctionCall", s:blue_grey_800, "", "none") +call hi("goFunctionCall", s:deep_purple_500, "", "none") call hi("goSameId", s:green_900, "#f7f9e0", "italic") call hi("GitGutterAdd", s:light_green_500, "", "") call hi("GitGutterChange",s:light_blue_300, "", "") diff --git a/.config/redshift.conf b/.config/redshift.conf index 08d4eae..c6594b9 100644 --- a/.config/redshift.conf +++ b/.config/redshift.conf @@ -1,5 +1,5 @@ [redshift] -temp-day=3800 +temp-day=5500 temp-night=2900 brightness-day=0.99 brightness-night=0.75 diff --git a/.config/rofi/config b/.config/rofi/config index d9b3122..c1cb4c3 100644 --- a/.config/rofi/config +++ b/.config/rofi/config @@ -1,2 +1,4 @@ -rofi.font: IBM Plex Sans 16 +rofi.font: Blex Mono Regular 12 rofi.dpi: 210 +rofi.theme: solarized_alternate +rofi.columns: 1 diff --git a/.config/systemd/user/vbox-clipboard.service b/.config/systemd/user/vbox-clipboard.service deleted file mode 100644 index 6cdd8bd..0000000 --- a/.config/systemd/user/vbox-clipboard.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Start VirtualBox clipboard service - -[Service] -ExecStart=/usr/bin/VBoxClient --nodaemon --clipboard - -[Install] -WantedBy=multi-user.target diff --git a/.xinitrc b/.xinitrc index 61068e9..834e00e 100755 --- a/.xinitrc +++ b/.xinitrc @@ -1,11 +1,5 @@ #!/bin/bash -if [ -d /etc/X11/xinit/xinitrc.d ] ; then - for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do - [ -x "$f" ] && . "$f" - done - unset f -fi - +xsetroot -solid \#99aab0 xmodmap $HOME/.Xmodmap setxkbmap -option ctrl:nocaps,grp:switch,grp_led:scroll us,se alacritty -e tmux attach -t0 & diff --git a/.zshrc b/.zshrc index 0bbef0c..a12c954 100644 --- a/.zshrc +++ b/.zshrc @@ -12,6 +12,7 @@ export PATH=$HOME/bin:$PATH:/bin:/sbin:/usr/sbin:/usr/local/sbin export EDITOR=nvim export DISPLAY=:0 export GOPATH=$HOME +export GDK_SCALE=2 fpath=(~/.zsh/functions $fpath) @@ -24,6 +25,7 @@ export HISTFILE=~/.zsh_history export HISTSIZE=20000 export SAVEHIST=20000 export LPASS_AGENT_TIMEOUT=900 +export WORDCHARS='*?_-.[]~=&;!#$%^(){}<>' typeset -A ZSH_HIGHLIGHT_STYLES export ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern) @@ -241,6 +243,7 @@ export FZF_COMPLETION_TRIGGER=";" command -v kubectl >/dev/null 2>&1 && source <(kubectl completion zsh) command -v kops >/dev/null 2>&1 && source <(kops completion zsh) command -v helm >/dev/null 2>&1 && source <(helm completion zsh) +command -v ark >/dev/null 2>&1 && source <(ark completion zsh) [ -f /usr/share/bash-completion/completions/aws ] && source /usr/share/bash-completion/completions/aws [ -f /opt/google-cloud-sdk/completion.zsh.inc ] && source /opt/google-cloud-sdk/completion.zsh.inc @@ -265,9 +268,12 @@ alias vim=nvim alias xc='xclip -selection clipboard' # alias e='nvr --remote' +## PlasticSCM +export PATH="$HOME/plastic/client:$PATH" + +export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH" diff --git a/bin/dwm b/bin/dwm index 3939155..1cb6f0b 100755 Binary files a/bin/dwm and b/bin/dwm differ