From 3881796b8cc2d22d7fff9e995a01edc4318fe2ca Mon Sep 17 00:00:00 2001
From: ndwarshuis <ndwar@yavin4.ch>
Date: Thu, 21 Jul 2022 18:37:18 -0400
Subject: [PATCH] FIX xman still needs to run on any desktop

---
 .chezmoiexternal.yaml                   |  8 +++-----
 dot_bin/executable_bootstrap_build.tmpl |  2 --
 dot_config/X11/xinitrc.tmpl             |  2 --
 dot_config/greenclip.cfg.tmpl           | 10 ----------
 dot_config/greenclip.toml.tmpl          | 10 ++++++++++
 5 files changed, 13 insertions(+), 19 deletions(-)
 delete mode 100644 dot_config/greenclip.cfg.tmpl
 create mode 100644 dot_config/greenclip.toml.tmpl

diff --git a/.chezmoiexternal.yaml b/.chezmoiexternal.yaml
index c9de467..9cb51f9 100644
--- a/.chezmoiexternal.yaml
+++ b/.chezmoiexternal.yaml
@@ -10,14 +10,12 @@
 .config/xmonad:
   type: git-repo
   url: https://github.com/ndwarshuis/xmonad-config.git
+.config/xman:
+  type: git-repo
+  url: https://github.com/ndwarshuis/xman.git
 {{- end }}
 {{- if ne .features.conky_alias "none" }}
 .config/conky:
   type: git-repo
   url: https://github.com/ndwarshuis/universal-conky.git
 {{- end }}
-{{- if .features.virtualbox }}
-.config/xman:
-  type: git-repo
-  url: https://github.com/ndwarshuis/xman.git
-{{- end }}
diff --git a/dot_bin/executable_bootstrap_build.tmpl b/dot_bin/executable_bootstrap_build.tmpl
index f8f3da3..e9d02f8 100644
--- a/dot_bin/executable_bootstrap_build.tmpl
+++ b/dot_bin/executable_bootstrap_build.tmpl
@@ -18,6 +18,4 @@ export STACK_ROOT={{ .paths.stack }}
 
 run_stack_in_dir ~/.config/rofi-extras
 run_stack_in_dir ~/.config/xmonad
-{{ if .features.virtualbox -}}
 run_stack_in_dir ~/.config/xman
-{{- end }}
diff --git a/dot_config/X11/xinitrc.tmpl b/dot_config/X11/xinitrc.tmpl
index 52d477a..af8f649 100644
--- a/dot_config/X11/xinitrc.tmpl
+++ b/dot_config/X11/xinitrc.tmpl
@@ -15,7 +15,6 @@ fi
 
 setxkbmap hypermode
 
-{{ if .features.virtualbox -}}
 KEYS="Control_L=Escape"
 KEYS="$KEYS;Control_R=Return"
 KEYS="$KEYS;Super_L=Tab"
@@ -23,7 +22,6 @@ KEYS="$KEYS;Super_R=backslash"
 KEYS="$KEYS;Alt_R=space"
 KEYS="$KEYS;ISO_Level3_Shift=XF86Search"
 xman -t 500 "$KEYS" "^VirtualBox Machine$" &
-{{- end }}
 
 # TODO put xmonad-specific stuff in its own script
 tmuxctl start
diff --git a/dot_config/greenclip.cfg.tmpl b/dot_config/greenclip.cfg.tmpl
deleted file mode 100644
index 359178c..0000000
--- a/dot_config/greenclip.cfg.tmpl
+++ /dev/null
@@ -1,10 +0,0 @@
-Config {
- maxHistoryLength = 100000,
- historyPath = "{{ .paths.cache }}/greenclip.history",
- staticHistoryPath = "{{ .paths.cache }}/greenclip.staticHistory",
- imageCachePath = "/tmp/greenclip/",
- usePrimarySelectionAsInput = False,
- blacklistedApps = [],
- trimSpaceFromSelection = True,
- enableImageSupport = True
-}
diff --git a/dot_config/greenclip.toml.tmpl b/dot_config/greenclip.toml.tmpl
new file mode 100644
index 0000000..a27e251
--- /dev/null
+++ b/dot_config/greenclip.toml.tmpl
@@ -0,0 +1,10 @@
+[greenclip]
+  blacklisted_applications = []
+  enable_image_support = true
+  image_cache_directory = "/tmp/greenclip/"
+  history_file = "{{ .paths.cache }}/greenclip.history"
+  max_history_length = 100000
+  max_selection_size_bytes = 0
+  static_history = []
+  trim_space_from_selection = true
+  use_primary_selection_as_input = false