From 01620abab3f380e21f125023e7ac08ffc4d1da6f Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Sat, 9 Mar 2019 11:07:45 +0100 Subject: [PATCH] steady forward motion --- .config/alacritty/alacritty-light.yml | 2 +- .config/nvim/coc-settings.json | 17 +++++++++++++++++ .config/nvim/colors/dln-light.vim | 4 ++-- .config/redshift.conf | 2 +- .config/rofi/config | 4 +++- .config/systemd/user/vbox-clipboard.service | 8 -------- .xinitrc | 8 +------- .zshrc | 8 +++++++- bin/dwm | Bin 55128 -> 55152 bytes 9 files changed, 32 insertions(+), 21 deletions(-) delete mode 100644 .config/systemd/user/vbox-clipboard.service 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 3939155c7e1c2d7e86c140bb745eb307170baa8e..1cb6f0b7fb239d39c971499b7bac85a63e9c8231 100755 GIT binary patch delta 4611 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