From 59af744246f38fb3c1cba33d06e680d29f866abd Mon Sep 17 00:00:00 2001
From: Thomas Schneider <qsx@chaotikum.eu>
Date: Fri, 18 Feb 2022 22:38:05 +0100
Subject: Separate host-specific config with files or inline

---
 .gitignore                         |  2 ++
 Makefile                           | 12 ++++++++++++
 coruscant.config-sway-local.conf   |  1 +
 coruscant.config-waybar-local.conf | 22 ++++++++++++++++++++++
 dot.config-sway-config             |  2 +-
 dot.config-waybar-config           | 19 +------------------
 dot.local-bin-sm                   | 10 +++++++++-
 naboo.config-sway-local.conf       |  3 +++
 naboo.config-waybar-local.conf     | 21 +++++++++++++++++++++
 9 files changed, 72 insertions(+), 20 deletions(-)
 create mode 100644 Makefile
 create mode 100644 coruscant.config-sway-local.conf
 create mode 100644 coruscant.config-waybar-local.conf
 create mode 100644 naboo.config-sway-local.conf
 create mode 100644 naboo.config-waybar-local.conf

diff --git a/.gitignore b/.gitignore
index b25c15b..1368f05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 *~
+dot.config-sway-local.conf
+dot.config-waybar-local.conf
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..36d0063
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,12 @@
+HOST = $(shell hostname -s)
+SRCS = $(wildcard $(HOST).*)
+OBJS = $(patsubst $(HOST).%,dot.%,$(SRCS))
+
+all: $(OBJS)
+
+dot.%: $(HOST).%
+	ln -s $< $@
+
+install: all
+	./install.py
+.PHONY: install
diff --git a/coruscant.config-sway-local.conf b/coruscant.config-sway-local.conf
new file mode 100644
index 0000000..81f0213
--- /dev/null
+++ b/coruscant.config-sway-local.conf
@@ -0,0 +1 @@
+output eDP-1 scale 2
diff --git a/coruscant.config-waybar-local.conf b/coruscant.config-waybar-local.conf
new file mode 100644
index 0000000..1c1e0be
--- /dev/null
+++ b/coruscant.config-waybar-local.conf
@@ -0,0 +1,22 @@
+{
+    "height": 12,
+    "tray": {
+        "icon-size": 10
+    },
+    "clock": {
+        "format": "{:%Y-%m-%d %T}",
+        "format-alt": "{:%T}"
+    },
+    "modules-right": [
+        "idle_inhibitor",
+        "pulseaudio",
+        "network",
+        "cpu",
+        "memory",
+        "temperature",
+        "backlight",
+        "battery",
+        "clock",
+        "tray"
+    ]
+}
diff --git a/dot.config-sway-config b/dot.config-sway-config
index 842274e..368e866 100644
--- a/dot.config-sway-config
+++ b/dot.config-sway-config
@@ -2,7 +2,7 @@
 
 set $mod Mod4
 
-output eDP-1 scale 2
+include local.conf
 
 # Font for window titles. Will also be used by the bar unless a different font
 # is used in the bar {} block below.
diff --git a/dot.config-waybar-config b/dot.config-waybar-config
index fc86430..c5287fc 100644
--- a/dot.config-waybar-config
+++ b/dot.config-waybar-config
@@ -1,8 +1,8 @@
 // -*- javascript -*- vim:ft=javascript sw=4 et
 {
+    "include": ".config/waybar/local.conf",
     "layer": "top", // Waybar at top layer
     "position": "top", // Waybar position (top|bottom|left|right)
-    // "height": 30, // Waybar height (to be removed for auto height)
     // "width": 1280, // Waybar width
     // Choose the order of the modules
     "modules-left": [
@@ -12,20 +12,6 @@
         // "custom/media"
     ],
     "modules-center": ["sway/window"],
-    "modules-right": [
-        // "mpd",
-        "idle_inhibitor",
-        "pulseaudio",
-        "network",
-        "cpu",
-        "memory",
-        "temperature",
-        "backlight",
-        // "sway/language",
-        "battery",
-        "clock",
-        "tray"
-    ],
     // Modules configuration
     // "sway/workspaces": {
     //     "disable-scroll": true,
@@ -79,14 +65,11 @@
         }
     },
     "tray": {
-        // "icon-size": 21,
         "spacing": 10
     },
     "clock": {
-        "format": "{:%T}",
         "interval": 1,
         "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
-        "format-alt": "{:%Y-%m-%d}"
     },
     "cpu": {
         "format": "{usage}% ",
diff --git a/dot.local-bin-sm b/dot.local-bin-sm
index 63101ae..c0fd090 100755
--- a/dot.local-bin-sm
+++ b/dot.local-bin-sm
@@ -1,5 +1,13 @@
 #!/bin/sh
 set -e
+case $(hostname -s) in
+	naboo)
+		format='%u%r %3n %10d %17f %22F %t %i%S'
+		;;
+	*)
+		format='%u%r %3n %10d %17f %8F %t %i%S'
+		;;
+esac
 set -x
 mbsync -a || true
 notmuch new
@@ -11,5 +19,5 @@ notmuch tag -new -- tag:new and folder:GMail/mail
 nm-tagger
 export MAILSEQ="${MBLAZE:-$HOME/.mblaze}/seq.sm"
 export MBLAZE_PAGER=""
-msearch -- --exclude=false query:new | mthread | mseq -S | mscan -f '%u%r %3n %10d %17f %8F %t %i%S'
+msearch -- --exclude=false query:new | mthread | mseq -S | mscan -f "$format"
 type mu > /dev/null && mu index || true
diff --git a/naboo.config-sway-local.conf b/naboo.config-sway-local.conf
new file mode 100644
index 0000000..1ac3810
--- /dev/null
+++ b/naboo.config-sway-local.conf
@@ -0,0 +1,3 @@
+output * scale 2
+output DP-1 pos 0 0
+output HDMI-A-1 pos 1920 0
diff --git a/naboo.config-waybar-local.conf b/naboo.config-waybar-local.conf
new file mode 100644
index 0000000..1f4d455
--- /dev/null
+++ b/naboo.config-waybar-local.conf
@@ -0,0 +1,21 @@
+{
+    "height": 16,
+    "tray": {
+        "icon-size": 16
+    },
+    "clock": {
+        "format": "{:%Y-%m-%d %T}",
+        "format-alt": "{:%T}"
+    },
+    "modules-right": [
+        "idle_inhibitor",
+        "pulseaudio",
+        "network",
+        "cpu",
+        "memory",
+        "temperature",
+        "backlight",
+        "clock",
+        "tray"
+    ]
+}
-- 
cgit v1.2.3