From 5bb0014265536ee59a9d63625f716257bdd2785c Mon Sep 17 00:00:00 2001
From: Tom Willemse
Date: Sun, 26 Apr 2020 21:01:48 -0700
Subject: Reorganize xsession and Xresources

- Add xsession. Instead of requiring each of my machines to setup their own
‘.xsession’ add one that should work for all of them.

- Use M4 for the Xresources database. I didn’t want the X11 project to be aware
of all the configuration files that could be added in there and I was able to
figure out how to have it load all of the configuration files in the
‘Xresources.d’ directory. Now each configuration can inject properties into the
X resources database.

- Have ‘.xsession’ load all of the scripts in ‘.config/X11/Xsession.d’. Each
configuration can now inject some script to run when X starts.

- Have ‘.xsession’ load a machine-specific script so that each machine can
override what it does when X starts.
---
 rofi/.config/X11/Xresources.d/Rofi.conf | 38 +++++++++++++++++++++++++++++++++
 rofi/.config/Xresources/Rofi.conf       | 18 ----------------
 2 files changed, 38 insertions(+), 18 deletions(-)
 create mode 100644 rofi/.config/X11/Xresources.d/Rofi.conf
 delete mode 100644 rofi/.config/Xresources/Rofi.conf

(limited to 'rofi/.config')

diff --git a/rofi/.config/X11/Xresources.d/Rofi.conf b/rofi/.config/X11/Xresources.d/Rofi.conf
new file mode 100644
index 0000000..6eedca2
--- /dev/null
+++ b/rofi/.config/X11/Xresources.d/Rofi.conf
@@ -0,0 +1,38 @@
+dnl Rofi colors
+define(`Rofi_normal_bg', `bgdim')dnl
+define(`Rofi_normal_fg', `fgdefault')dnl
+define(`Rofi_normal_bgalt', `Rofi_normal_bg')dnl
+define(`Rofi_normal_hlbg', `bgblue')dnl
+define(`Rofi_normal_hlfg', `fgdefault')dnl
+define(`Rofi_urgent_bg', `bgdefault')dnl
+define(`Rofi_urgent_fg', `fgred')dnl
+define(`Rofi_urgent_bgalt', `Rofi_urgent_bg')dnl
+define(`Rofi_urgent_hlbg', `Rofi_normal_hlbg')dnl
+define(`Rofi_urgent_hlfg', `Rofi_urgent_fg')dnl
+define(`Rofi_active_bg', `bgdefault')dnl
+define(`Rofi_active_fg', `fgcyan')dnl
+define(`Rofi_active_bgalt', `Rofi_active_bg')dnl
+define(`Rofi_active_hlbg', `Rofi_normal_hlbg')dnl
+define(`Rofi_active_hlfg', `Rofi_active_fg')dnl
+define(`Rofi_window_bg', `Rofi_normal_bg')dnl
+define(`Rofi_window_border', `Rofi_normal_bg')dnl
+define(`Rofi_window_separator', `Rofi_normal_bg')dnl
+dnl
+! Use a nice font.
+rofi.font: Fantasque Sans Mono 15
+
+! Add C-g to the keys used to cancel an action in Rofi. I am used to
+! this from Emacs and I always press it before I press ESC.
+rofi.kb-cancel: Escape,Control+bracketleft,Control+g
+
+! Hide the scrollbar
+rofi.hide-scrollbar: true
+
+! Show a thick border around Rofi
+rofi.bw: 15
+
+! Theme
+rofi.color-normal: Rofi_normal_bg, Rofi_normal_fg, Rofi_normal_bgalt, Rofi_normal_hlbg, Rofi_normal_hlfg
+rofi.color-urgent: Rofi_urgent_bg, Rofi_urgent_fg, Rofi_urgent_bgalt, Rofi_urgent_hlbg, Rofi_urgent_hlfg
+rofi.color-active: Rofi_active_bg, Rofi_active_fg, Rofi_active_bgalt, Rofi_active_hlbg, Rofi_active_hlfg
+rofi.color-window: Rofi_window_bg, Rofi_window_border, Rofi_window_separator
diff --git a/rofi/.config/Xresources/Rofi.conf b/rofi/.config/Xresources/Rofi.conf
deleted file mode 100644
index c4098b6..0000000
--- a/rofi/.config/Xresources/Rofi.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-! Use a nice font.
-rofi.font: Fantasque Sans Mono 15
-
-! Add C-g to the keys used to cancel an action in Rofi. I am used to
-! this from Emacs and I always press it before I press ESC.
-rofi.kb-cancel: Escape,Control+bracketleft,Control+g
-
-! Hide the scrollbar
-rofi.hide-scrollbar: true
-
-! Show a thick border around Rofi
-rofi.bw: 15
-
-! Theme
-rofi.color-normal: Rofi_normal_bg, Rofi_normal_fg, Rofi_normal_bgalt, Rofi_normal_hlbg, Rofi_normal_hlfg
-rofi.color-urgent: Rofi_urgent_bg, Rofi_urgent_fg, Rofi_urgent_bgalt, Rofi_urgent_hlbg, Rofi_urgent_hlfg
-rofi.color-active: Rofi_active_bg, Rofi_active_fg, Rofi_active_bgalt, Rofi_active_hlbg, Rofi_active_hlfg
-rofi.color-window: Rofi_window_bg, Rofi_window_border, Rofi_window_separator
-- 
cgit v1.2.3-54-g00ecf