ENH use switches in more places

.chezmoi.yaml.tmpl

@@ -22,7 +22,7 @@ data:
     xsane: {{ and $desktop (promptBool "xsane" false) }}
     f5vpn: {{ and $desktop (promptBool "f5vpn" false) }}
     seafile: {{ and $desktop (promptBool "seafile" false) }}
-    conky_alias: {{ and $desktop (promptString "conky" "null") }}
+    conky_alias: {{ and $desktop (promptString "conky" "none") }}
   development:
 
     {{- /* emacs implies that most development options are true */}}

.chezmoiexternal.yaml

@@ -10,10 +10,11 @@
 .config/xmonad:
   type: git-repo
   url: https://github.com/ndwarshuis/xmonad-config.git
+{{- end }}
+{{- if ne .features.conky_alias "none" }}
 .config/conky:
   type: git-repo
   url: https://github.com/ndwarshuis/universal-conky.git
-  clone-args: --recurse-submodules
 {{- end }}
 {{- if .features.virtualbox }}
 .config/xman:

.chezmoiignore

@@ -6,15 +6,14 @@
 !.config/python
 !.config/tmux
 !.config/zsh
-.config/zsh/.zprofile
-.config/zsh/.zlogout
 
 .local
 {{- end }}
 
-{{- if not .features.conky_alias }}
+{{ if ne .features.conky_alias "none" -}}
-.config/conky.yml
+.symlinks/conky-configs
 {{- end }}
 
-# this is linked; allow VirtualBox to configure by itself
+{{ if not .features.virtualbox -}}
-VirtualBox.xml
+.symlinks/VirtualBox.xml
+{{- end }}

dot_bin/executable_bootstrap_pkgs.tmpl

@@ -47,7 +47,7 @@ run_install_scripts() {
 
 run_yay() {
     # notifications
-    pkgs=(dunst)
+    pkgs=(dunst papirus-icon-theme)
     # gtk
     pkgs+=(zuki-themes)
     # sleep enhancement
@@ -71,7 +71,9 @@ run_makepkg() {
     {{ if .features.clevo -}}
     call_makepkg "clevo-xsm-wmi-dkms"
     {{- end }}
+    {{ if ne .features.conky_alias "none" -}}
     call_makepkg "conky-lua"
+    {{- end }}
     call_makepkg "xkb-hypermode"
 }
 

dot_config/autorandr/executable_postswitch.tmpl

@@ -2,5 +2,7 @@
 
 feh --no-fehbg --bg-scale --bg-fill "$XDG_DATA_HOME/backgrounds/moon_forest.jpg" &
 
+{{ if ne .features.conky_alias "none" -}}
 killall conky > /dev/null 2>&1
 conky -d > /dev/null 2>&1
+{{- end }}

dot_config/conda/condarc

@@ -1,9 +0,0 @@
-channels:
-  - conda-forge
-  - bioconda
-
-envs_dirs:
-  - ~/.local/share/conda/envs
-
-pkgs_dirs:
-  - ~/.local/share/conda/pkgs

dot_config/conda/condarc.tmpl

@@ -0,0 +1,9 @@
+channels:
+  - conda-forge
+  - bioconda
+
+envs_dirs:
+  - {{ .paths.data }}/conda/envs
+
+pkgs_dirs:
+  - {{ .paths.data }}/conda/pkgs

dot_config/greenclip.cfg.tmpl

@@ -1,7 +1,7 @@
 Config {
  maxHistoryLength = 100000,
- historyPath = "~/.cache/greenclip.history",
+ historyPath = "{{ .paths.cache }}/greenclip.history",
- staticHistoryPath = "~/.cache/greenclip.staticHistory",
+ staticHistoryPath = "{{ .paths.cache }}/greenclip.staticHistory",
  imageCachePath = "/tmp/greenclip/",
  usePrimarySelectionAsInput = False,
  blacklistedApps = [],

dot_config/zsh/dot_zprofile.tmpl

@@ -1,4 +1,6 @@
+{{ if .desktop -}}
 initfile="$XDG_CONFIG_HOME/X11/xinitrc"
 logfile="$XDG_DATA_HOME/X11/xinit.log"
 [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && \
     exec startx "$initfile" -- -keeptty > "$logfile" 2>&1
+{{- end }}