18 files changed, 76 insertions, 42 deletions
diff --git a/config/dodo/config.py b/config/dodo/config.py
index 66e64ac..1347424 100644
--- a/config/dodo/config.py
+++ b/config/dodo/config.py
@@ -1,14 +1,16 @@
 import dodo
 
-dodo.settings.smtp_accounts = ["email", "gmail", "fel"]
+dodo.settings.smtp_accounts = ["email", "gmail", "ell", "fel"]
 dodo.settings.email_address = {
     "email": "Karel Kočí <cynerd@email.cz>",
     "gmail": "Karel Kočí <citrisin@gmail.com>",
+    "ell": "Karel Kočí <kkoci@elektroline.cz>",
     "fel": "Karel Kočí <kocikare@fel.cvut.cz>",
 }
 dodo.settings.sent_dir = {
     "email": "~/.mail/email/sent/",
     "gmail": "~/.mail/gmail/Drafts/",
+    "ell": "~/.mail/ell/Sent/",
     "fel": "~/.mail/fel/Sent/",
 }
 dodo.settings.gnupg_keyid = "2B1F70F95F1B48DA2265A7FAA6BC8B8CEB31659B"
diff --git a/config/nvim/init.vim b/config/nvim/init.vim
index 3165498..c269b77 100644
--- a/config/nvim/init.vim
+++ b/config/nvim/init.vim
@@ -99,6 +99,9 @@ nnoremap <c-c><CR> :Explore<cr>
 nnoremap <c-c>l :bnext<cr>
 nnoremap <c-c>h :bprev<cr>
 
+" Table mode
+let g:table_mode_syntax = 0
+
 " Format
 nmap <leader>f :lua require("conform").format()<cr>
 
@@ -108,10 +111,6 @@ highlight GitGutterAdd ctermfg=2
 highlight GitGutterChange ctermfg=3
 highlight GitGutterDelete ctermfg=1
 
-" Setup table-mode to markdown compliant
-" Note: to start use "\ t m"
-let g:table_mode_corner='|'
-
 " Spell checking
 map <F10> :setlocal spell!<cr>
 function LangToggle()
diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua
index a1c17bf..d1a4c55 100644
--- a/config/nvim/lua/plugins.lua
+++ b/config/nvim/lua/plugins.lua
@@ -127,9 +127,9 @@ require("packer").startup(function(use)
 	-- Additional integrations -------------------------------------------------
 	use({
 		"chomosuke/typst-preview.nvim",
-		tag = "v0.1.*",
-		run = function()
-			require("typst-preview").update()
+		tag = "v1.*",
+		config = function()
+			require("typst-preview").setup({})
 		end,
 	})
 	-- Movement, format and others ---------------------------------------------
diff --git a/config/sway/bindsym-media b/config/sway/bindsym-media
index 13026fc..b1159ef 100644
--- a/config/sway/bindsym-media
+++ b/config/sway/bindsym-media
@@ -12,8 +12,8 @@ for_window [ title="Pulsemixer" ] move position center
 
 
 # Screen brightness controls
-bindsym XF86MonBrightnessUp exec --no-startup-id light -A 10
-bindsym XF86MonBrightnessDown exec --no-startup-id light -U 10
+bindsym XF86MonBrightnessUp exec --no-startup-id brightnessctl set +10%
+bindsym XF86MonBrightnessDown exec --no-startup-id brightnessctl set 10%-
 
 # Media player controls
 bindsym XF86AudioPlay exec --no-startup-id mpc toggle && pkill -RTMIN+12 i3blocks
diff --git a/config/sway/bindsym-system b/config/sway/bindsym-system
index 7afcb4c..79094be 100644
--- a/config/sway/bindsym-system
+++ b/config/sway/bindsym-system
@@ -13,10 +13,12 @@ mode "$mode_system" {
 bindsym $mod+Shift+q mode "$mode_system"
 
 
-set $screenshot Screenshot: (s)elect or (d)desktop
+set $screenshot Screenshot: (s)elect or (w)indow or (o)tput or (d)desktop
 mode "$screenshot" {
-	bindsym --release d exec --no-startup-id grim, mode "default"
-	bindsym --release s exec --no-startup-id sh -c "slurp | grim -g -", mode "default"
+	bindsym --locked s exec --no-startup-id ~/.config/sway/scripts/screenshot select, mode "default"
+	bindsym --locked w exec --no-startup-id ~/.config/sway/scripts/screenshot window, mode "default"
+	bindsym --locked o exec --no-startup-id ~/.config/sway/scripts/screenshot output, mode "default"
+	bindsym --locked d exec --no-startup-id ~/.config/sway/scripts/screenshot desktop, mode "default"
 
 	bindsym Return mode "default"
 	bindsym Escape mode "default"
diff --git a/config/sway/daemons b/config/sway/daemons
index 786fa70..a6579da 100644
--- a/config/sway/daemons
+++ b/config/sway/daemons
@@ -2,8 +2,10 @@
 exec --no-startup-id {
 	kanshi
 	swayidle
+	waybar
 	dunst
 }
 
 for_window [class="Ferdi"] move scratchpad
 exec ferdium
+exec sh -c 'if commad -v openrgb >/dev/null; then exec openrgb --startminimized; fi'
diff --git a/config/sway/scripts/screenshot b/config/sway/scripts/screenshot
new file mode 100755
index 0000000..45086f1
--- /dev/null
+++ b/config/sway/scripts/screenshot
@@ -0,0 +1,19 @@
+#!/bin/sh
+case "${1:-}" in
+desktop)
+	exec grim
+	;;
+output)
+	exec grim -o "$(swaymsg -t get_outputs | jq -r '.[] | select(.focused) | .name')"
+	;;
+window)
+	exec grim -g "$(swaymsg -t get_tree |
+		jq -j '.. | select(.type?) | select(.focused).rect | "\(.x),\(.y) \(.width)x\(.height)"')"
+	# TODO the second variant is newer but doesn't work with my version of sway
+	exec grim -T "$(swaymsg -t get_tree |
+		jq -j '.. | select(.type?) | select(.focused).foreign_toplevel_identifier')"
+	;;
+select)
+	exec grim -g "$(slurp)"
+	;;
+esac
diff --git a/config/systemd/user/davmail.service b/config/systemd/user/davmail.service
new file mode 100644
index 0000000..b0f239b
--- /dev/null
+++ b/config/systemd/user/davmail.service
@@ -0,0 +1,5 @@
+[Unit]
+Description=DavMail
+
+[Service]
+ExecStart="/run/current-system/sw/bin/davmail"
diff --git a/config/systemd/user/waybar.service b/config/systemd/user/waybar.service
deleted file mode 100644
index 110ab83..0000000
--- a/config/systemd/user/waybar.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Waybar
-
-[Service]
-ExecStart="/run/current-system/sw/bin/waybar"
-
-[Install]
-WantedBy="graphical-session.target"
diff --git a/install b/install
index b180447..abe157b 100755
--- a/install
+++ b/install
@@ -70,9 +70,9 @@ if ask "nvim" "Install NeoVIM scripts"; then
 	nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync'
 	# cs spelling
 	mkdir -p ~/.local/share/nvim/site/spell
-	curl "https://ftp.nluug.nl/pub/vim/runtime/spell/cs.utf-8.spl" \
+	curl -L "https://ftp.nluug.nl/pub/vim/runtime/spell/cs.utf-8.spl" \
 		>~/.local/share/nvim/site/spell/cs.utf-8.spl
-	curl "https://ftp.nluug.nl/pub/vim/runtime/spell/cs.utf-8.sug" \
+	curl -L "https://ftp.nluug.nl/pub/vim/runtime/spell/cs.utf-8.sug" \
 		>~/.local/share/nvim/site/spell/cs.utf-8.sug
 fi
 
@@ -84,7 +84,6 @@ if ask "dev" "Development tools configuration"; then
 	inst pylintrc ~/.pylintrc
 	inst config/mypy/ ~/.config/mypy
 	inst local/bin/new-flake-dev ~/.local/bin/new-flake-dev
