From c30ef96b27932e4017181bdf35bdbb2d7ba65a1f Mon Sep 17 00:00:00 2001
From: Konstantin Koslowski <konstantin.koslowski@rohde-schwarz.com>
Date: Wed, 24 Aug 2022 22:39:56 +0200
Subject: [PATCH] bslxkos02: add config, some tweaks

---
 config                                        |  2 +
 hosts.d/{BSLXKOS1.conf => bslxkos01.conf}     |  0
 hosts.d/bslxkos02.conf                        | 11 ++++
 waybar.d/{config_7DPQTN2 => config_bslxkos02} | 63 +++----------------
 4 files changed, 21 insertions(+), 55 deletions(-)
 rename hosts.d/{BSLXKOS1.conf => bslxkos01.conf} (100%)
 create mode 100644 hosts.d/bslxkos02.conf
 rename waybar.d/{config_7DPQTN2 => config_bslxkos02} (70%)

diff --git a/config b/config
index 8e1097d..301f1c4 100644
--- a/config
+++ b/config
@@ -217,7 +217,9 @@ gaps right 0
 #
 # Move the currently focused window to the scratchpad
 bindsym $mod+Shift+s move scratchpad
+# Show all scratchpads
 bindsym $mod+Ctrl+s scratchpad show
+# Show specific scratchpads
 bindsym $mod+a [con_mark="a" tiling=True] focus; [con_mark="a" floating=True] focus output $$main; \
     [con_mark="a" floating=True] scratchpad show;
 bindsym $mod+s [con_mark="s" tiling=True] focus; [con_mark="s" floating=True] focus output $$main; \
diff --git a/hosts.d/BSLXKOS1.conf b/hosts.d/bslxkos01.conf
similarity index 100%
rename from hosts.d/BSLXKOS1.conf
rename to hosts.d/bslxkos01.conf
diff --git a/hosts.d/bslxkos02.conf b/hosts.d/bslxkos02.conf
new file mode 100644
index 0000000..160dbe2
--- /dev/null
+++ b/hosts.d/bslxkos02.conf
@@ -0,0 +1,11 @@
+# vim: ft=i3
+### bslxkos02 specific settings
+set $extern-38 "Goldstar Company Ltd 38GN950 008NTLEFY912"
+set $extern-29 "Lenovo Group Limited L29w-30 UPV08NFA"
+set $port-38 HDMI-A-1
+set $port-29 DP-3
+set $main $port-38
+
+### Output configuration
+output $extern-38 mode 3840x1600 position 0 1080
+output $extern-29 mode 2560x1080 position 630 0
diff --git a/waybar.d/config_7DPQTN2 b/waybar.d/config_bslxkos02
similarity index 70%
rename from waybar.d/config_7DPQTN2
rename to waybar.d/config_bslxkos02
index 592c835..8820ac3 100644
--- a/waybar.d/config_7DPQTN2
+++ b/waybar.d/config_bslxkos02
@@ -16,25 +16,23 @@
     "custom/media",
     "custom/separator#center",
     "pulseaudio",
-    "custom/separator#left"
+    // "custom/separator#center",
+    // "custom/card",
+    // "custom/separator#center",
+    // "custom/mail",
+    "custom/separator#left",
+    "custom/separator#space"
   ],
   "modules-right": [
     "custom/separator#right",
-    // "custom/card",
-    // "custom/separator#right",
-    // "custom/mail",
-    // "custom/separator#right",
     "network#en0",
-    "network#en1",
-    "network#en2",
     "network#wl0",
-    "network#vpn0",
     "custom/separator#right",
     "cpu",
     "memory",
     "custom/separator#right",
-    "battery",
-    "custom/separator#right",
+    // "battery",
+    // "custom/separator#right",
     "custom/calendar",
     "clock",
     "tray"
@@ -165,36 +163,6 @@
     "tooltip-format-disconnected": "{ifname} disconnected",
     "on-click": "foot -T float nmtui"
   },
-  "network#en1": {
-    "interval": 2,
-    "interface": "en1",
-    "format": "{ifname}",
-    "format-wifi": "<span foreground='#ebdbb2'> </span>{ifname}",
-    "format-linked": "<span foreground='#ebdbb2'> </span>{ifname}",
-    "format-disconnected": "<span foreground='#606060'> </span>{ifname}",
-    "min-length": 8,
-    "max-length": 30,
-    "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
-    "tooltip-format-ethernet": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
-    "tooltip-format-wifi": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
-    "tooltip-format-disconnected": "{ifname} disconnected",
-    "on-click": "foot -T float nmtui"
-  },
-  "network#en2": {
-    "interval": 2,
-    "interface": "en2",
-    "format": "{ifname}",
-    "format-wifi": "<span foreground='#ebdbb2'> </span>{ifname}",
-    "format-linked": "<span foreground='#ebdbb2'> </span>{ifname}",
-    "format-disconnected": "<span foreground='#606060'> </span>{ifname}",
-    "min-length": 8,
-    "max-length": 30,
-    "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
-    "tooltip-format-ethernet": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
-    "tooltip-format-wifi": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
-    "tooltip-format-disconnected": "{ifname} disconnected",
-    "on-click": "foot -T float nmtui"
-  },
   "network#wl0": {
     "interval": 2,
     "interface": "wl0",
@@ -210,21 +178,6 @@
     "tooltip-format-disconnected": "{ifname} disconnected",
     "on-click": "foot -T float nmtui"
   },
-  "network#vpn0": {
-    "interval": 2,
-    "interface": "vpn0",
-    "format": "{ifname}",
-    "format-wifi": "<span foreground='#ebdbb2'> </span>{ifname}",
-    "format-linked": "<span foreground='#ebdbb2'> </span>{ifname}",
-    "format-disconnected": "<span foreground='#606060'> </span>{ifname}",
-    "min-length": 8,
-    "max-length": 30,
-    "tooltip-format": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
-    "tooltip-format-ethernet": "{ifname}\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
-    "tooltip-format-wifi": "{ifname} {essid} ({signalStrength:3}%)\n\t{ipaddr}/{cidr}\n  \t{bandwidthDownBits}\n  \t{bandwidthUpBits}",
-    "tooltip-format-disconnected": "{ifname} disconnected",
-    "on-click": "foot -T float nmtui"
-  },
   "pulseaudio": {
     "format": "<span foreground='#ebdbb2'>{icon} </span>{volume}% {format_source}",
     "format-muted": "<span foreground='#fb4934'> </span>{format_source}",