From 8641139d8ea9e1104143a9f2f111d0d6e4325370 Mon Sep 17 00:00:00 2001
From: fschl <fschl@x230-wl>
Date: Mon, 8 Nov 2021 11:33:26 +0100
Subject: [PATCH] update sway config (vpn, notifications, automount)

---
 README.org            |  2 ++
 scripts/install.sh    | 16 ++++++++++------
 sway/config           | 24 ++++++++++--------------
 sway/mako.conf        | 27 +++++++++++++++++++++++++++
 sway/status-rust.toml | 29 +++++++++++++++++++----------
 5 files changed, 68 insertions(+), 30 deletions(-)
 create mode 100755 sway/mako.conf

diff --git a/README.org b/README.org
index f925e36..20f7088 100644
--- a/README.org
+++ b/README.org
@@ -116,3 +116,5 @@
    - [ ] seperate sources.list setup for server/desktop/laptop
    - [ ] Check new bootable USB solution: https://ventoy.net/en/index.html
    - [ ] move to ansible for easier modularization of setup
+   - [ ] notifications: move from ~mako~ to ~dunst~ when dunst >1.6 is available
+     on debian
diff --git a/scripts/install.sh b/scripts/install.sh
index e9bbf8e..9b0ca3e 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -215,6 +215,7 @@ install_workstation_apps() {
         fonts-font-awesome \
         fonts-noto \
         fonts-noto-cjk \
+        fonts-powerline \
         gimp \
         keepassxc \
         libnotify-bin \
@@ -225,8 +226,11 @@ install_workstation_apps() {
         libreoffice-l10n-en-gb \
         libreoffice-writer \
         ntfs-3g \
+        network-manager \
+        network-manager-openvpn \
         nmap \
-        fonts-powerline \
+        openvpn \
+        openvpn-systemd-resolved \
         thunderbird \
         thunderbird-l10n-de \
         thunderbird-l10n-en-gb \
@@ -245,16 +249,19 @@ install_sway() {
     apt update
     apt install -y \
         brightnessctl \
-        dunst \
+        mako \
         sway \
+        udiskie \
+        udisks2 \
         wl-clipboard \
         wob \
         wofi \
         ydotool \
         --no-install-recommends
 
-    rm /home/${USERNAME}/.bashrc
+    mv /home/${USERNAME}/.bashrc /home/${USERNAME}/.bashrc~
     ln -s /home/${USERNAME}/
+    cp ../sway/mako.conf /home/${USERNAME}/.config/mako/conf
 
 }
 
@@ -274,12 +281,9 @@ install_i3() {
         i3lock \
         i3lock-fancy \
         i3status \
-        libnotify-bin \
-        libnotify-dev \
         network-manager-gnome \
         network-manager-vpnc \
         network-manager-vpnc-gnome \
-        notify-osd \
         remmina \
         rxvt-unicode-256color \
         scrot \
diff --git a/sway/config b/sway/config
index e066c49..a1ba1ac 100755
--- a/sway/config
+++ b/sway/config
@@ -228,7 +228,8 @@ bar {
     }
 
     status_command ~/.cargo/bin/i3status-rs ~/dotfiles/sway/status-rust.toml
-    tray_output $LAPTOP
+    # tray_output $LAPTOP
+    tray_output primary
 
     output $LAPTOP
     output $CENTER
@@ -249,7 +250,7 @@ bar {
     }
 
     status_command i3status --config ~/dotfiles/.i3/status.conf
-    tray_output $LAPTOP
+    tray_output primary
 
     # i3blocks: http://kumarcode.com/Colorful-i3/
     #   status_command i3blocks -c ~/.i3/i3blocks.conf
@@ -266,16 +267,11 @@ bar {
 # }
 
 # startup programs
-# exec amixer set Master 1+ off
-# exec amixer set Master 54
-# exec --no-startup-id nm-applet
-# exec --no-startup-id xrandr --output LVDS1 --left-of VGA1 --auto
-# exec --no-startup-id xrandr --output VGA1 --auto
-# #exec --no-startup-id clipit
-# exec --no-startup-id i3-msg 'workspace $WS1; exec firefox;'
-# exec --no-startup-id i3-msg 'workspace $WS2; exec emacs'
-# exec --no-startup-id i3-msg 'exec thunderbird'
-# exec --no-startup-id i3-msg 'exec keepassxc'
-# # exec --no-startup-id i3-msg 'exec nextcloud'
-# exec --no-startup-id i3-msg 'workspace $WS3; exec urxvt;'
+exec swaymsg 'exec mako -c /home/fschl/dotfiles/sway/mako.conf'
+exec swaymsg 'udiskie'
+exec swaymsg 'workspace $WS1; exec firefox;'
+exec swaymsg 'workspace $WS2; exec emacs'
+exec swaymsg 'workspace $WS4; exec thunderbird'
+exec swaymsg 'workspace $WS8; exec keepassxc'
+exec swaymsg 'workspace $WS3; exec alacritty;'
 
diff --git a/sway/mako.conf b/sway/mako.conf
new file mode 100755
index 0000000..a97a6e0
--- /dev/null
+++ b/sway/mako.conf
@@ -0,0 +1,27 @@
+sort=-time
+layer=overlay
+background-color=#1e1420
+width=380
+height=110
+border-size=2
+border-color=#88c0d0
+border-radius=15
+icons=0
+max-icon-size=64
+default-timeout=5000
+ignore-timeout=1
+font=monospace 14
+
+[urgency=low]
+border-color=#cccccc
+
+[urgency=normal]
+border-color=#d08770
+
+[urgency=high]
+border-color=#bf616a
+default-timeout=0
+
+[category=mpd]
+default-timeout=2000
+group-by=category
\ No newline at end of file
diff --git a/sway/status-rust.toml b/sway/status-rust.toml
index 8273411..859b55c 100644
--- a/sway/status-rust.toml
+++ b/sway/status-rust.toml
@@ -1,6 +1,11 @@
-theme = "semi-native"
+[theme]
+name = "semi-native"
 # theme = "solarized-dark"
-icons = "awesome"
+[theme.overrides]
+separator = "<span font='5'>|</span>"
+[icons]
+name = "awesome"
+
 
 [[block]]
 block = "pomodoro"
@@ -61,7 +66,9 @@ interval = 5
 [[block]]
 block = "net"
 device = "wlp3s0"
-format = "{ssid} {signal_strength} {ip} {speed_down;K*b} {graph_down;K*b}"
+on_click = "alacritty -e nmtui"
+format = "{ssid} {signal_strength} {ip} {speed_down;K*b}"
+# format = "{ssid} {signal_strength} {ip} {speed_down;K*b} {graph_down;K*b}"
 interval = 5
 
 [[block]]
@@ -77,15 +84,17 @@ show_volume_when_muted = true
 
 [[block]]
 block = "battery"
-driver = "upower"
+# driver = "upower"
+driver = "sysfs"
 format = "{percentage} {time}"
+allow_missing = true
 
-[[block]]
-block = "networkmanager"
-on_click = "alacritty -e nmtui"
-interface_name_exclude = ["br\\-[0-9a-f]{12}", "docker\\d+"]
-interface_name_include = []
-ap_format = "{ssid^10}"
+# [[block]]
+# block = "networkmanager"
+# on_click = "alacritty -e nmtui"
+# interface_name_exclude = ["br\\-[0-9a-f]{12}", "docker\\d+"]
+# interface_name_include = []
+# ap_format = "{ssid^10}"
 
 
 [[block]]