f65c31d5fa888cee1199d0b51c1a5d42b0b7102b

Author
Pavle Portic <git@theedgeofrage.com>
Committer
Pavle Portic <git@theedgeofrage.com>
Date

Message

Template zshrc to add opitonal env vars

Diff

 1diff --git a/.chezmoiignore b/.chezmoiignore
 2index f6c1f94d3df14abc00a18ab308920ea80da57b15..8e2c4245a81f26ecaafd8ac2637c9ab65f0d40f3 100644
 3--- a/.chezmoiignore
 4+++ b/.chezmoiignore
 5@@ -1,3 +1,4 @@
 6 LICENSE
 7 init.sh
 8 custom_colemak
 9+config_template.yaml
10diff --git a/config_template.yaml b/config_template.yaml
11new file mode 100644
12index 0000000000000000000000000000000000000000..a88d7a6710665561f2423ecc1107ebabffd35a7a
13--- /dev/null
14+++ b/config_template.yaml
15@@ -0,0 +1,19 @@
16+data:
17+  i3:
18+    font_size: 13
19+    xrandr: ''
20+    tray_output: ''
21+    bumblebee:
22+      modules: 'ytrssil'
23+      parameters: >-
24+        sensors.path="coretemp-isa-0000/Package id 0/temp1_input"
25+  xresources:
26+    rgba:
27+      - rgba: rgb
28+        dpi: 96
29+  roxterm:
30+    font:
31+      size: 14
32+  zshrc:
33+    gdk_scale: '1.0'
34+    env_vars: []
35diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl
36index 19d4bded9b61532a8800a06a659cc7b45666825c..af2f09e6c3723e82fa84bd62bdf240b0ce34c8ed 100644
37--- a/dot_config/i3/config.tmpl
38+++ b/dot_config/i3/config.tmpl
39@@ -208,7 +208,8 @@ bar {
40 	position top
41 	tray_output none
42 	status_command ~/.local/share/bumblebee-status/bumblebee-status -m \
43-		spotify {{ .i3.bumblebee.modules }} \
44+		spotify \
45+		dunst {{ .i3.bumblebee.modules }} \
46 		sensors \
47 		layout \
48 		pasource \
49@@ -218,6 +219,8 @@ bar {
50 		-p workspacewheel=False \
51 		pasource.showbars="1" \
52 		pasink.showbars="1" \
53+		sensors.use_sensors="true" \
54+		sensors.json="true" \
55 		{{ .i3.bumblebee.parameters }} \
56 		date.format="%a, %Y-%m-%d" \
57 		date.interval="30" \
58diff --git a/dot_zshrc b/dot_zshrc.tmpl
59rename from dot_zshrc
60rename to dot_zshrc.tmpl
61index 2639d1a59e26ccff392789ebf57038aa45d6be66..b666b81e545d6dc1ce350e4dc7cb47d98cf9e348 100644
62--- a/dot_zshrc
63+++ b/dot_zshrc.tmpl
64@@ -1,3 +1,4 @@
65+# vim: set ft=zsh:
66 # History
67 HISTFILE=~/.histfile
68 HISTSIZE=40000
69@@ -55,8 +56,9 @@ export QT_QPA_PLATFORMTHEME="qt5ct"
70 export VISUAL="nvim"
71 export XDG_CONFIG_HOME="$HOME/.config"
72 export VIRTUAL_ENV_DISABLE_PROMPT="true"
73-export GDK_DPI_SCALE=1.1
74-
75+export GDK_DPI_SCALE={{ or .zshrc.gdk_scale "1.0" }}
76+{{ range $_, $env := .zshrc.env_vars }}export {{ $env.name }}={{ $env.value }}
77+{{end}}
78 # Valve shader compiler
79 export RADV_PERFTEST="aco"
80