-	inst shvcli.ini ~/.shvcli.ini
 	curl "https://github.com/cyrus-and/gdb-dashboard/raw/master/.gdbinit" >~/.gdbinit
 fi
 
@@ -93,16 +92,17 @@ if ask "sync" "Install synchronization"; then
 	if [ "$(ps -o comm= 1)" = "systemd" ]; then
 		inst config/systemd/user/allsync.service ~/.config/systemd/user/
 		inst config/systemd/user/allsync.timer ~/.config/systemd/user/
+		inst config/systemd/user/davmail.service ~/.config/systemd/user/
 	fi
 
 	inst private/mbsyncrc ~/.mbsyncrc
+	inst private/msmtprc ~/.msmtprc
+	inst private/davmail.properties ~/.davmail.properties
 	inst private/notmuch-config ~/.notmuch-config
 	inst private/notmuch-tag-new ~/.notmuch-tag-new
 	inst local/bin/email-unread ~/.local/bin/email-unread
 	inst local/sbin/newmail-notify ~/.local/sbin/newmail-notify
-	inst private/msmtprc ~/.msmtprc
 	inst config/dodo/config.py ~/.config/dodo/config.py
-	inst private/astroid/config ~/.config/astroid/config
 
 	inst private/vdirsyncer/ ~/.vdirsyncer
 	inst config/khal/config ~/.config/khal/config
@@ -136,7 +136,6 @@ if ask "desktop" "Install desktop"; then
 	inst config/swaylock/ ~/.config/swaylock
 	inst config/swayidle/ ~/.config/swayidle
 	inst config/wofi/ ~/.config/wofi
-	inst config/systemd/user/waybar.service ~/.config/systemd/user/waybar.service
 	[ -f "private/kanshi/$(hostname)" ] &&
 		inst "private/kanshi/$(hostname)" ~/.config/kanshi/config
 	inst config/xdg-desktop-portal-wlr/ ~/.config/xdg-desktop-portal-wlr
diff --git a/local/bin/allsync b/local/bin/allsync
index 9539f0d..70c9d29 100755
--- a/local/bin/allsync
+++ b/local/bin/allsync
@@ -23,6 +23,7 @@ cron_enable() {
 		} | crontab -
 	else
 		systemctl --user start allsync.timer
+		systemctl --user start davmail.service
 	fi
 	notify_bar
 }
@@ -112,12 +113,10 @@ pass git pull || fail "Passwords pull failed"
 pass git push || fail "Passwords push failed"
 
 sec "Mail"
-i3_astroid --start-polling
 mbsync -a || fail "Mail synchronization reported failure"
 notmuch new
 ~/.local/sbin/newmail-notify || fail "Mail notifications not sent"
 notmuch tag --batch --input="$HOME/.notmuch-tag-new"
-i3_astroid --stop-polling
 notify_bar
 
 #sec "Calendar and contacts"
diff --git a/local/bin/cloud b/local/bin/cloud
index db6e717..187db18 100755
--- a/local/bin/cloud
+++ b/local/bin/cloud
@@ -19,8 +19,21 @@ while getopts "u" opt; do
 done
 
 if [ "$umount" = "n" ]; then
+	url="https://cloud.cynerd.cz/remote.php/dav/files/cynerd"
+	conf="$(mktemp)"
+	secrets="$(mktemp)"
+	trap 'rm -f "$conf" "$secrets"' EXIT HUP INT QUIT SEGV PIPE TERM
+	cat >"$conf" <<-EOF
+		[$path]
+		secrets ${secrets}
+		use_locks 0
+	EOF
+	chmod 600 "$secrets"
+	echo "$url cynerd $(pass cynerd.cz/nextcloud/davfs)" >"$secrets"
+	sudo chown root "$secrets"
 	sudo mkdir -p "$path"
