diff --git a/TODO b/TODO index b712975..ec2c41b 100644 --- a/TODO +++ b/TODO @@ -1,8 +1,6 @@ install steam, wine and lib32 multilib # basename opti ## configure yazi # -debug systray refresh # -Reconfigure scripts with kitty ? ## nvim bufferline colors # configure for work ### ## Hyprland diff --git a/links/tty/autologin.conf b/links/tty/autologin.conf deleted file mode 100644 index fc7465e..0000000 --- a/links/tty/autologin.conf +++ /dev/null @@ -1,3 +0,0 @@ -[Service] -ExecStart= -ExecStart=-/sbin/agetty -o '-p -f -- \\u' --noclear --autologin root %I $TERM diff --git a/scripts/disconnect.sh b/scripts/disconnect.sh index 05fe6db..c017330 100755 --- a/scripts/disconnect.sh +++ b/scripts/disconnect.sh @@ -21,7 +21,7 @@ case $selected in i3 exit ;; "Update") - urxvt -e /usr/local/share/dotfiles/scripts/update.sh + kitty /usr/local/share/dotfiles/scripts/update.sh ;; "Lock") /usr/local/share/dotfiles/scripts/i3lock.sh diff --git a/scripts/git.sh b/scripts/git.sh index bed30de..c525054 100755 --- a/scripts/git.sh +++ b/scripts/git.sh @@ -7,8 +7,8 @@ _git () { _MODIFIED="$(grep -o "M" <<< "$(git status --short)" | grep -c .)" _UNTRACKED="$(grep -o "??" <<< "$(git status --short)" | grep -c .)" _ORIGIN="$(git remote show)" - _AHEAD=$(git rev-list --left-right --count "$_BRANCH"..."$_ORIGIN"/"$_BRANCH" | cut -f 1) - _BEHIND=$(git rev-list --left-right --count "$_BRANCH"..."$_ORIGIN"/"$_BRANCH" | cut -f 2) + _AHEAD=$(git rev-list --left-right --count "$_BRANCH"..."$_ORIGIN"/"$_BRANCH" 2> /dev/null | cut -f 1) + _BEHIND=$(git rev-list --left-right --count "$_BRANCH"..."$_ORIGIN"/"$_BRANCH" 2> /dev/null | cut -f 2) printf " %s " "$(git branch --show-current)" if (( _MODIFIED == 0 )) && (( _UNTRACKED == 0 )) && (( _AHEAD == 0 )) && (( _BEHIND == 0 )) then diff --git a/scripts/update.sh b/scripts/update.sh index e927949..5a0fc17 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -39,12 +39,16 @@ _msg "modprobe links" ln -sf "${_DIRNAME}/links/modprobe/blacklist.conf" /etc/modprobe.d/blacklist.conf _msg "tty links" mkdir -p /etc/systemd/system/getty@tty1.service.d -ln -sf "$_DIRNAME/links/tty/autologin.conf" /etc/systemd/system/getty@tty1.service.d/override.conf +ln -sf "$_DIRNAME/links/tty/override.conf" /etc/systemd/system/getty@tty1.service.d/override.conf ln -sf "$_DIRNAME/links/tty/issue" /etc/issue ln -sf "$_DIRNAME/links/tty/inputrc" /etc/inputrc ln -sf "$_DIRNAME/links/tty/bash.bashrc" /etc/bash.bashrc ln -sf "$_DIRNAME/links/tty/bash.bashaliases" /etc/bash.bashaliases ln -sf "$_DIRNAME/links/tty/bash.bashexports" /etc/bash.bashexports +_msg "links pipewire" +mkdir -p ~/.config/systemd/user/pipewire-pulse.service.d ~/.config/systemd/user/pipewire-pulse.socket.d +ln -sf "$_DIRNAME/links/pipewire/override.conf" ~/.config/systemd/user/pipewire-pulse.service.d/override.conf +ln -sf "$_DIRNAME/links/pipewire/override.conf" ~/.config/systemd/user/pipewire-pulse.socket.d/override.conf _msg "X11 links" ln -sf "$_DIRNAME/links/X11/.Xresources" /etc/X11/xinit/.Xresources ln -sf "$_DIRNAME/links/X11/xinitrc" /etc/X11/xinit/xinitrc @@ -73,18 +77,11 @@ mkdir -p ~/.local/share/applications ln -sf "$_DIRNAME/links/applications/teams.desktop" ~/.local/share/applications/teams.desktop sed -i "s|^Exec=.*|Exec=code-oss --no-sandbox|" /usr/share/applications/code-oss.desktop sed -i "s|^Icon=.*|Icon=vscode|" /usr/share/applications/code-oss.desktop -mkdir "links kitty" +_msg "links kitty" mkdir -p ~/.config/kitty ln -sf "$_DIRNAME/links/kitty/kitty.conf" ~/.config/kitty/kitty.conf ln -sf "$_DIRNAME/links/kitty/current-theme.conf" ~/.config/kitty/current-theme.conf -### pipewire -_info "Reconfigure pipewire-pulse" -sed -i "/^ConditionUser=.*/d" /usr/lib/systemd/user/pipewire-pulse.service -sed -i "/^ConditionUser=.*/d" /usr/lib/systemd/user/pipewire-pulse.socket -systemctl --user daemon-reload -systemctl --user restart pipewire-pulse.service - ### work vs home include home or work #https://i3wm.org/docs/userguide.html#include #https://github.com/polybar/polybar/wiki/Configuration#file-inclusion