From 857df2740a85a116af13d60f2e64c5c63eaba038 Mon Sep 17 00:00:00 2001 From: Michael Zhang Date: Sat, 9 May 2020 01:42:34 -0500 Subject: [PATCH] update --- dot_config/aerc/aerc.conf | 3 +++ dot_config/nvim/coc-settings.json | 18 ++++++++++++- dot_config/nvim/coc.vim | 2 ++ dot_config/nvim/init.vim | 4 +++ dot_config/sway/config | 1 + dot_config/waybar/config | 22 +++++++++++++--- dot_config/waybar/style.css | 33 ++++++++++++++++++++++++ dot_local/scripts/executable_passmenu.sh | 8 +++--- dot_pam_environment | 2 ++ dot_zshrc | 8 +++++- private_dot_gnupg/.keep | 0 private_dot_gnupg/gpg-agent.conf | 3 +++ 12 files changed, 94 insertions(+), 10 deletions(-) create mode 100644 dot_config/waybar/style.css create mode 100644 dot_pam_environment create mode 100644 private_dot_gnupg/.keep create mode 100644 private_dot_gnupg/gpg-agent.conf diff --git a/dot_config/aerc/aerc.conf b/dot_config/aerc/aerc.conf index 9233b0b..357ee79 100644 --- a/dot_config/aerc/aerc.conf +++ b/dot_config/aerc/aerc.conf @@ -1,3 +1,6 @@ +[compose] +editor=nvim + [filters] subject,~^\[PATCH=awk -f /usr/share/aerc/filters/hldiff text/*=awk -f /usr/share/aerc/filters/plaintext diff --git a/dot_config/nvim/coc-settings.json b/dot_config/nvim/coc-settings.json index 11d56ca..6449dc4 100644 --- a/dot_config/nvim/coc-settings.json +++ b/dot_config/nvim/coc-settings.json @@ -1,4 +1,20 @@ { - "python.jediEnabled": false + "python.jediEnabled": false, + "languageserver": { + "ocaml": { + "command": "opam", + "args": [ + "config", + "exec", + "--", + "ocaml-language-server", + "--stdio" + ], + "filetypes": [ + "ocaml", + "reason" + ] + } + } } diff --git a/dot_config/nvim/coc.vim b/dot_config/nvim/coc.vim index 83538c8..e80e3a7 100644 --- a/dot_config/nvim/coc.vim +++ b/dot_config/nvim/coc.vim @@ -16,6 +16,8 @@ function! s:show_documentation() endif endfunction +command! -nargs=0 Format :call CocAction('format') + " Binds nnoremap K :call show_documentation() nnoremap a :CocList diagnostics diff --git a/dot_config/nvim/init.vim b/dot_config/nvim/init.vim index 43dc1a1..277859d 100644 --- a/dot_config/nvim/init.vim +++ b/dot_config/nvim/init.vim @@ -46,6 +46,9 @@ set cursorline set hidden set modeline set modelines=5 +set tabstop=4 +set shiftwidth=4 +set expandtab syntax on filetype on @@ -61,6 +64,7 @@ imap kj imap ;; :wi nmap :TagbarToggle +nmap ;; :w " let g:LanguageClient_serverCommands = { " \ 'rust': ['rust-analyzer'], diff --git a/dot_config/sway/config b/dot_config/sway/config index 662bda1..b2fe1b1 100644 --- a/dot_config/sway/config +++ b/dot_config/sway/config @@ -7,6 +7,7 @@ for_window [class=".*"] opacity $opacity for_window [app_id=".*"] opacity $opacity # STARTUP +exec --no-startup-id swaybg --image /home/michael/Pictures/celeste-wallpaper.jpg exec --no-startup-id mpd exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork exec --no-startup-id waybar diff --git a/dot_config/waybar/config b/dot_config/waybar/config index 4b4da48..3fc9e31 100644 --- a/dot_config/waybar/config +++ b/dot_config/waybar/config @@ -8,16 +8,32 @@ "modules-right": ["mpd", "disk", "network", "pulseaudio", "clock", "tray"], "disk": { - "format": "DISK: {percentage_free}%" + "format": "💽{percentage_free}%" }, "clock": { - "format": "{:%m-%d / %H:%M}", + "format": "📅 {:%m-%d / %H:%M}", "tooltip-format": "{:%Y %B}\n{calendar}" }, + "network": { + "format-ethernet": "🖥️ {ifname}: {ipaddr}/{cidr}", + "format-wifi": " {essid} ({signalStrength}%)" + }, + "pulseaudio": { - "format": "VOL {volume}%", + "format": "{icon} {volume}%", + "format-bluetooth": "{icon} {volume}%", + "format-muted": "", + "format-icons": { + "headphones": "", + "handsfree": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["", ""] + }, "on-click": "pavucontrol" } } diff --git a/dot_config/waybar/style.css b/dot_config/waybar/style.css new file mode 100644 index 0000000..9239158 --- /dev/null +++ b/dot_config/waybar/style.css @@ -0,0 +1,33 @@ +* { + border: none; + border-radius: 0; + font-family: Roboto, Helvetica, Arial, sans-serif; + font-size: 13px; + min-height: 0; +} + +window#waybar { + background: -gtk-gradient( + linear, + left bottom, + left top, + from(rgba(0, 0, 0, 0.9)), + to(rgba(0, 0, 0, 0.6)) + ); +} + +#workspaces button { + padding: 0 5px; + border-bottom: 2px solid transparent; + background: transparent; +} + +#workspaces button.focused { + border-bottom: 2px solid white; +} + +#clock, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify, #tray, #mode { + padding: 0 3px; + margin: 0 2px; +} + diff --git a/dot_local/scripts/executable_passmenu.sh b/dot_local/scripts/executable_passmenu.sh index c3f3f1f..faebcd7 100644 --- a/dot_local/scripts/executable_passmenu.sh +++ b/dot_local/scripts/executable_passmenu.sh @@ -17,8 +17,6 @@ password=$(printf '%s\n' "${password_files[@]}" | rofi -dmenu -levenshtein-sort [[ -n $password ]] || exit -if [[ $typeit -eq 0 ]]; then - pass show -c "$password" 2>/dev/null -else - xdotool - <<<"type --clearmodifiers -- $(pass show "$password" | head -n 1)" -fi +pass show -c1 "$password" 2>/dev/null +xclip -o -sel clip | wl-copy + diff --git a/dot_pam_environment b/dot_pam_environment new file mode 100644 index 0000000..2e31e89 --- /dev/null +++ b/dot_pam_environment @@ -0,0 +1,2 @@ +SSH_AGENT_PID DEFAULT= +SSH_AUTH_SOCK DEFAULT="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh" diff --git a/dot_zshrc b/dot_zshrc index d143ee4..d50317c 100644 --- a/dot_zshrc +++ b/dot_zshrc @@ -20,11 +20,17 @@ export PATH="$HOME/.local/scripts:$HOME/.dotnet/tools:$PATH:$HOME/go/bin" [[ -s /home/michael/.autojump/etc/profile.d/autojump.sh ]] && source /home/michael/.autojump/etc/profile.d/autojump.sh autoload -U compinit && compinit -u - # opam configuration test -r /home/michael/.opam/opam-init/init.zsh && . /home/michael/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true +# ssh +unset SSH_AGENT_PID +if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then + export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)" +fi + # aliases +alias subl="nvim" alias rm="garbage put" alias cm="chezmoi" alias jrnl=" jrnl" diff --git a/private_dot_gnupg/.keep b/private_dot_gnupg/.keep new file mode 100644 index 0000000..e69de29 diff --git a/private_dot_gnupg/gpg-agent.conf b/private_dot_gnupg/gpg-agent.conf new file mode 100644 index 0000000..9c5863a --- /dev/null +++ b/private_dot_gnupg/gpg-agent.conf @@ -0,0 +1,3 @@ +enable-ssh-support +pinentry-program /usr/bin/pinentry-qt +