From 17e8714b03bec43c620558f643b6f7883b70699d Mon Sep 17 00:00:00 2001
From: Marco Thomas <github@marcothms.de>
Date: Tue, 20 Aug 2024 19:50:29 +0200
Subject: [PATCH] sway/readme: add wofi, update auto-locking, update readme

---
 README.md                             | 29 +++++++++++++++------------
 files/helix/.config/helix/config.toml |  1 +
 files/sway/.config/sway/config        | 10 +++++----
 files/waybar/.config/waybar/config    | 17 +++++++++++++---
 4 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/README.md b/README.md
index 9e9dcf4..40159f2 100644
--- a/README.md
+++ b/README.md
@@ -17,24 +17,27 @@ $ gsettings set org.gnome.desktop.wm.preferences button-layout ''
 ```
 
 
-# Dependencies
+### Dependencies
 
-Font: https://github.com/ryanoasis/nerd-fonts/releases/download/v3.2.1/JetBrainsMono.zip
+- Install based on Fedora Workstation with GNOME (makes everything easier)
+- Font: https://github.com/ryanoasis/nerd-fonts/releases/download/v3.2.1/JetBrainsMono.zip
+- Keyring provided by GNOME and startet in `sway(1)`
+- `keepassxc(1)` should use `/run/user/1000/keyring/ssh` as SSH Auth Socket
+- Env Vars exported via `systemd` in `files/environment/.config/environment.d/envvars.conf`
 
 ```
 sudo dnf install \
   kitty git vim tmux ripgrep fd-find fzf stow \
-  sway waybar \
-  brightnessctl \
-  wofi \
-  pasystray \
+  brave \
+  sway waybar wofi \
+  brightnessctl wireplumber pasystray \
   network-manager network-manager-applet \
-  nextcloud \
-  keepassxc \
-  fcitx5 fcitx5-configtool fcitx5-anthy \
+  fcitx5 fcitx5-configtool fcitx5-anthy fcitx5-* \
+  nextcloud keepassxc
 ```
 
-- https://github.com/ErikReider/SwayNotificationCenter
-- https://github.com/moverest/sway-interactive-screenshot
-- https://github.com/bjesus/wttrbar
-- https://github.com/Ferdi265/wl-mirror
+- notification daemon + popup: https://github.com/ErikReider/SwayNotificationCenter
+- screenshot: https://github.com/moverest/sway-interactive-screenshot (checked in as `files/sway/.config/sway/screenshot`)
+- weather info in bar: https://github.com/bjesus/wttrbar
+- screen mirror for live presentations: https://github.com/Ferdi265/wl-mirror
+- vpn: https://netbird.io/
\ No newline at end of file
diff --git a/files/helix/.config/helix/config.toml b/files/helix/.config/helix/config.toml
index d062559..4a08a6d 100644
--- a/files/helix/.config/helix/config.toml
+++ b/files/helix/.config/helix/config.toml
@@ -19,3 +19,4 @@ display-inlay-hints = true
 [keys.normal]
 "_" = ["extend_line_up", "extend_to_line_bounds"]
 "+" = ["extend_line_down", "extend_to_line_bounds"]
+
diff --git a/files/sway/.config/sway/config b/files/sway/.config/sway/config
index 83cd528..a784dcc 100644
--- a/files/sway/.config/sway/config
+++ b/files/sway/.config/sway/config
@@ -17,7 +17,7 @@
     set $lock swaylock -f -c 3D484D
     exec swayidle -w \
             timeout 600 '$lock' \
-            timeout 900 'swaymsg "output * power off"' resume 'swaymsg "output * dpms on"' \
+            timeout 900 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
             timeout 1200 'systemctl suspend' \
             before-sleep '$lock'
 
@@ -61,8 +61,10 @@ bindgesture swipe:4:left focus left
 
 # Run applications
     bindsym $mod+Return exec kitty
-    bindsym $mod+d exec wofi --show drun -I -i -a
-    bindsym $mod+Shift+d exec wofi --show run -i -a
+    #bindsym $mod+d exec wofi --show drun -I -i -a
+    bindsym $mod+d exec tofi-drun | xargs swaymsg exec --
+    #bindsym $mod+Shift+d exec wofi --show run -i -a
+    bindsym $mod+Shift+d exec tofi-run | xargs swaymsg exec --
     bindsym $mod+e exec nautilus
 
 # Moving around
@@ -111,7 +113,7 @@ bindgesture swipe:4:left focus left
 
 # Layout stuff
     bindsym $mod+f fullscreen
-    bindsym $mod+Shift+space floating toggle
+    bindsym $mod+Shift+space floating toggle, border normal 2
     bindsym $mod+space focus mode_toggle
 
 # Scratchpad
diff --git a/files/waybar/.config/waybar/config b/files/waybar/.config/waybar/config
index bab2ea5..29ffa26 100755
--- a/files/waybar/.config/waybar/config
+++ b/files/waybar/.config/waybar/config
@@ -150,10 +150,20 @@
     "sway/workspaces": {
         "all-outputs": false,
         "disable-scroll": true,
-        "format": "{icon} {name}",
+        "format": "{icon}",
         "format-icons": {
-            "urgent": "",
-            "focused": "",
+            "1": "一",
+            "2": "二",
+            "3": "三",
+            "4": "四",
+            "5": "五",
+            "6": "六",
+            "7": "七",
+            "8": "八",
+            "9": "九",
+            "10": "十",
+            // "urgent": "",
+            // "focused": "",
             "default": ""
         }
     },
@@ -203,6 +213,7 @@
     "custom/power": {
         "exec": "echo 💻 $(cat /sys/firmware/acpi/platform_profile)",
         "interval": 10,
+        "on-click": "kitty -e 'htop'"
     }
 
 }