Merge branch 'main' of autumn:dotfiles

8 files changed, 22 insertions, 15 deletions

diff --git a/bin/extra/rebootfw b/bin/extra/rebootfw
new file mode 100755
index 0000000..53c6c00
--- /dev/null
+++ b/bin/extra/rebootfw
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+printf "\x7\x0\x0\x0\x1\x0\x0\x0\x0\x0\x0\x0" |
+	doas tee "/sys/firmware/efi/efivars/OsIndications-8be4df61-93ca-11d2-aa0d-00e098032b8c"
+
+if [ "$(hostname)" = "spring" ]
+then
+	doas /usr/sbin/reboot
+else
+	reboot
+fi
diff --git a/bin/guiscripts/imgclip b/bin/guiscripts/imgclip
index eeac050..3b59cd1 100755
--- a/bin/guiscripts/imgclip
+++ b/bin/guiscripts/imgclip
@@ -1,5 +1,5 @@
 #!/bin/sh
 text="$(clipo | tesseract - stdout | sed '/^$/d')"
 [ $? -gt 0 ] && exit 1
-choice="$(printf -- "-\n%s" "$text" | commander -cl)"
+choice="$(printf -- "-\n%s" "$text" | dmenu -c)"
 [ "$choice" ] && printf "%s" "$text" | clipp
diff --git a/bin/menuscripts/mdsktp b/bin/menuscripts/mdsktp
deleted file mode 100755
index f07fb7b..0000000
--- a/bin/menuscripts/mdsktp
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# Searches through .desktop files and prompt to launch them via dmenu
-
-choice="$(find ~/.local/share/applications -maxdepth 1 -type f -not -iname "wine-extension*" |
-	awk '/\/[^.\/]+\.desktop/ {print $(NF-1)}' |
-	commander -s -d -x -c)"
-[ "$choice" ] || exit 1
-gtk-launch "$choice" 
diff --git a/config/essentials/starship.toml b/config/essentials/starship.toml
index ec9046b..7500194 100644
--- a/config/essentials/starship.toml
+++ b/config/essentials/starship.toml
@@ -26,6 +26,7 @@ style = 'yellow'
 format = '[$branch]($style)'
 style = 'bold purple'
 [git_status]
+disabled = true
 format = '( [$all_status$ahead_behind]($style))'
 ahead = '↑'
 behind = '↓'
diff --git a/config/essentials/zsh/.zshrc b/config/essentials/zsh/.zshrc
index 8b94cfe..8978de7 100644
--- a/config/essentials/zsh/.zshrc
+++ b/config/essentials/zsh/.zshrc
@@ -21,11 +21,11 @@ try_source $XDG_CONFIG_HOME/zsh/comp.zsh
 try_source $XDG_CONFIG_HOME/shell/functions.sh
 try_source $XDG_CONFIG_HOME/shell/aliases.sh
 try_source $XDG_CONFIG_HOME/zsh/widgets.zsh
-# try_source $XDG_CONFIG_HOME/zsh/prompt.zsh
+try_source $XDG_CONFIG_HOME/zsh/prompt.zsh
 # try_source $XDG_CONFIG_HOME/zsh/plugins.zsh
 
 ### Programs
-eval "$(starship init zsh)"
+# eval "$(starship init zsh)"
 eval "$(zoxide init zsh)"
 
 ### Plugins
diff --git a/config/essentials/zsh/prompt.zsh b/config/essentials/zsh/prompt.zsh
index bf272b8..1fa83d0 100644
--- a/config/essentials/zsh/prompt.zsh
+++ b/config/essentials/zsh/prompt.zsh
@@ -1,6 +1,4 @@
-# prompt
-# PS1=' %K{16}%B%(#.%F{1}.%F{13})%n%b%f@%B%F{6}%m%b%f %3~%k '
-# RPROMPT='%F{blue}$(parse_git_remote)%f%F{red}$(parse_git_status)%f%F{green}$(parse_git_branch)%f%(?.. %?)'
+#!/bin/zsh
 
 setopt prompt_subst
 parse_git_remote() {
@@ -14,3 +12,6 @@ parse_git_branch() {
 parse_git_status() {
 	git status --short 2> /dev/null | head -n1 | awk '{print $1 " "}'
 }
+
+PS1=' %3~ '
+RPROMPT='%F{blue}$(parse_git_remote)%f%F{red}$(parse_git_status)%f%F{green}$(parse_git_branch)%f%(?.. %?)'
diff --git a/config/extra/zathura/zathurarc b/config/extra/zathura/zathurarc
index b6d4fed..2dfa999 100644
--- a/config/extra/zathura/zathurarc
+++ b/config/extra/zathura/zathurarc
@@ -19,7 +19,7 @@ set guioptions          	""
 set database            	"sqlite"
 set continuous-hist-save	true
 
-set recolor true
+set recolor false
 set recolor-reverse-video true
 set recolor-keephue true
 set recolor-lightcolor "#2e3340"
diff --git a/config/home/.xprofile b/config/home/.xprofile
index 9051049..42996e8 100755
--- a/config/home/.xprofile
+++ b/config/home/.xprofile
@@ -12,6 +12,8 @@ if [ "$(hostname)" = "winter" ]; then
     ) &
 fi
 
+~/src/xobs/env/bin/python ~/src/xobs/pulse.py | xob &
+
 picom -b &
 
 # xautolock -locker slock &