From 5a2d1438319e776732739ec45315bfd925ab36bb Mon Sep 17 00:00:00 2001 From: Joachim Nielandt Date: Thu, 4 Nov 2021 09:27:50 +0100 Subject: [PATCH] Fixed sdkman + added interface names to polybar --- dot_dotfiles/i3/config | 3 ++- dot_dotfiles/i3/workspace-9.json | 4 ---- dot_dotfiles/oh-my-zsh/custom/10_finalise.zsh | 4 ++-- dot_dotfiles/polybar/config.tmpl | 8 +++++++- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dot_dotfiles/i3/config b/dot_dotfiles/i3/config index 40a4abb..475babe 100644 --- a/dot_dotfiles/i3/config +++ b/dot_dotfiles/i3/config @@ -428,7 +428,8 @@ exec_always --no-startup-id sh ~/.fehbg exec_always --no-startup-id picom --experimental-backends # start greenclip, this somehow fails to start at launch (sometimes?) -exec --no-startup-id systemctl --user start greenclip +# exec --no-startup-id systemctl --user start greenclip +exec --no-startup-id greenclip daemon>/dev/null # reload the walpaper / color configuratin using pywal diff --git a/dot_dotfiles/i3/workspace-9.json b/dot_dotfiles/i3/workspace-9.json index 860bc60..7b07e0a 100644 --- a/dot_dotfiles/i3/workspace-9.json +++ b/dot_dotfiles/i3/workspace-9.json @@ -24,7 +24,6 @@ "class": "^Microsoft\\ Teams\\ \\-\\ Preview$", "instance": "^microsoft\\ teams\\ \\-\\ preview$", "machine": "^jnielandt$", - "title": "^Tron\\ intorduction\\ \\|\\ Microsoft\\ Teams$", "window_role": "^browser\\-window$" } ], @@ -48,7 +47,6 @@ "class": "^discord$", "instance": "^discord$", "machine": "^jnielandt$", - "title": "^Discord$", "window_role": "^browser\\-window$" } ], @@ -83,7 +81,6 @@ "class": "^Slack$", "instance": "^slack$", "machine": "^jnielandt$", - "title": "^Slack\\ \\|\\ dn_dutch\\ \\|\\ DN$", "window_role": "^browser\\-window$" } ], @@ -107,7 +104,6 @@ "class": "^Signal$", "instance": "^signal$", "machine": "^jnielandt$", - "title": "^Signal$", "window_role": "^browser\\-window$" } ], diff --git a/dot_dotfiles/oh-my-zsh/custom/10_finalise.zsh b/dot_dotfiles/oh-my-zsh/custom/10_finalise.zsh index 26b914d..07cf4e2 100644 --- a/dot_dotfiles/oh-my-zsh/custom/10_finalise.zsh +++ b/dot_dotfiles/oh-my-zsh/custom/10_finalise.zsh @@ -2,6 +2,6 @@ [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh # Set up SDKMAN -export SDKMAN_DIR="/home/jnieland/.sdkman" -[[ -s "/home/jnieland/.sdkman/bin/sdkman-init.sh" ]] && source "/home/jnieland/.sdkman/bin/sdkman-init.sh" +export SDKMAN_DIR="$HOME/.sdkman" +[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh" diff --git a/dot_dotfiles/polybar/config.tmpl b/dot_dotfiles/polybar/config.tmpl index c18974e..f23177e 100644 --- a/dot_dotfiles/polybar/config.tmpl +++ b/dot_dotfiles/polybar/config.tmpl @@ -409,6 +409,8 @@ type = internal/network interval = 3.0 {{- if eq .chezmoi.hostname "dome" }} interface = wlp3s0 +{{- else if eq .chezmoi.hostname "jnielandt" }} +interface = wlp58s0 {{ else }} interface = wifi0 {{- end }} @@ -446,8 +448,12 @@ unknown-as-up = false [module/net] type = internal/network -interface = net0 +{{- if eq .chezmoi.hostname "jnielandt" }} +interface = enp0s31f6 +{{ else }} +interface = net0 +{{- end }} interval = 3.0