From 03bc6dbeed2b2a4e2f36de490837c1d38f3ff5c8 Mon Sep 17 00:00:00 2001 From: lonkaars Date: Mon, 29 Apr 2024 14:09:59 +0200 Subject: more small tweaks --- .config/coc/extensions/package.json | 5 ++-- .config/i3/autostart##template | 1 - .config/imapnotify/pipeframe.conf | 9 ++++--- .config/jellyfin-mpv-shim/scripts/set-lights.lua | 3 ++- .config/mbsyncrc | 1 - .config/neomutt/neomuttrc | 30 +++++++++++++----------- .config/nvim/init.vim | 4 +++- .config/polybar/config.ini##template | 2 +- .config/xbindkeys/main##template | 2 +- .local/share/bin/brave | 2 +- .local/share/bin/lorem | 19 +++++---------- .local/share/bin/rwall | 2 -- .local/share/mode/reload.d/wall | 3 --- .profile | 20 +++++++++++----- .zshrc | 2 ++ 15 files changed, 53 insertions(+), 52 deletions(-) delete mode 100755 .local/share/bin/rwall delete mode 100755 .local/share/mode/reload.d/wall diff --git a/.config/coc/extensions/package.json b/.config/coc/extensions/package.json index 81db5f2..6054125 100644 --- a/.config/coc/extensions/package.json +++ b/.config/coc/extensions/package.json @@ -12,9 +12,10 @@ "coc-vimtex": ">=1.1.5", "coc-lua": ">=2.0.6", "coc-deno": ">=3.13.0", - "coc-sh": ">=1.2.2" + "coc-sh": ">=1.2.2", + "coc-solargraph": ">=1.2.4" }, "disabled": [], "locked": [], - "lastUpdate": 1709404256776 + "lastUpdate": 1711896062742 } \ No newline at end of file diff --git a/.config/i3/autostart##template b/.config/i3/autostart##template index 15562d6..ea1fdd0 100755 --- a/.config/i3/autostart##template +++ b/.config/i3/autostart##template @@ -4,7 +4,6 @@ mode --no-reload restore /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & polybar & -rwall & picom & xbanish & dunst & diff --git a/.config/imapnotify/pipeframe.conf b/.config/imapnotify/pipeframe.conf index 7f6aeb9..3553ffe 100644 --- a/.config/imapnotify/pipeframe.conf +++ b/.config/imapnotify/pipeframe.conf @@ -1,12 +1,11 @@ { + "username": "loek", "host": "mail.pipeframe.xyz", "port": 993, "tls": true, "tlsOptions": { "rejectUnauthorized": true }, - "username": "loek@mail.pipeframe.xyz", - "password": "", - "passwordCmd": "keyctl request user bw_session | xargs keyctl pipe | xargs bw get password efc4ddc3-cd2d-4090-b570-abea0113217a --session", - "onNewMail": "mbsync -a", - "onNewMailPost": "notify-send 'New mail arrived'", + "passwordCmd": "pass srv/fortnite/passwd/loek", + "onNewMail": "systemctl --user start mbsync", + "onNewMailPost": "notify-send '新着メール'", "boxes": [ "Inbox" ] } diff --git a/.config/jellyfin-mpv-shim/scripts/set-lights.lua b/.config/jellyfin-mpv-shim/scripts/set-lights.lua index b454519..3a392dc 100644 --- a/.config/jellyfin-mpv-shim/scripts/set-lights.lua +++ b/.config/jellyfin-mpv-shim/scripts/set-lights.lua @@ -1,5 +1,6 @@ function on_start_file() - os.execute("scene scene.aux_eiga_moodo"); + os.execute("curl -X POST \"$HASS_SERVER/api/webhook/movie\""); end mp.register_event("start-file", on_start_file) + diff --git a/.config/mbsyncrc b/.config/mbsyncrc index d321628..bf91cab 100644 --- a/.config/mbsyncrc +++ b/.config/mbsyncrc @@ -17,7 +17,6 @@ Inbox ~/docs/mail/pipeframe/Inbox Channel pipeframe Far :pipeframe-remote: Near :pipeframe-local: -# Patterns "/Inbox" "/Drafts" "/Junk" "/Sent" "/Trash" "/Archive" Patterns * Create Both SyncState * diff --git a/.config/neomutt/neomuttrc b/.config/neomutt/neomuttrc index c6f3633..9d675c2 100644 --- a/.config/neomutt/neomuttrc +++ b/.config/neomutt/neomuttrc @@ -18,8 +18,10 @@ set smtp_pass = "$imap_pass" set smtp_url = "smtp://$imap_user@mail.pipeframe.xyz:587" set ssl_force_tls = yes -# mail check timeout +# automatically refresh incoming mail set mail_check = 60 +unset wait_key +push " systemctl --user start mbsync & " # mailboxes mailboxes +Inbox +Drafts +Junk +Sent +Trash +Archive @@ -28,7 +30,7 @@ mailboxes +Inbox +Drafts +Junk +Sent +Trash +Archive set mailcap_path = "$XDG_CONFIG_HOME/mailcap" # keybinds (more vim-like than default) -macro index,pager a "=Archive" "Archive Message" # archive +macro index,pager a "+Archive" "Archive Message" # archive bind index,pager n search-next # next search match bind index,pager N search-opposite # previous search match bind generic,index g noop # clear immediate action of `g` (required for `gg`) @@ -50,30 +52,30 @@ set auto_edit = yes set mime_type_query_command = "xdg-mime query filetype" unset prompt_after +# format strings +set status_format = "%D %> %P " +set folder_format = "%i" +set browser_abbreviate_mailboxes = yes + # external programs set editor = "$EDITOR" # set pager = "less" set sendmail = "/usr/bin/msmtp" # colors +color indicator reverse default default # selection +color index none white default # all other mail +color index bold default default "~N|~O" # new/unopened mail +uncolor status +uncolor tree +uncolor search color hdrdefault blue default color quoted blue black color signature blue black -color attachment red black +color attachment brightblack default color prompt brightmagenta black color message brightred default color error brightred black -color indicator black red -color status white default -color tree white black -# color normal white black color markers red black -color search white black color tilde brightmagenta black -color index blue black "~F" -color index red black "~N|~O" - -# switch folders -macro index i " =Inbox" -macro index h " =Archive" diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 3a46c81..5396755 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -49,7 +49,6 @@ Plug 'jiangmiao/auto-pairs' Plug 'tpope/vim-surround' Plug 'itchyny/lightline.vim' Plug 'terryma/vim-multiple-cursors' -Plug 'AndrewRadev/tagalong.vim' Plug 'liuchengxu/vim-which-key' Plug 'justinmk/vim-sneak' Plug 'mbbill/undotree' @@ -340,6 +339,9 @@ endfunc let g:markdown_enable_spell_checking = 0 au FileType markdown set expandtab +" asciidoc +au FileType asciidoctor set expandtab + " binary files augroup Binary au! diff --git a/.config/polybar/config.ini##template b/.config/polybar/config.ini##template index c6d1e76..732a221 100644 --- a/.config/polybar/config.ini##template +++ b/.config/polybar/config.ini##template @@ -133,7 +133,7 @@ tail = true [module/cal] type = custom/script -exec = khal --color list now 1h --notstarted --day-format '' --format '({start-time}) {calendar-color}{title}{reset}' | ansi2polybar +exec = now | ansi2polybar interval = 60 {% include "config.{{ yadm.hostname }}.ini" %} diff --git a/.config/xbindkeys/main##template b/.config/xbindkeys/main##template index d92edcc..7215ac7 100644 --- a/.config/xbindkeys/main##template +++ b/.config/xbindkeys/main##template @@ -1,4 +1,4 @@ -"light-locker-command -l" +"lock" Mod4 + Escape "polybar-msg cmd toggle" Mod4 + b diff --git a/.local/share/bin/brave b/.local/share/bin/brave index 10514cf..2792fe5 100755 --- a/.local/share/bin/brave +++ b/.local/share/bin/brave @@ -2,6 +2,6 @@ # the remote debugging is so brave can be hooked into by # ~/.local/share/mode/reload.d/brave. this is probaby bad for security if # you're not the only user on the system +# --remote-debugging-port=9222 \ /usr/bin/brave \ - --remote-debugging-port=9222 \ "$@" diff --git a/.local/share/bin/lorem b/.local/share/bin/lorem index 429b20f..5ef3171 100755 --- a/.local/share/bin/lorem +++ b/.local/share/bin/lorem @@ -1,19 +1,12 @@ #!/bin/sh -read -r -d '' lorem_text << EOF -Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Gravida dictum fusce ut placerat orci nulla pellentesque. Laoreet id donec ultrices tincidunt arcu. Tortor aliquam nulla facilisi cras fermentum odio eu feugiat. A scelerisque purus semper eget duis at tellus. A iaculis at erat pellentesque adipiscing commodo elit at imperdiet. Arcu bibendum at varius vel pharetra vel turpis nunc eget. Euismod in pellentesque massa placerat duis. Lorem ipsum dolor sit amet consectetur adipiscing elit. Ultrices in iaculis nunc sed augue lacus. Vestibulum mattis ullamcorper velit sed. Adipiscing diam donec adipiscing tristique risus nec feugiat in fermentum. Elit pellentesque habitant morbi tristique senectus et. Ullamcorper sit amet risus nullam eget felis eget nunc lobortis. Vestibulum sed arcu non odio. Vestibulum sed arcu non odio euismod lacinia. Maecenas pharetra convallis posuere morbi leo urna molestie at. Sit amet consectetur adipiscing elit duis tristique sollicitudin. - -Curabitur gravida arcu ac tortor dignissim convallis aenean et. Nunc sed blandit libero volutpat sed cras ornare arcu. Eu nisl nunc mi ipsum faucibus vitae aliquet nec. Vehicula ipsum a arcu cursus. Arcu felis bibendum ut tristique et. Lobortis scelerisque fermentum dui faucibus in ornare. In arcu cursus euismod quis viverra nibh cras pulvinar. Integer malesuada nunc vel risus. Elit ullamcorper dignissim cras tincidunt lobortis feugiat vivamus. Viverra nam libero justo laoreet. - -Felis bibendum ut tristique et. Neque volutpat ac tincidunt vitae semper quis. Semper feugiat nibh sed pulvinar proin gravida hendrerit. Arcu bibendum at varius vel pharetra vel turpis. Tincidunt arcu non sodales neque. Id aliquet risus feugiat in ante metus. Eget magna fermentum iaculis eu non diam. Tempor id eu nisl nunc mi ipsum. Bibendum enim facilisis gravida neque convallis a cras semper. Parturient montes nascetur ridiculus mus. Tortor pretium viverra suspendisse potenti nullam ac. Mauris vitae ultricies leo integer malesuada nunc. Integer eget aliquet nibh praesent. Lorem ipsum dolor sit amet consectetur. Sit amet consectetur adipiscing elit pellentesque habitant. Habitant morbi tristique senectus et netus et malesuada. - -Cursus metus aliquam eleifend mi in nulla posuere sollicitudin. Tincidunt dui ut ornare lectus sit amet est. Elementum curabitur vitae nunc sed velit dignissim sodales. Senectus et netus et malesuada fames ac turpis egestas sed. Scelerisque viverra mauris in aliquam sem fringilla ut. Nunc eget lorem dolor sed viverra ipsum nunc aliquet. Egestas egestas fringilla phasellus faucibus scelerisque eleifend donec. Id neque aliquam vestibulum morbi blandit cursus. Enim tortor at auctor urna nunc id cursus metus. Dignissim convallis aenean et tortor at risus viverra. Et malesuada fames ac turpis egestas. Id cursus metus aliquam eleifend mi in nulla posuere. Egestas dui id ornare arcu odio. At elementum eu facilisis sed odio. Ultrices vitae auctor eu augue ut lectus arcu bibendum at. Amet volutpat consequat mauris nunc congue nisi vitae. Enim lobortis scelerisque fermentum dui faucibus in ornare quam. - -Libero id faucibus nisl tincidunt eget. Amet risus nullam eget felis eget. Ultricies mi eget mauris pharetra. Magnis dis parturient montes nascetur ridiculus mus mauris vitae. Lectus magna fringilla urna porttitor rhoncus dolor purus. Elementum eu facilisis sed odio morbi quis commodo odio. Tincidunt vitae semper quis lectus. Sollicitudin ac orci phasellus egestas tellus rutrum tellus pellentesque eu. Pretium viverra suspendisse potenti nullam ac. Sed egestas egestas fringilla phasellus faucibus scelerisque eleifend donec. Tortor consequat id porta nibh venenatis. Elit at imperdiet dui accumsan sit amet nulla. Sem viverra aliquet eget sit. At in tellus integer feugiat scelerisque varius morbi enim. Dictum fusce ut placerat orci nulla pellentesque. Sed risus pretium quam vulputate dignissim. Tincidunt dui ut ornare lectus sit amet est placerat in. Urna nec tincidunt praesent semper feugiat. +lorem_text="$(cat << EOF +Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Gravida dictum fusce ut placerat orci nulla pellentesque. Laoreet id donec ultrices tincidunt arcu. Tortor aliquam nulla facilisi cras fermentum odio eu feugiat. A scelerisque purus semper eget duis at tellus. A iaculis at erat pellentesque adipiscing commodo elit at imperdiet. Arcu bibendum at varius vel pharetra vel turpis nunc eget. Euismod in pellentesque massa placerat duis. Lorem ipsum dolor sit amet consectetur adipiscing elit. Ultrices in iaculis nunc sed augue lacus. Vestibulum mattis ullamcorper velit sed. Adipiscing diam donec adipiscing tristique risus nec feugiat in fermentum. Elit pellentesque habitant morbi tristique senectus et. Ullamcorper sit amet risus nullam eget felis eget nunc lobortis. Vestibulum sed arcu non odio. Vestibulum sed arcu non odio euismod lacinia. Maecenas pharetra convallis posuere morbi leo urna molestie at. Sit amet consectetur adipiscing elit duis tristique sollicitudin. Curabitur gravida arcu ac tortor dignissim convallis aenean et. Nunc sed blandit libero volutpat sed cras ornare arcu. Eu nisl nunc mi ipsum faucibus vitae aliquet nec. Vehicula ipsum a arcu cursus. Arcu felis bibendum ut tristique et. Lobortis scelerisque fermentum dui faucibus in ornare. In arcu cursus euismod quis viverra nibh cras pulvinar. Integer malesuada nunc vel risus. Elit ullamcorper dignissim cras tincidunt lobortis feugiat vivamus. Viverra nam libero justo laoreet. Felis bibendum ut tristique et. Neque volutpat ac tincidunt vitae semper quis. Semper feugiat nibh sed pulvinar proin gravida hendrerit. Arcu bibendum at varius vel pharetra vel turpis. Tincidunt arcu non sodales neque. Id aliquet risus feugiat in ante metus. Eget magna fermentum iaculis eu non diam. Tempor id eu nisl nunc mi ipsum. Bibendum enim facilisis gravida neque convallis a cras semper. Parturient montes nascetur ridiculus mus. Tortor pretium viverra suspendisse potenti nullam ac. Mauris vitae ultricies leo integer malesuada nunc. Integer eget aliquet nibh praesent. Lorem ipsum dolor sit amet consectetur. Sit amet consectetur adipiscing elit pellentesque habitant. Habitant morbi tristique senectus et netus et malesuada. Cursus metus aliquam eleifend mi in nulla posuere sollicitudin. Tincidunt dui ut ornare lectus sit amet est. Elementum curabitur vitae nunc sed velit dignissim sodales. Senectus et netus et malesuada fames ac turpis egestas sed. Scelerisque viverra mauris in aliquam sem fringilla ut. Nunc eget lorem dolor sed viverra ipsum nunc aliquet. Egestas egestas fringilla phasellus faucibus scelerisque eleifend donec. Id neque aliquam vestibulum morbi blandit cursus. Enim tortor at auctor urna nunc id cursus metus. Dignissim convallis aenean et tortor at risus viverra. Et malesuada fames ac turpis egestas. Id cursus metus aliquam eleifend mi in nulla posuere. Egestas dui id ornare arcu odio. At elementum eu facilisis sed odio. Ultrices vitae auctor eu augue ut lectus arcu bibendum at. Amet volutpat consequat mauris nunc congue nisi vitae. Enim lobortis scelerisque fermentum dui faucibus in ornare quam. Libero id faucibus nisl tincidunt eget. Amet risus nullam eget felis eget. Ultricies mi eget mauris pharetra. Magnis dis parturient montes nascetur ridiculus mus mauris vitae. Lectus magna fringilla urna porttitor rhoncus dolor purus. Elementum eu facilisis sed odio morbi quis commodo odio. Tincidunt vitae semper quis lectus. Sollicitudin ac orci phasellus egestas tellus rutrum tellus pellentesque eu. Pretium viverra suspendisse potenti nullam ac. Sed egestas egestas fringilla phasellus faucibus scelerisque eleifend donec. Tortor consequat id porta nibh venenatis. Elit at imperdiet dui accumsan sit amet nulla. Sem viverra aliquet eget sit. At in tellus integer feugiat scelerisque varius morbi enim. Dictum fusce ut placerat orci nulla pellentesque. Sed risus pretium quam vulputate dignissim. Tincidunt dui ut ornare lectus sit amet est placerat in. Urna nec tincidunt praesent semper feugiat. EOF +)" -if [[ $1 = "" ]]; then - echo $lorem_text +if [ -z "$1" ]; then + echo "$lorem_text" else - echo $lorem_text | cut -f1-$1 --delimiter=" " + echo "$lorem_text" | cut -f1-$1 --delimiter=" " fi diff --git a/.local/share/bin/rwall b/.local/share/bin/rwall deleted file mode 100755 index ac271cc..0000000 --- a/.local/share/bin/rwall +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -bgcol "$(xrdb -get background)" diff --git a/.local/share/mode/reload.d/wall b/.local/share/mode/reload.d/wall deleted file mode 100755 index f6c2e41..0000000 --- a/.local/share/mode/reload.d/wall +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -rwall - diff --git a/.profile b/.profile index d0f6c4d..6e6e07b 100644 --- a/.profile +++ b/.profile @@ -41,13 +41,21 @@ export XDG_CACHE_HOME="$HOME/.cache" export XDG_DATA_HOME="$HOME/.local/share" export XDG_STATE_HOME="$HOME/.local/state" +# ruby +export GEM_HOME="$XDG_DATA_HOME/gem/ruby/3.0.0" + # script locations -export PATH="$HOME/.local/share/bin:$PATH" -export PATH="$HOME/.local/bin:$PATH" -export PATH="$HOME/.local/go/bin:$PATH" -export PATH="$HOME/.local/share/cargo/bin:$PATH" -# export PATH="/opt/f4pga/xc7/conda/bin:$PATH" -export PATH="$HOME/.lyp/bin:$PATH" +if [ -z "$PATH_EXTENDED" ] ; then + PATH="$GEM_HOME/bin:$PATH" + # PATH="$HOME/.lyp/bin:$PATH" + # PATH="/opt/f4pga/xc7/conda/bin:$PATH" + PATH="$HOME/.local/share/cargo/bin:$PATH" + PATH="$HOME/.local/go/bin:$PATH" + PATH="$HOME/.local/bin:$PATH" + PATH="$HOME/.local/share/bin:$PATH" + export PATH + export PATH_EXTENDED=y +fi # other stuff export EDITOR="nvim" diff --git a/.zshrc b/.zshrc index 55587bb..4a30d2c 100644 --- a/.zshrc +++ b/.zshrc @@ -17,6 +17,8 @@ source "$ZSH/oh-my-zsh.sh" # shift-tab fix bindkey '^[[Z' reverse-menu-complete +# e to open vim +bindkey '^[e' edit-command-line # zsh autocompletion compinit -D -- cgit v1.2.3