1304efa651ed515df71f69e42ad5b8162d93d027

Author
TheEdgeOfRage <git@theedgeofrage.com>
Committer
TheEdgeOfRage <git@theedgeofrage.com>
Date

Message

Add work bool flag to chezmoi templates

Diff

  1diff --git a/config_template.yaml b/config_template.yaml
  2index 64c079496148524b01c01706766f194593655198..01f3ec0cc7373462ebd60eaa33d7959206161268 100644
  3--- a/config_template.yaml
  4+++ b/config_template.yaml
  5@@ -6,9 +6,9 @@ data:
  6   modern_cli: true
  7   opencode: true
  8   laptop: false
  9+  work: false
 10   agents:
 11     enabled: true
 12-    mcp: true
 13     reviewer_provider: openai
 14   hyprland:
 15     monitors:
 16@@ -22,6 +22,7 @@ data:
 17         layout: "us,rs,rs,de"
 18         variant: ",latinunicode,,"
 19       sensitivity: 1
 20+    wallpaper: path
 21   waybar:
 22     top:
 23       extra_modules: ""
 24diff --git a/dot_aliases.tmpl b/dot_aliases.tmpl
 25index b13914ec35f32fab7934264b02ec980a0544b12c..9730b906eed9fe0298079298081896c06ab3b9ae 100644
 26--- a/dot_aliases.tmpl
 27+++ b/dot_aliases.tmpl
 28@@ -109,11 +109,13 @@ alias sustop='systemctl --user stop'
 29 alias suenable='systemctl --user enable'
 30 alias sudisable='systemctl --user disable'
 31 
 32+{{ if (index . "work") | default false -}}
 33 # Terraform aliases
 34 alias tf='terraform'
 35 alias tfa='terraform apply /tmp/tfplan-$(basename $PWD); \rm /tmp/tfplan-$(basename $PWD)'
 36 alias tfp='terraform plan -out /tmp/tfplan-$(basename $PWD)'
 37 alias tfs='terraform state'
 38+{{- end }}
 39 
 40 # Remove non-used  Oh my zsh aliases
 41 unalias -m 'fd'
 42diff --git a/dot_config/herdr/config.toml b/dot_config/herdr/config.toml.tmpl
 43rename from dot_config/herdr/config.toml
 44rename to dot_config/herdr/config.toml.tmpl
 45index bac85fcd05db4602df7d55ac8dd2c5a217895247..aaabb41bf825e8ff1aa8f2c4baf95049db9e61d9 100644
 46--- a/dot_config/herdr/config.toml
 47+++ b/dot_config/herdr/config.toml.tmpl
 48@@ -41,7 +41,11 @@ show_agent_labels_on_pane_borders = true
 49 enabled = false
 50 
 51 [worktrees]
 52+{{- if (index . "work") | default false }}
 53 directory = "~/dev/dune/_worktrees/"
 54+{{- else }}
 55+directory = "~/dev/_worktrees/"
 56+{{- end }}
 57 
 58 [[keys.command]]
 59 key = "prefix+c"
 60diff --git a/dot_config/hypr/hyprland.lua.tmpl b/dot_config/hypr/hyprland.lua.tmpl
 61index 7e9d64fbaffb1af26f9a87eae2fae912f95dc7df..621c09bbce71c1ffb7cd473f16e812f7aefd8980 100644
 62--- a/dot_config/hypr/hyprland.lua.tmpl
 63+++ b/dot_config/hypr/hyprland.lua.tmpl
 64@@ -142,13 +142,16 @@ hl.animation({
 65 hl.on("hyprland.start", function()
 66 	hl.exec_cmd("hyprpm reload -n")
 67 	hl.exec_cmd("uwsm app -- firefox.desktop")
 68+	hl.exec_cmd("uwsm app -- supersonic-desktop.desktop")
 69+	{{- if not (index . "work") | default false }}
 70 	hl.exec_cmd("uwsm app -- org.telegram.desktop.desktop")
 71 	hl.exec_cmd("uwsm app -- signal.desktop")
 72-	hl.exec_cmd("uwsm app -- supersonic-desktop.desktop")
 73+	{{- end }}
 74 end)
 75 
 76 hl.bind(mod .. " + SHIFT + Q", hl.plugin.hy3.kill_active())
 77 hl.bind(mod .. " + SHIFT + X", hl.dsp.exec_cmd('loginctl terminate-session "$XDG_SESSION_ID"'))
 78+hl.bind(mod .. " + CTRL + L", hl.dsp.exec_cmd("hyprlock"))
 79 
 80 hl.bind(mod .. " + Space", hl.dsp.exec_cmd(menu))
 81 hl.bind(mod .. " + BackSpace", hl.dsp.exec_cmd(menu))
 82@@ -224,11 +227,8 @@ hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("light -A 10"), { locked = true,
 83 hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("light -U 10"), { locked = true, repeating = true })
 84 hl.bind("SHIFT + XF86MonBrightnessUp", hl.dsp.exec_cmd("light -A 1"), { locked = true, repeating = true })
 85 hl.bind("SHIFT + XF86MonBrightnessDown", hl.dsp.exec_cmd("light -U 1"), { locked = true, repeating = true })
 86-
 87-hl.bind(mod .. " + CTRL + L", hl.dsp.exec_cmd("hyprlock"))
 88 hl.bind("Print", hl.dsp.exec_cmd("hyprshot -z -m region --clipboard-only"))
 89 hl.bind("SHIFT + Print", hl.dsp.exec_cmd("hyprshot -z -m region -o /home/pavle/pictures -f screenshot.png"))
 90-hl.bind(mod .. " + Print", hl.dsp.exec_cmd("pyazo -d"))
 91 
 92 hl.window_rule({
 93 	name = "no-border-workspace-tv1",
 94diff --git a/dot_config/opencode/opencode.jsonc.tmpl b/dot_config/opencode/opencode.jsonc.tmpl
 95index 0ebf126371ab3e14dd6f5bd401d6c4b3c8232d9b..c99801ca2ea4a349730a39ec5bd66682b3554dba 100644
 96--- a/dot_config/opencode/opencode.jsonc.tmpl
 97+++ b/dot_config/opencode/opencode.jsonc.tmpl
 98@@ -38,7 +38,7 @@
 99       },
100       "models": {
101         "swift-1.5-27b-q3": {
102-          "name": "Swift 1.5 27B)",
103+          "name": "Swift 1.5 27B",
104           "limit": {
105             "context": 65536,
106             "output": 32768
107@@ -47,9 +47,7 @@
108       }
109     },
110   },
111-  {{- if index (index . "agents" | default dict) "mcp" | default false }}
112   "mcp": {},
113-  {{ end -}}
114   "formatter": {
115     "clang-format": {
116       "disabled": true
117diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl
118index 56fe6f3bc56ece62c46b463c6439fd21d39b4b39..aa1c7291b689d3a2b50738fd86edb92e4771d1eb 100644
119--- a/dot_gitconfig.tmpl
120+++ b/dot_gitconfig.tmpl
121@@ -1,11 +1,13 @@
122-; vim: noet
123+; vim: noet ft=gitconfig
124 [user]
125 	name = TheEdgeOfRage
126 	email = git@theedgeofrage.com
127 [pull]
128 	rebase = true
129+{{ if (index . "work") | default false -}}
130 [url "github.com:duneanalytics"]
131 	insteadOf = https://github.com/duneanalytics
132+{{- end }}
133 [alias]
134 	lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
135 	slg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s' --abbrev-commit
136diff --git a/dot_zshrc.tmpl b/dot_zshrc.tmpl
137index c8d8aa54a65eff7f9dddf629fe7716caaf6a165b..384e7f96a5a6d36dc0382a99a3f2937662feec22 100644
138--- a/dot_zshrc.tmpl
139+++ b/dot_zshrc.tmpl
140@@ -11,7 +11,7 @@ if [ -z "${ZSH_ENV_SET}" ]; then
141     export MAKEFLAGS="-j $(nproc --all)"
142     export LESS="-SRF --mouse"
143     export GPG_TTY=$(tty)
144-    export GOPRIVATE="github.com/duneanalytics/*,git.theedgeofrage.com/*"
145+    export GOPRIVATE="{{ if (index . "work") | default false }}github.com/duneanalytics/*,{{ end }}git.theedgeofrage.com/*"
146     export GOPATH="$HOME/dev/go"
147     export GOBIN="$HOME/dev/go/bin"
148     export VIRTUAL_ENV_DISABLE_PROMPT="true"
149@@ -55,7 +55,7 @@ if [ -z "${ZSH_ENV_SET}" ]; then
150 
151     # Additional env vars
152     {{ range $entry := .zshrc.env_vars }}
153-    export {{ $entry.key }}="{{ $entry.val }}"
154+    export {{ $entry.name }}="{{ $entry.value }}"
155     {{ end }}
156 
157     # Prevent zsh env vars from getting exported multiple times