From 2e0c992a549854be079b267874ebdd7959f5658f Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Sat, 7 Jan 2023 16:06:00 +0100
Subject: [PATCH] wayland: Consolidate with mako into desktop module

Since the existing wayland module basically describes everything about
my 'desktop environment' setup already anyway, might as well rename it
accordingly. Additionally, mako is important for notifications in this
environment so it moves here as well.
---
 {wayland => desktop}/.config/fontconfig/fonts.conf   |  0
 {wayland => desktop}/.config/kanshi/config           |  0
 {mako => desktop}/.config/mako/config                |  0
 {wayland => desktop}/.config/river/init              |  0
 {wayland => desktop}/.config/sh/env.d/compose-key.sh |  0
 {wayland => desktop}/.config/waybar/config           |  0
 .../.config/waybar/modules/archupdates               |  0
 {wayland => desktop}/.config/waybar/modules/khal.py  |  0
 .../.config/waybar/modules/wireguard                 |  0
 {wayland => desktop}/.config/waybar/style.css        |  0
 {wayland => desktop}/.local/bin/screenshot           |  0
 {wayland => desktop}/README.md                       | 12 ++++++++++--
 12 files changed, 10 insertions(+), 2 deletions(-)
 rename {wayland => desktop}/.config/fontconfig/fonts.conf (100%)
 rename {wayland => desktop}/.config/kanshi/config (100%)
 rename {mako => desktop}/.config/mako/config (100%)
 rename {wayland => desktop}/.config/river/init (100%)
 rename {wayland => desktop}/.config/sh/env.d/compose-key.sh (100%)
 rename {wayland => desktop}/.config/waybar/config (100%)
 rename {wayland => desktop}/.config/waybar/modules/archupdates (100%)
 rename {wayland => desktop}/.config/waybar/modules/khal.py (100%)
 rename {wayland => desktop}/.config/waybar/modules/wireguard (100%)
 rename {wayland => desktop}/.config/waybar/style.css (100%)
 rename {wayland => desktop}/.local/bin/screenshot (100%)
 rename {wayland => desktop}/README.md (89%)

diff --git a/wayland/.config/fontconfig/fonts.conf b/desktop/.config/fontconfig/fonts.conf
similarity index 100%
rename from wayland/.config/fontconfig/fonts.conf
rename to desktop/.config/fontconfig/fonts.conf
diff --git a/wayland/.config/kanshi/config b/desktop/.config/kanshi/config
similarity index 100%
rename from wayland/.config/kanshi/config
rename to desktop/.config/kanshi/config
diff --git a/mako/.config/mako/config b/desktop/.config/mako/config
similarity index 100%
rename from mako/.config/mako/config
rename to desktop/.config/mako/config
diff --git a/wayland/.config/river/init b/desktop/.config/river/init
similarity index 100%
rename from wayland/.config/river/init
rename to desktop/.config/river/init
diff --git a/wayland/.config/sh/env.d/compose-key.sh b/desktop/.config/sh/env.d/compose-key.sh
similarity index 100%
rename from wayland/.config/sh/env.d/compose-key.sh
rename to desktop/.config/sh/env.d/compose-key.sh
diff --git a/wayland/.config/waybar/config b/desktop/.config/waybar/config
similarity index 100%
rename from wayland/.config/waybar/config
rename to desktop/.config/waybar/config
diff --git a/wayland/.config/waybar/modules/archupdates b/desktop/.config/waybar/modules/archupdates
similarity index 100%
rename from wayland/.config/waybar/modules/archupdates
rename to desktop/.config/waybar/modules/archupdates
diff --git a/wayland/.config/waybar/modules/khal.py b/desktop/.config/waybar/modules/khal.py
similarity index 100%
rename from wayland/.config/waybar/modules/khal.py
rename to desktop/.config/waybar/modules/khal.py
diff --git a/wayland/.config/waybar/modules/wireguard b/desktop/.config/waybar/modules/wireguard
similarity index 100%
rename from wayland/.config/waybar/modules/wireguard
rename to desktop/.config/waybar/modules/wireguard
diff --git a/wayland/.config/waybar/style.css b/desktop/.config/waybar/style.css
similarity index 100%
rename from wayland/.config/waybar/style.css
rename to desktop/.config/waybar/style.css
diff --git a/wayland/.local/bin/screenshot b/desktop/.local/bin/screenshot
similarity index 100%
rename from wayland/.local/bin/screenshot
rename to desktop/.local/bin/screenshot
diff --git a/wayland/README.md b/desktop/README.md
similarity index 89%
rename from wayland/README.md
rename to desktop/README.md
index 56f574f..84d8e15 100644
--- a/wayland/README.md
+++ b/desktop/README.md
@@ -1,10 +1,18 @@
-# wayland
+# Wayland desktop environment
 
 Contains:
 [riverwm](https://github.com/riverwm/river)
 [waybar](https://github.com/Alexays/Waybar)
+mako -- notification daemon
+font settings
+kanshi -- display output setup
 
-My first foray into wayland is based on river, 
+The thoughts below are overhauled and fairly old - they are still based on my first days and weeks on wayland.
+Takeaway is this: I love the river wm, waybar is unexciting but does what it's supposed to and the wayland environment is totally worth it.
+
+---
+
+My first foray into wayland is based on river,
 a tiling window manager somewhat based on bspwm.
 
 This is only a very work-in-progress README file.