From db3becd9f0b4e78a0cf323da87f92a7eead108e9 Mon Sep 17 00:00:00 2001
From: fz0x1 <fz0x1+gpg@posteo.net>
Date: Wed, 19 Mar 2025 10:57:14 +0100
Subject: [PATCH] 20250319.1742378234

---
 global/.zshrc-secrets                        | Bin 1300 -> 1493 bytes
 linux/.config/gtk-3.0/settings.ini           |  17 ----
 linux/.config/i3/autostart.sh                |  20 ++---
 linux/.config/i3/config                      |  18 +++-
 linux/.config/i3/i3status-rust.toml          |  88 +++++++++++++++++++
 linux/.config/i3/workspaces/workspace_1.json |  24 -----
 linux/.config/i3/workspaces/workspace_2.json |  25 ------
 linux/.config/i3/workspaces/workspace_3.json |  24 -----
 linux/.config/i3/workspaces/workspace_4.json |  24 -----
 linux/.picom.conf                            |   2 +-
 10 files changed, 116 insertions(+), 126 deletions(-)
 delete mode 100644 linux/.config/gtk-3.0/settings.ini
 create mode 100644 linux/.config/i3/i3status-rust.toml
 delete mode 100644 linux/.config/i3/workspaces/workspace_1.json
 delete mode 100644 linux/.config/i3/workspaces/workspace_2.json
 delete mode 100644 linux/.config/i3/workspaces/workspace_3.json
 delete mode 100644 linux/.config/i3/workspaces/workspace_4.json