-	sudo mount.davfs -o uid=1000,username=cynerd "https://cloud.cynerd.cz/remote.php/dav/files/cynerd" "$path"
+	sudo mount.davfs -o "conf=${conf}" -o uid=1000 "$url" "$path"
+	sudo rm -f "$secrets"
 else
 	sudo umount "$path"
 fi
diff --git a/local/bin/elektroline00 b/local/bin/elektroline00
index 7a21cd6..99664d2 100755
--- a/local/bin/elektroline00
+++ b/local/bin/elektroline00
@@ -20,6 +20,7 @@ done
 
 if [ "$umount" = "n" ]; then
 	mount_cifs() {
+		sudo mkdir -p "$path/$2"
 		sudo --preserve-env=PASSWD mount.cifs -o username=kkoci,uid=1000 "$1" "$path/$2"
 		echo "Mounted $path/$2"
 	}
diff --git a/local/bin/new-flake-dev b/local/bin/new-flake-dev
index 360a94e..c28f2fd 100755
--- a/local/bin/new-flake-dev
+++ b/local/bin/new-flake-dev
@@ -11,10 +11,15 @@ cat >./flake.nix <<"EOF"
     systems,
     nixpkgs,
   }: let
-    inherit (nixpkgs.lib) genAttrs;
+    inherit (nixpkgs.lib) genAttrs composeManyExtensions;
     forSystems = genAttrs (import systems);
     withPkgs = func: forSystems (system: func self.legacyPackages.${system});
   in {
+    overlays = {
+      packages = final: prev: {};
+      default = composeManyExtensions [self.overlays.packages];
+    };
+
     devShells = withPkgs (pkgs: {
       default = with pkgs;
         mkShell {
diff --git a/local/bin/startsway b/local/bin/startsway
index 3982c19..262a997 100755
--- a/local/bin/startsway
+++ b/local/bin/startsway
@@ -14,9 +14,10 @@ export MOZ_ENABLE_WAYLAND=1
 # Java application do not display properly
 export _JAVA_AWT_WM_NONREPARENTING=1
 
-dbus="dbus-run-session"
 if [ "$(ps -o comm= 1)" = "systemd" ]; then
-	dbus=""
+	launch="systemd-cat --identifier=sway --stderr-priority=err"
+else
+	launch="dbus-run-session"
 fi
 
-exec $dbus sway
+exec $launch sway
diff --git a/private b/private
-Subproject f2f279e7aa71f2b72f34ad8ec5100725d24d8b9
+Subproject 10d7c501c5a3c08670ba74098bfd81db3baf600
diff --git a/shvcli.ini b/shvcli.ini
deleted file mode 100644
index 66caf52..0000000
--- a/shvcli.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[hosts]
-localhost = tcp://admin@localhost?password=admin!123
-test = tcp://test@localhost?password=test
-brcg2 = tcp://cli@localhost
-
-[hosts-shell]
-nirvana = tcp://kkoci@nirvana.elektroline.cz:3756?password=$(pass elektroline.cz/nirvana/kkoci)
diff --git a/shvcli.toml b/shvcli.toml
index 5a3e9e8..0c262b4 100644
--- a/shvcli.toml
+++ b/shvcli.toml
@@ -2,7 +2,9 @@
 localhost = "tcp://admin@localhost?password=admin!123"
 test = "tcp://test@localhost?password=test"
 brcg2 = "tcp://cli@localhost"
+nirvanaa = "tcp://kkoci@nirvana.elektroline.cz:3755?oauth2=y"
 
 [hosts-shell]
-nirvana = "tcp://kkoci@nirvana.elektroline.cz:3756?password=$(pass elektroline.cz/nirvana/kkoci)"
+nirvana = "tcp://kkoci@nirvana.elektroline.cz:3755?password=$(pass elektroline.cz/nirvana/kkoci)"
+nirvana-old = "tcp://kkoci@nirvana.elektroline.cz:3756?password=$(pass elektroline.cz/nirvana/kkoci)"
 ats = "tcp://atsshv@czellats.elektroline.cz?password=$(pass elektroline.cz/czellats/atsshv)"