From 7d9e95fafa913f127b11c845392daf800b66eb13 Mon Sep 17 00:00:00 2001 From: fz0x1 Date: Wed, 6 Nov 2024 21:28:27 +0000 Subject: [PATCH] 2024-11-06 --- global/.config/jrnl/jrnl.yaml | 2 +- global/.config/mutt/gmail_isync.gpg | Bin 623 -> 645 bytes global/.config/mutt/posteo_isync.gpg | Bin 666 -> 688 bytes linux/.Xresources | 4 +- linux/.config/i3/config | 64 +++++++++++++++++++-------- linux/.config/polybar/config.ini | 21 +++++---- linux/.config/polybar/launch.sh | 4 +- linux/.picom.conf | 4 ++ linux/.zshrc-additional | 3 +- 9 files changed, 70 insertions(+), 32 deletions(-) diff --git a/global/.config/jrnl/jrnl.yaml b/global/.config/jrnl/jrnl.yaml index 26daa6a..75dd854 100644 --- a/global/.config/jrnl/jrnl.yaml +++ b/global/.config/jrnl/jrnl.yaml @@ -13,7 +13,7 @@ journals: default: display_format: markdown encrypt: true - journal: /Users/fz0x1/PKM/diary/diary.md + journal: /home/fz0x1/PKM/diary/diary.md linewrap: 79 tagsymbols: '@' template: false diff --git a/global/.config/mutt/gmail_isync.gpg b/global/.config/mutt/gmail_isync.gpg index 2fed8028d8c91fde211773192ea5f3137215d6fb..64878f56a6e80109aefa74ef5979593921c2d9ec 100644 GIT binary patch literal 645 zcmV;00($)bM@dveQdv+`03Fl)>K*hKubjqS5Pwgm%OUaJsLIjTbZg?zipQIO6%X;s z-2txL+iD5JR;~>J$e&hjbOKvt3d=>XZ5hN>S|imGBM@3ROjTgyvKr4Tp`Gr@P|qx6=zCb zP@JDH)=p&QaIGTcZ%Z7xkE#V@V0TPD*%+Q8$5MIG0qc^4ZZit|M8T)4!|D6VuKsXw zG7Y=IUNb~umituvB@1QmgU+O#9X^iI-{>-A`u_RX_H}^$AcHAuChDFX@~fWha0}&v z+-u-^V7%dZh&lOf)`u-k7*M*p=jAl6p4#l58ai{+IP}Z$nDuEjCK@NBkwDf%=OE!N zbiEz8?&v?KgW8<#r5Kiqy9R3z{9QxM*TDkEhc%m3FY?~+M()3o9^+Rk5E3kv!bLo#bZ8Prf^Pq`0f*UD0IRnl-(NmUMF}K3Kj0K z5Fix}^bIyGRGbj^@EWtkgScNE@=iFac8E(cfYqn9$N$nQA5*o{Cd^yANIlVZwUT}j fJOGLIbpUy*D{opFhYJ3Q--k`Ji?o}pbOP;hbDK){ literal 623 zcmV-#0+9WM0t^FAYx?|IiMv4o5CE@_J7Fb16#To@1eY$4kLTUlEk&&PCg$ftV!dnd zP89nG53#3UJt5fP2=uy?z6xNGP=q+vdnT|G%cKPAp5uY|rAi9s@X-tyI!i^|pbon! z9G09{W*+Wka{uq(yN~Mi?P@T6;G2w;U?|`Q4|%*DZc42j0;z>uW=&|9pFCoZ zEH*)#{_6t=$UVhNI__A(K9^i&OL(AqAr--prkb>Jxjs$*g0`NG`^4e2MMjI-RL9C1 z5};J~oH^>W>4P@8#}io7RrGZgc77U*1L+nLWd1KwS&N$C+IExn8n+3e7&6IWRCAc~}fYusz9b3l2EfXCO=cXTWXE+H};%r02qk8`^`iSXADClWVUeT($(1VODlo)6$6hi6E%C;-GJR};Hul1v9zj}lb zV}KA5>Si+%Os3xc?9Ob2>qi*mHv6K_zNsB2f1VdoB?Kr@ z`~tNBVF>p35ioI{qvufK1bj?%3bbgOluTwQS>SfHBvyzEEd{>o zg~R&j!b6}#z2&}18TkY2QypHU@w!fnR&1#=dBRCZ|Gej}y(&5FlBt-YQZnDT#K&#p JdQ4ReIuEk8KQRCR diff --git a/global/.config/mutt/posteo_isync.gpg b/global/.config/mutt/posteo_isync.gpg index ecd316bbe23ccbae5f3ca3cf949a83e6349317d7..9e126ea6d4062ebaade3bd14a931dd1c3984ca2e 100644 GIT binary patch literal 688 zcmV;h0#E$_M@dveQdv+`03ADY9uZK6vcch^c^RhM`noxdH&Kca8~St-T2famTPE)m z@_^AF9&Ek7*W<>zA)|&vC4!@3yE2El2_=Zi1O^fkPtZ>))f@}j6t@b1@f}BHx{Y6O zoUiG&LMHkd!b$f3zny;zqKS~NZKK9dzT14`6$U6Yczyf5Mos)I!yaMI7S{x~JI>5t zs`7}7)_t817hDrKe%~+6hibw0EAY;4^uL?_@p#Qp)n-@*JDO{cGRqRzAw6G4zB;WV z^u0bebfuZC0iWJ-cE}yqf?uj1LwjUehyA8dAN5_9#S&?q zAd-Jf#UVWK)ZkDPme9}ZhMxUlMv~O%7ESYM|2zMhIk8k?RSlN=GbG8s4a_v$OywGi z%TOZ<>&;0A&aDy|UqIxR9}%~sWTexSlw#MCI$N^yWggrfM)p?mZ4mA`*~09&@ItT0 zwIlod;rIxoYUH%?M+$;aDLO{qb9Z$b`zn$b!%|HfMXlg%ZjfNnt?Wh#W1PGTKI%43 z{~}MZnBET$@O0PLnDgWiu2iyYIZ+xch{codvf;}`mkZh~IR~NFVzRAe*X8);vH(}X zXe>d5hf`?H(I9Qw>rM!{z_AJ~mo^ec%hn(yW>d0|*Ra;FpM1S(ZaV5j6?Q){-c1pt>CfpICXx+IFmCB}AU%@a5kzgG%`TZJn69cV4gDi8eJmz73 z{H>Vx;aKrk#mS&czkUcHT>)Bc!e7WYMOZFxYps;}O8N#VgFNX}s>U1zc2UG#I{42- WcU~e05e_`#R&j-h|MZDMQvhdwJ5>?@ literal 666 zcmV;L0%iS$0t^FAYx?|IiMv4o5C3J?+z+2y4(X*yL6D_wd77PHp3b`?sGM;n;h@tV znkQ1qp@csSCS^LnPk|QqO|u;{M(&6$5jI~vAt|?rw=7vc6cQ=>!RbxqC#fgH*^JV zj@N>Bdku%t7iV@2^}jThVsp+*qO}hKUuy9*k>`)a6T^atoq?e2F@@%yx7E*Xv2bt` zIiF>x(fm1+;Hsq&9@oeyj#LeKnEtUoy26F?iEQ_|Bik5TPCu>Exi>*|->Oy>k&lDU zs2gJ;*|fsb_zjra8U`L(_CB&H zmK}%u_bogd7NG{okNxkLN1GxKVe;j|TzXttZYa6|{c)_rLG)`MwXvRU{cMMlAR^LUI1PIPwmss-!~k+qJnu5$=`f-1t<~dS#bf$o*(^ zwPYO*=~+)z79F=TBZkz80SN*S$we%uk7%MPsxDI9^ae7SuP`=QN^+GZ+Dt;~Eb>5u zs7GfUYovB1-gEoI^;G~Y4EZ!XtY9^emV{R?Qnr5tfY`HZ(JcRtJ_g6kPopK$l3g(}X;I6^l_ A9{>OV diff --git a/linux/.Xresources b/linux/.Xresources index af2ab8f..b8671f6 100644 --- a/linux/.Xresources +++ b/linux/.Xresources @@ -1,5 +1,5 @@ -Xft.dpi: 160 -rofi.dpi: 160 +! Xft.dpi: 160 +! rofi.dpi: 160 Xft.autohint: 0 Xft.lcdfilter: lcddefault diff --git a/linux/.config/i3/config b/linux/.config/i3/config index fb2f887..78ee69e 100644 --- a/linux/.config/i3/config +++ b/linux/.config/i3/config @@ -62,7 +62,7 @@ bindsym $mod+Control+j workspace prev bindsym $mod+Tab workspace back_and_forth # start rofi (a program launcher) -bindsym $mod+d exec --no-startup-id rofi -no-config -no-lazy-grab -show drun -modi drun -dpi 160 +bindsym $mod+d exec --no-startup-id rofi -no-config -no-lazy-grab -show drun -modi drun -dpi 120 # change focus bindsym $mod+j focus left @@ -127,6 +127,23 @@ set $ws8 "8" set $ws9 "9" set $ws10 "10" +# monitors +set $external "HDMI-1-0" +set $buildin "eDP-1" +set $main_monitor "HDMI-1-0" + +# workspaces +workspace $ws1 output $main_monitor +workspace $ws2 output $main_monitor +workspace $ws3 output $main_monitor +workspace $ws4 output $main_monitor +workspace $ws5 output $main_monitor +workspace $ws6 output $main_monitor +workspace $ws7 output $main_monitor +workspace $ws8 output $main_monitor +workspace $ws9 output $main_monitor +workspace $ws10 output $main_monitor + # switch to workspace bindsym $mod+1 workspace number $ws1 bindsym $mod+2 workspace number $ws2 @@ -192,48 +209,57 @@ bindsym $mod+r mode "resize" # status_command i3blocks #} +# wait for init displays +# exec --no-startup-id sleep 1 + +# setup displays (xrandr) +exec_always --no-startup-id ~/scripts/bin/setup_displays + +# dpi fix +exec --no-startup-id xrdb -merge ~/.Xresources + +# polybar +exec_always --no-startup-id ~/.config/polybar/launch.sh + +# mullvad +exec --no-startup-id mullvad-vpn + +# solaar +exec --no-startup-id solaar --window=hide & + # caffeine exec --no-startup-id caffeine start & # backlight +# supports only intel #exec --no-startup-id xbacklight -set 90 & -# dpi fix -exec --no-startup-id xrdb -merge ~/.Xresources & -exec --no-startup-id xrandr --output DP-2 --mode 2560x1600 --rate 240.00 --dpi 160 & - -# compositor -exec --no-startup-id picom --config ~/.picom.conf & - -# polybar -exec --no-startup-id ~/.config/polybar/launch.sh > /dev/null 2>&1 - # nm-applet exec --no-startup-id nm-applet & # blueman -exec --no-startup-id blueman-applet & +# exec --no-startup-id blueman-applet & -# nitrogen -exec --no-startup-id nitrogen --restore & +exec --no-startup-id nitrogen --restore; sleep 1; picom --config ~/.picom.conf # dropbox -exec --no-startup-id ~/.dropbox-dist/dropboxd & +# exec --no-startup-id ~/.dropbox-dist/dropboxd & # megasync exec --no-startup-id megasync & # vorta -exec --no-startup-id vorta & +# exec --no-startup-id vorta & # keyboard layout -exec --no-startup-id setxkbmap -layout us,ru -option 'grp:alt_space_toggle' & +# @TODO move it to another file +exec --no-startup-id setxkbmap -layout us,ru -option 'grp:alt_space_toggle' # power manager #exec_always --no-startup-id xfce4-power-manager # polkit -exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 & +exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 # default gaps gaps inner 10 @@ -263,3 +289,5 @@ default_floating_border pixel 1 #p2p firefox for all workspaces for_window [title="Picture-in-Picture"] sticky enable + +for_window [class="MEGAsync" title="Add sync"] floating disable diff --git a/linux/.config/polybar/config.ini b/linux/.config/polybar/config.ini index 20485cc..d663bf3 100644 --- a/linux/.config/polybar/config.ini +++ b/linux/.config/polybar/config.ini @@ -26,6 +26,7 @@ alert = #A54242 disabled = #707880 [bar/fz0x1] +monitor = ${env:MONITOR:HDMI-1-0} width = 100% height = 24pt radius = 6 @@ -48,13 +49,17 @@ module-margin = 1 separator = ⟨ separator-foreground = ${colors.disabled} -# font-0 = JetBrainsMono Nerd Font Mono:style=Regular;2 -font-0 = BigBlueTermPlus Nerd Font:size=10:style=Regular;2 -font-1 = Noto Color Emoji:scale=8;2 -font-2 = JetBrainsMono Nerd Font Mono:size=21:style=Regular;2 +font-0 = JetBrainsMono Nerd Font Mono:size=9:style=Regular;2 +font-1 = JetBrainsMono Nerd Font Mono:size=18:style=Regular;3 +; font-0 = BigBlueTermPlus Nerd Font:size=10:style=Regular;2 +font-2 = "Font Awesome 6 Free" +; font-3 = "Font Awesome 6 Free:style=Solid:pixelsize=10;2" +; font-4 = "Font Awesome 6 Brands:pixelsize=10;2" +; font-1 = Noto Color Emoji:scale=8;2 +; font-2 = JetBrainsMono Nerd Font Mono:size=21:style=Regular;2 modules-left = i3 xwindow -modules-right = pulseaudio xkeyboard wlan backlight systray date +modules-right = pulseaudio xkeyboard wlan systray date cursor-click = pointer cursor-scroll = ns-resize @@ -116,9 +121,9 @@ ws-icon-default = 󰇀 [module/systray] type = internal/tray -tray-padding = 0px +tray-padding = 3px #tray-background = #dd576574 -tray-size = 100% +tray-size = 50% [module/xworkspaces] type = internal/xworkspaces @@ -202,7 +207,7 @@ type = internal/backlight ; Use the following command to list available cards: ; $ ls -1 /sys/class/backlight/ ; Default: first usable card in /sys/class/backlight (new in version 3.7.0) -card = nvidia_0 +card = nvidia_wmi_ec_backlight ; Use the `/sys/class/backlight/.../actual-brightness` file ; rather than the regular `brightness` file. diff --git a/linux/.config/polybar/launch.sh b/linux/.config/polybar/launch.sh index 71e615b..50bf014 100755 --- a/linux/.config/polybar/launch.sh +++ b/linux/.config/polybar/launch.sh @@ -4,6 +4,6 @@ killall -q polybar # Wait until the processes have been shut down while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done -# Launch the bar -polybar -c ~/.config/polybar/config.ini & +sleep 1 +MONITOR="HDMI-1-0" polybar --reload fz0x1 -c ~/.config/polybar/config.ini & diff --git a/linux/.picom.conf b/linux/.picom.conf index d448d21..e5c37cb 100644 --- a/linux/.picom.conf +++ b/linux/.picom.conf @@ -117,6 +117,10 @@ shadow-exclude = [ "class_g = 'Thunderbird' && argb", "class_g = 'Telegram' && argb", "name ?= 'Thunderbird' && (window_type = 'utility' || window_type = 'popup_menu')", + "class_g = 'Firefox' && argb", + "class_g = 'firefox' && argb", + "class_g = 'librewolf' && argb", + "class_g = 'Librewolf' && argb", # # Exclude some special popup menu shadows, but Modal Windows. # These are more finetuning thant previous ones: diff --git a/linux/.zshrc-additional b/linux/.zshrc-additional index a3edded..12dc29f 100644 --- a/linux/.zshrc-additional +++ b/linux/.zshrc-additional @@ -9,6 +9,7 @@ alias yyu='sudo pacman -Syyu' alias cop='xsel --clipboard --input' ## docker -export DOCKER_HOST=unix:///run/user/1000/docker.sock +#export DOCKER_HOST=unix:///run/user/1000/docker.sock +export DOCKER_HOST=unix://$XDG_RUNTIME_DIR/docker.soc ## Flatpak export PATH=$PATH:/var/lib/flatpak/exports/bin