1633ae56216f3e2d23b4f468e64a256747b12347

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

Message

Use bumblebee config files instead of cmdline args

Diff

  1diff --git a/config_template.yaml b/config_template.yaml
  2index 241e359d547f5e7d69efb75325f09d9fb8abb056..e3dff0f581cbf7ceb2dcf3b48edc03ef15dc33cf 100644
  3--- a/config_template.yaml
  4+++ b/config_template.yaml
  5@@ -6,9 +6,10 @@ data:
  6     tray_output: ''
  7     nm_applet: true
  8     bumblebee:
  9-      modules: 'ytrssil'
 10-      parameters: >-
 11-        sensors.path="coretemp-isa-0000/Package id 0/temp1_input"
 12+      modules: 'ytrssil,'
 13+      parameters:
 14+        - key: "sensors.path"
 15+          value: "coretemp-isa-0000/Package id 0/temp1_input"
 16     additional_bindings: ''
 17   xresources:
 18     per_screen: []
 19diff --git a/dot_config/bumblebee-status/bottom.toml.tmpl b/dot_config/bumblebee-status/bottom.toml.tmpl
 20new file mode 100644
 21index 0000000000000000000000000000000000000000..c5a04f033c0f1ad5c5237a4e759f17b72d29912b
 22--- /dev/null
 23+++ b/dot_config/bumblebee-status/bottom.toml.tmpl
 24@@ -0,0 +1,13 @@
 25+[core]
 26+modules=traffic, nic, load, cpu2, memory
 27+autohide=#comma-separated list of modules to hide, unless in warning/error state
 28+theme=gruvbox-powerline
 29+
 30+[module-parameters]
 31+workspacewheel=False
 32+traffic.hide_down=True
 33+traffic.exclude=lo,virbr,docker,vboxnet,veth,br-,cni,flannel,podman,tun,wg,tailscale,wt
 34+nic.exclude=lo,virbr,docker,vboxnet,veth,br-,cni,flannel,podman
 35+nic.states=^down
 36+cpu2.layout=cpu2.coresload
 37+cpu2.colored=1
 38diff --git a/dot_config/bumblebee-status/top.toml.tmpl b/dot_config/bumblebee-status/top.toml.tmpl
 39new file mode 100644
 40index 0000000000000000000000000000000000000000..73f08f5cb7540a577639ae982366899f5a5637a9
 41--- /dev/null
 42+++ b/dot_config/bumblebee-status/top.toml.tmpl
 43@@ -0,0 +1,24 @@
 44+[core]
 45+modules=playerctl, dunst, {{ .i3.bumblebee.modules }} sensors, pulsein, pulseout, date, time
 46+autohide=#comma-separated list of modules to hide, unless in warning/error state
 47+theme=gruvbox-powerline
 48+
 49+[module-parameters]
 50+workspacewheel=False
 51+playerctl.args=-p Deezer
 52+playerctl.layout=playerctl.song,playerctl.prev,playerctl.pause,playerctl.next
 53+playerctl.format={{`{{artist}}`}} - {{`{{title}}`}}
 54+playerctl.hide=true
 55+pulsein.showbars=1
 56+pulseout.showbars=1
 57+pulsectl.alsa_output.pci-0000_00_1f.3.analog-stereo=
 58+pulsectl.alsa_output.usb-Topping_DX3_Pro_-00.iec958-stereo=🎧
 59+pulsectl.left-click=select_default_device_popup
 60+sensors.use_sensors=true
 61+sensors.json=true
 62+date.format=%a, %Y-%m-%d
 63+date.interval=30
 64+time.format=%H:%M:%S
 65+time.interval=1
 66+{{ range $_, $param := .i3.bumblebee.parameters -}}{{ $param.key }}={{ $param.value }}
 67+{{end}}
 68diff --git a/dot_config/i3/config.tmpl b/dot_config/i3/config.tmpl
 69index 80b921d32a404ba8b5b9019a6d0251a4ae0ed8f9..6a0077a492b7f18846a5780b4d1a6e34322dc5a7 100644
 70--- a/dot_config/i3/config.tmpl
 71+++ b/dot_config/i3/config.tmpl
 72@@ -219,29 +219,7 @@ bindsym $mod+F12 mode "$mode_kb_select"
 73 bar {
 74 	position top
 75 	tray_output none
 76-	status_command ~/.local/share/bumblebee-status/bumblebee-status -m \
 77-		playerctl \
 78-		dunst {{ .i3.bumblebee.modules }} \
 79-		sensors \
 80-		pasource \
 81-		pasink \
 82-		date \
 83-		time \
 84-		-p workspacewheel=False \
 85-		playerctl.args="-p Deezer" \
 86-		playerctl.layout="playerctl.song,playerctl.prev,playerctl.pause,playerctl.next" \
 87-		playerctl.format="{{`{{artist}}`}} - {{`{{title}}`}}" \
 88-		playerctl.hide="true" \
 89-		pasource.showbars="1" \
 90-		pasink.showbars="1" \
 91-		sensors.use_sensors="true" \
 92-		sensors.json="true" \
 93-		{{ .i3.bumblebee.parameters }} \
 94-		date.format="%a, %Y-%m-%d" \
 95-		date.interval="30" \
 96-		time.format="%H:%M:%S" \
 97-		time.interval="1" \
 98-		-t gruvbox-powerline
 99+	status_command ~/.local/share/bumblebee-status/bumblebee-status -c ~/.config/bumblebee-status/top.toml
100 	bindsym button4 nop
101 	bindsym button5 nop
102 	colors {
103@@ -256,20 +234,7 @@ bar {
104 bar {
105 	position bottom
106 	tray_output {{ .i3.tray_output }}
107-	status_command ~/.local/share/bumblebee-status/bumblebee-status -m \
108-		traffic \
109-		nic \
110-		load \
111-		cpu2 \
112-		memory \
113-		-p engine.workspacewheel=False \
114-		traffic.hide_down=True \
115-		traffic.exclude="lo,virbr,docker,vboxnet,veth,br-,cni,flannel,podman,tun,wg,tailscale,wt" \
116-		nic.exclude="lo,virbr,docker,vboxnet,veth,br-,cni,flannel,podman" \
117-		nic.states="^down" \
118-		cpu2.layout="cpu2.coresload" \
119-		cpu2.colored=1 \
120-		-t gruvbox-powerline
121+	status_command ~/.local/share/bumblebee-status/bumblebee-status -c ~/.config/bumblebee-status/bottom.toml
122 	bindsym button4 nop
123 	bindsym button5 nop
124 	colors {