diff --git a/global/.zshrc-secrets b/global/.zshrc-secrets index a9040cc..2d50456 100644 Binary files a/global/.zshrc-secrets and b/global/.zshrc-secrets differ 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 = " -> Power Off <-" +cmd = "poweroff" +confirm_msg = "Are you sure you want to power off?" +[[block.items]] +display = " -> Reboot <-" +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)