diff --git a/global/.zshrc-secrets b/global/.zshrc-secrets
index a9040ccd8b24742ccf83da2cbc382e559331ab82..2d504566b88bf4c503055210617a6b478d8f1305 100644
GIT binary patch
literal 1493
zcmV;`1uFUgM@dveQdv+`0Kzl>bgQ-dEbMuu|IHLPs?N;O7%O;m13%>qa>`hCN@KQQ
z*k>{AIHTyt3g{GPu-{`IPuOZEUf8*$chxgYE56PEqSvR+81{a>E0&qu0VjYHt5R}J
z|8bKB<Gp3hV?3c{G!Lk_IXqG(L!uzE(U7DxAAq+X6!ANnEvX5m)qxN0>C9)FH|rgj
z3^M`B3-Y2>86NC7DI-x`_~L=!P$V^84c4AekU_Y#%^7LGMHT3QC9Fnt9qzu9s4atR
zv2^0@La~K^!Orc$Q1XvXk$T_mwsB?KLOS#0Sy)OukV{ODI(svoBemKvwREweDmHpB
z+=~1m$wD(UA^u@J_@YUb2xdMg<3sJweFI6tt3VLqHX{G0hQpJ*qO?>Q`nXA?dv6le
zzKL4f{Z*J94sp`2!zGtBEIOe}k^{BfgA*zH+sM8EvV~U@v?lYCk^-xTN`t41K+oe|
zA1TG)gSW`dUVP%81SatPdLpZhOF`iPtOm%e!l&Fd$WLD$BdsiBbSzKEal4d&8U*1a
zZ3YVoi-`|&54aol)LI(xjM@cD@`aACX^ajIIp>aHl63t!9IZ8isiU?iU)S{Eqzmo6
zapxx=kP3fJExH+Ik6cGaqV+*vPjuo-eWct5p9>qPwC9rHKMy@*SG01_H~T|ICtSS>
zxtNPBr&#Cs&(Jt%+|5C0-+;!b>riT5CVZXThng^0(`DmfaoM{Wn1#=+!zrep{!Lr?
z3Zz#rJ{k?POy=<3zfNS)&a$%KOtN?dTVGG`x+@QHB0JDLhgdsIYt*VPw<FUR3WPG#
znBdfQLL&QDWp3JYx$)|qiv?7W?Pl^Me`y7Nfgu5n3Pyr|YvePhi8t&98W9~Kb7%+C
zp8Svp18aCWZrB4CA2{W_0*T;c7S)?d51%@|6TvBvlDS@?1gX5IWmWmBGK7`6j~a(L
z9r^Ir?gkqmZ~6d>!mzd>h+u?;EI-`O9$9!*G@|rU;@mi0XNwhR1!IN8gNvLDwK9(G
zCSJbtXB=`G@35S9M)jcRZL>k#UyepbH(x62eKMf){H&0l)xB>k21E@kVH2fYIu{ow
zqm;T7?9fsiV;f9@5ku7{u~m+ossdH>SzN25ya7=FGF!-Py}PY$EAyJ&!bh&3#U&dE
zj^};LO9YJ7B@QLx^Imj}FjL?C_uG+<zvZ843mZ(ngQ+oFV+Ftw1Nal81PspjIw@Em
z*j8(Ww7g(JFB=sIt}gK$RHS2judSxMvaT<ZJ*=Zu1XmQi%AKr3oc&ZU-psU0Y>yxI
zR0I6-DW}B`zo(md1^MOa5U!;oYT$ZV6yrv<H`ZD9oB>@AT`ofPPk++&Z2x}UJJsAZ
zTo@eTv+0=ZudEDT4Uki(Jja+WGUuA%IXm*EeVX*5I8{^TK;XnXmI5vd3<`DRvBric
z)oFm|AIF%D>P$*?4jEq<MQIn9_?0Q8Rd%CR`MJ%bsCk0H`o1kgoa?Cgiga7VgISj{
zft1wF-AJhTKpX;T{~!)a>n0*xTSIOSjKcqOBN}$!a(0H=AxWfh2OJRr0Gi=JwqxES
zhZo<{l^U(a_`Olnefvydq+~QdS-T`_@3NU`Gab1pp$BGd*@|lSn+5JSE&DZhkcoS^
zkx=XO%dNH_s;PFY6XPcCehP=H0A#@Xos|?5&alHckf=EULj(M_C%}`wz6L4&;R$jw
zkr-AJ<eX7q=)A+XzvRuvEE`){f@G2%ajH?HZHBvt6>nS>i6Z6!4nMqKG5%URRVhfZ
zs!gU#K#GF8;0x!tJb!hh?xW=MS1??N+>KL;2wJ9V4#x1MGuE%xYEm)$oH%$1b`5p%
zz$?FMNU9Sv*pIjpW@e6x-0ziW;I-hRDcG|b(8gPncK@$C_jB&gmFGaN6p-)H`u>Qh
v#KLjX;2m$;--R0u3o}68e$epkJaHf+?XIFuxAP|m(%%_XaDlWTaGhFYyw=*r

literal 1300
zcmV+v1?&0%M@dveQdv+`0OfwV811Wl@7R!w-KxR$SB&i4T-yUe+$kNEcCf2wbxq%1
z1>B4<cIczpo~ho)^0CvfGM0{7&NKb*B0ICdbKku`*`k{<6GK2MdSpTc+N{5lBcXn0
zaCrQB;xXSHCBr?Y-O644ijMbB`x5!lH9OtF`=0e|8yWpMR`|4mcxwGBq1EO7_0SrA
z=qp-y|KaTK<{xEZM~~Xr&j@=85aQe}7Q$QPkEsK0ctc#@)Xy)MaKCu_t0s+H;?SpI
z$GfzG-E^Uivg8U$JX@)Rm};{d38}picbtA|#TDpu{k{Q0J)1p!Q>h!ZBv~+Xd_o)M
z5FO#r1iG{Q!>=8b0ef85L6E*J`0s|jr+oJUNh>EhK;Bj?U1bm;h2RtP09wxc9OrI@
zn@Wd@f<iF&;wCTOle)bjSVi50U6jLt3MM_FI(XM_Q?B`yiRK9Ks&DxQ;|S)qzcS}P
zdAzQX0weB*)tFM~)2%l*lAu4?-T5U}ZeW|V)4N0DGgbAvLxOArGQ+XBlmCKTB(I5R
z4#IiPVpl37;>!>n5bDtrK(wK1NiJt&sz>Ex%{;9^tQjWwcHh<8Wlnm)h&9?2)&qhN
zt|TbnpqU;0GliY{#dBhsQD{}L^x2?hAsxdP?X|s<Ud7Mvj1_5!ipHRSr`(o;?vEaK
zE2_ep_Up%&B8D=D)7pLi=xD<Cs^$Kp3}QEeY!7tGrr5VhvzV(jq(x}E8`I>Tvku(E
zz~^EHD;-){nZ=$lq(BxcJo{{x!iK%KZNBhFHosh46c@j#Xrl_!hvucy)AHD=xzE8e
z2X|Hi&H12WgD(wbpS4aiCG(HRu1A}4nPju?H?Q}xY-Xs{m?*SJ`2g_1-DLR~7;<aI
z{PERcHE+82ueSNpj@g|`kzee7&YnaVj~-9GmV$LPVJ;;(`4>o8U}k{5^0yMZ4(uv1
zC1semY=LVKwNcUQv}K4CW2y7YE`O;qXF^5}`x9h!vQ~vw<ZMYB?Q-E1aMu3+Xv6a7
zY3bnKWHM=Q%6#;q7%GT1ZsUHz9Y<0_B|CDcM>_67E0w|LDUbpf5n)d(I3X><Pz(&H
zR5amkp*H>1IIB=xeVOIA{CUDVbGpy85Fu$cnS@g2-D#ss)nsBKm<&4wlg2tfP|2kM
z;&AZCWQg+gOAl8*Qo&>msYZ~|2+T?~%w#c;5yzW;02O688vG_*0f#VoMQyVdIEqU?
zpfCP+%JiyYq$5)#Q`LS^NT|;gb$A797(-c=LMlGqN67DRT%&@7|GL_fZ>E&=eZcU7
z?rjLouXq2|+`7BF$T>1(4SvH~(fX)|-yoR0mzgy?E;`8rYHa-0NvvdU88hbi#b@@C
zLDAn#CERR!bBvniaLi^|0S-5+*vIAt*E9BsPJzFTO3gLSTg6;S5B3GqoK==}C)80f
ze7Zkv0Cv+!JtBK}!UyM!IDyNl0~0~R;i4lWTf9;E0W^#&>e9gYxUvzE#f(KwCdsmp
z#2QAs_NtC3u5|n(MX!maKb=fqC;OmWFiE<=#j<C{vAXq}AnZXn&$U3fS+R?A;gLv^
zrlJ(;y>umLfr3)guedZtP$;W+**FC1FOuID?W2mlp7Y&-<~J|y`1Kv8$;EFq{}zu$
zC2MUNt`{*?xIEVnoS`QKJe9{raFkjV2LIg<PL=w)N!kdvyBqC%l67D4`;k}xI|wSa
KO+WILBT$&;rJ4Z%

diff --git a/linux/.config/gtk-3.0/settings.ini b/linux/.config/gtk-3.0/settings.ini
deleted file mode 100644
index bd99a77..0000000
--- a/linux/.config/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-[Settings]
-gtk-theme-name=Adwaita
-gtk-icon-theme-name=Qogir-Dark
-gtk-font-name=Cantarell 11
-gtk-cursor-theme-name=Qogir-dark
-gtk-cursor-theme-size=32
-gtk-toolbar-style=GTK_TOOLBAR_ICONS
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=0
-gtk-menu-images=0
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=0
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintfull
-gtk-xft-rgba=rgb
-gtk-application-prefer-dark-theme=0
diff --git a/linux/.config/i3/autostart.sh b/linux/.config/i3/autostart.sh
index 44efc3b..a9ad49a 100755
--- a/linux/.config/i3/autostart.sh
+++ b/linux/.config/i3/autostart.sh
@@ -14,13 +14,15 @@ xrdb -merge ~/.Xresources &
 ~/scripts/bin/setup_displays
 
 # PolicyKit Authentication Agent - Gnome
-#/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
-/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets
+/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
+eval "$(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh,gpg)"
 
-sleep 1
+sleep 2
+
+i3-msg restart
 
 # bar
-~/.config/polybar/launch.sh &
+# ~/.config/polybar/launch.sh &
 
 # Notifications
 dunst &
@@ -34,11 +36,8 @@ caffeine start &
 # compositor
 # picom --config ~/.picom.conf &
 
-# NetworkManager applet
-nm-applet &
-
 # wallpapers
-nitrogen --restore &
+# nitrogen --restore &
 
 # Dropbox
 # I do not use it anymore since 2025-02-10
@@ -72,13 +71,14 @@ workrave &
 
 # activitywatch
 ./activitywatch/aw-qt &
+#
+# NetworkManager applet
+nm-applet &
 
 # watchdog
 watchmedo shell-command --pattern='*.org;*.txt;*.md;*.gpg;*.org_archive;sync.sh' --recursive --ignore-directories -W --command "~/org/sync.sh" ~/org/ &
 watchmedo shell-command --pattern='*.journal;*.sh;*.log;*.prices;*.csv;*.py' --recursive --ignore-directories -W --command "~/.hledger/sync.sh" ~/.hledger/ &
 
-sleep 1
-
 keepassxc &
 
 nextcloud &
diff --git a/linux/.config/i3/config b/linux/.config/i3/config
index 46ca053..7e68754 100644
--- a/linux/.config/i3/config
+++ b/linux/.config/i3/config
@@ -13,7 +13,7 @@ set $mod Mod4
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
-font pango:monospace 8
+font pango:TerminessNerdFont, FontAwesome 10
 
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
@@ -218,6 +218,22 @@ bindsym $mod+r mode "resize"
 #bar {
 #	status_command i3blocks
 #}
+bar {
+    tray_output primary
+    tray_padding 3
+    font pango:TerminessNerdFont, FontAwesome 10
+    position top
+    status_command i3status-rs ~/.config/i3/i3status-rust.toml
+    colors {
+        separator #666666
+        background #1D1F21
+        statusline #dddddd
+        focused_workspace #0088CC #0088CC #ffffff
+        active_workspace #333333 #333333 #ffffff
+        inactive_workspace #333333 #333333 #888888
+        urgent_workspace #2f343a #900000 #ffffff
+    }
+}
 
 # default gaps
 gaps inner 0
diff --git a/linux/.config/i3/i3status-rust.toml b/linux/.config/i3/i3status-rust.toml
new file mode 100644
index 0000000..356505c
--- /dev/null
+++ b/linux/.config/i3/i3status-rust.toml
@@ -0,0 +1,88 @@
+icons_format = "{icon}"
+
+[theme]
+theme = "plain"
+[theme.overrides]
+idle_bg = "#1D1F21"
+idle_fg = "#c3c3c3"
+separator_bg = "#1D1F21"
+
+# [icons]
+# icons = "awesome4"
+# [icons.overrides]
+# bat = ["|E|", "|_|", "|=|", "|F|"]
+# bat_charging = "|^| "
+
+[[block]]
+block = "cpu"
+info_cpu = 20
+warning_cpu = 50
+critical_cpu = 90
+
+[[block]]
+block = "disk_space"
+path = "/"
+info_type = "available"
+alert_unit = "GB"
+interval = 20
+warning = 20.0
+alert = 10.0
+format = " /:$available.eng(w:2) "
+
+[[block]]
+block = "memory"
+format = " $icon $mem_total_used_percents.eng(w:2) "
+format_alt = " $icon_swap $swap_used_percents.eng(w:2) "
+
+[[block]]
+block = "sound"
+[[block.click]]
+button = "left"
+cmd = "pavucontrol"
+
+[[block]]
+block = "time"
+interval = 5
+format = " $timestamp.datetime(f:'%a %d/%m %R') "
+
+# [[block]]
+# block = "docker"
+# interval = 2
+# socket_path = "/run/user/1000/docker.sock"
+# format = " $icon $running /$total "
+[[block]]
+block = "keyboard_layout"
+driver = "setxkbmap"
+interval = 15
+
+[[block]]
+block = "menu"
+text = " MENU "
+[[block.items]]
+display = " -&gt; Power Off &lt;-"
+cmd = "poweroff"
+confirm_msg = "Are you sure you want to power off?"
+[[block.items]]
+display = " -&gt;  Reboot   &lt;-"
+cmd = "reboot"
+confirm_msg = "Are you sure you want to reboot?"
+
+# [[block]]
+# block = "temperature"
+# format = " $icon $max max "
+# format_alt = " $icon $min min, $max max, $average avg "
+# interval = 10
+# chip = "*-isa-*"
+
+[[block]]
+block = "xrandr"
+format = " $icon $brightness $resolution "
+
+[[block]]
+block = "vpn"
+driver = "mullvad"
+interval = 10
+format_connected = " VPN: $icon "
+format_disconnected = " VPN: $icon "
+state_connected = "good"
+state_disconnected = "warning"
diff --git a/linux/.config/i3/workspaces/workspace_1.json b/linux/.config/i3/workspaces/workspace_1.json
deleted file mode 100644
index 8d7a9df..0000000
--- a/linux/.config/i3/workspaces/workspace_1.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "border": "pixel",
-    "current_border_width": 2,
-    "floating": "auto_off",
-    "geometry": {
-       "height": 600,
-       "width": 800,
-       "x": 0,
-       "y": 0
-    },
-    "marks": [],
-    "name": "Alacritty",
-    "percent": 1,
-    "swallows": [
-       {
-       "class": "^Alacritty$",
-       "instance": "^Alacritty$",
-       "machine": "^cadwell$",
-       "title": "^Alacritty$"
-       }
-    ],
-    "type": "con"
-}
-
diff --git a/linux/.config/i3/workspaces/workspace_2.json b/linux/.config/i3/workspaces/workspace_2.json
deleted file mode 100644
index 9788af9..0000000
--- a/linux/.config/i3/workspaces/workspace_2.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "border": "pixel",
-    "current_border_width": 2,
-    "floating": "auto_off",
-    "geometry": {
-       "height": 1506,
-       "width": 2519,
-       "x": 0,
-       "y": 0
-    },
-    "marks": [],
-    "name": "i3 - ArchWiki — Mozilla Firefox",
-    "percent": 1,
-    "swallows": [
-       {
-       "class": "^firefox$",
-       "instance": "^Navigator$",
-       "machine": "^cadwell$",
-       "title": "^i3\\ \\-\\ ArchWiki\\ \\—\\ Mozilla\\ Firefox$",
-       "window_role": "^browser$"
-       }
-    ],
-    "type": "con"
-}
-
diff --git a/linux/.config/i3/workspaces/workspace_3.json b/linux/.config/i3/workspaces/workspace_3.json
deleted file mode 100644
index 8d7a9df..0000000
--- a/linux/.config/i3/workspaces/workspace_3.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "border": "pixel",
-    "current_border_width": 2,
-    "floating": "auto_off",
-    "geometry": {
-       "height": 600,
-       "width": 800,
-       "x": 0,
-       "y": 0
-    },
-    "marks": [],
-    "name": "Alacritty",
-    "percent": 1,
-    "swallows": [
-       {
-       "class": "^Alacritty$",
-       "instance": "^Alacritty$",
-       "machine": "^cadwell$",
-       "title": "^Alacritty$"
-       }
-    ],
-    "type": "con"
-}
-
diff --git a/linux/.config/i3/workspaces/workspace_4.json b/linux/.config/i3/workspaces/workspace_4.json
deleted file mode 100644
index f54d92f..0000000
--- a/linux/.config/i3/workspaces/workspace_4.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "border": "pixel",
-    "current_border_width": 2,
-    "floating": "auto_off",
-    "geometry": {
-       "height": 1506,
-       "width": 2518,
-       "x": 21,
-       "y": 73
-    },
-    "marks": [],
-    "name": "Saved Messages – (350487)",
-    "percent": 1,
-    "swallows": [
-       {
-       "class": "^TelegramDesktop$",
-       "instance": "^telegram\\-desktop$",
-       "machine": "^cadwell$",
-       "title": "^Saved\\ Messages\\ \\–\\ \\(350487\\)$"
-       }
-    ],
-    "type": "con"
-}
-
diff --git a/linux/.picom.conf b/linux/.picom.conf
index f5395c6..24e8a16 100644
--- a/linux/.picom.conf
+++ b/linux/.picom.conf
@@ -51,7 +51,7 @@ use-damage = false;
 #################################
 
 # Enabled client-side shadows on windows.
-shadow = false;
+shadow = true;
 
 
 # The blur radius for shadows. (default 12)