diff --git a/.local/bin/browser-x b/.local/bin/browser-x index 9619bdc..35a74ba 100755 --- a/.local/bin/browser-x +++ b/.local/bin/browser-x @@ -1,5 +1,5 @@ #!/bin/bash KERNEL=$(uname -sr) [[ $KERNEL =~ "Microsoft" ]] && "/mnt/c/Program Files/Mozilla Firefox/firefox.exe" "$@" -[[ $KERNEL =~ "gentoo" ]] && GDK_DPI_SCALE="1.2" firefox "$@" +[[ $KERNEL =~ "gentoo" ]] && GDK_DPI_SCALE="1.2" firefox-bin "$@" #brave-bin --force-device-scale-factor=1.2 "$@"& diff --git a/.local/bin/dwmstatusbar b/.local/bin/dwmstatusbar index 1c0e863..d01f3dd 100755 --- a/.local/bin/dwmstatusbar +++ b/.local/bin/dwmstatusbar @@ -15,9 +15,8 @@ printf "%s%%\\n" "🔊 $vol" print_wifi(){ [ "$(stat -c %y "/home/yorune/.config/vpn" 3>/dev/null | egrep -o '[0-9]+\-[0-9]+\-[0-9]+ [0-9]+')" != "$(date '+%Y-%m-%d %H')" ] && sudo /root/.local/bin/protonvpn status | grep -i Status | awk {'print $2'} > "/home/yorune/.config/vpn" - -echo -e "$(cat /sys/class/net/w*/operstate | sed "s/down/❌/;s/up/📶/") $(cat /sys/class/net/e*/operstate | sed "s/down/❌/;s/up/🌐/") $(cat /home/yorune/.config/vpn | sed 's/Connected/🌐/g;s/Disconnected/❌/g')" - +echo -e "$(cat /sys/class/net/w*/operstate | sed "s/down/❌/;s/up/📶/") $(cat /sys/class/net/e*/operstate | sed "s/down/❌/;s/up/🌐/")" +#echo -e "$(cat /sys/class/net/w*/operstate | sed "s/down/❌/;s/up/📶/") $(cat /sys/class/net/e*/operstate | sed "s/down/❌/;s/up/🌐/") $(cat /home/yorune/.config/vpn | sed 's/Connected/🌐/g;s/Disconnected/❌/g')" } print_temp(){ diff --git a/.local/bin/shut-sup-rest b/.local/bin/shut-sup-rest index 5e1d0cb..779bafb 100755 --- a/.local/bin/shut-sup-rest +++ b/.local/bin/shut-sup-rest @@ -6,8 +6,6 @@ chosen=$(echo -e "$choices" | dmenu -i) case "$chosen" in Lock) slock ;; Suspend) sudo pm-suspend && slock ;; - #Suspend) sudo systemctl suspend && slock ;; - #Suspend) sudo systemctl suspend && locki3 ;; Reboot) sudo reboot ;; Shutdown) sudo shutdown -h now ;; esac diff --git a/.local/bin/update b/.local/bin/update index 1acda2a..b471576 100755 --- a/.local/bin/update +++ b/.local/bin/update @@ -1,5 +1,5 @@ #!/bin/bash -sudo eix-repos-sync +sudo /home/yorune/.local/bin/eix-repos-sync sudo eix-sync -a sudo eix-update #sudo emerge-webrsync diff --git a/.xinitrc b/.xinitrc index 0f57057..6d84f48 100644 --- a/.xinitrc +++ b/.xinitrc @@ -1,4 +1,6 @@ #!/bin/sh +export PATH=$HOME/.local/bin:$PATH + xrandr --setprovideroutputsource modesetting NVIDIA-0 xrandr --auto xset s off -dpms& @@ -7,19 +9,14 @@ xset s off& xset -dpms& compton& feh --bg-fill $HOME/.wall.jpg & -#redshift -l 53.2327:18.3036 -t 6500:3200& nm-applet --sm-disable& -sudo /root/.local/bin/protonvpn c -f& +#sudo /root/.local/bin/protonvpn c -f& dunst -config& browser-x& password-manager& -transmission-daemon& /usr/local/bin/st -e /bin/sh -c "tmux new-session -s BASE -n HOME '/bin/zsh'\; split-window 'htop'\; new-window -n MAIL 'neomutt'\; new-window -n NEWSBOAT 'newsboat -r '\; new-window -n MUSIC 'cmus'"& -#/usr/local/bin/st -e /bin/sh -c "tmux new-session -s BASE -n HOME '/bin/zsh'\; split-window 'htop'\; new-window -n MAIL 'neomutt'\; new-window -n IRC 'irssi'\; new-window -n NEWSBOAT 'newsboat'\; new-window -n MUSIC 'cmus'"& (sleep 30 && getforecast)& sudo /usr/bin/rdate -s ntp.task.gda.pl && sudo /sbin/hwclock --systohc -/opt/MEGAcmd/mega-cmd-server --debug-full > /var/log/megacmd/megacmd.log& +mega-cmd-server --debug-full > /var/log/megacmd/megacmd.log& dwmstatusbar& -exec dbus-launch dwm - - +exec dbus-launch dwm diff --git a/.zshrc b/.zshrc index bd55885..6c7b72f 100644 --- a/.zshrc +++ b/.zshrc @@ -11,18 +11,18 @@ HISTSIZE=10000 SAVEHIST=10000000 autoload -U colors && colors setopt PROMPT_SUBST -PS1='%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%m %{$fg[magenta]%}%~%{$fg[red]%} $(parse_git_branch)]%{$reset_color%}$%b ' +PS1='%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%m %{$fg[magenta]%}%~%{$fg[red]%} $(parse_git_branch)]%{$reset_color%}$%b ' plugins=(rake ruby vagrant knife knife_ssh kitchen ) ZSH_DISABLE_COMPFIX=true source $ZSH/oh-my-zsh.sh -source $HOME/.sshservers +source $HOME/.sshservers source $HOME/Linux/configs/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh &>> /dev/null source $HOME/Linux/configs/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh &>> /dev/null [ ! -d $HOME/.config/fzf ] && git clone https://github.com/junegunn/fzf.git $HOME/.config/fzf [ -f $HOME/.config/fzf/shell/key-bindings.zsh ] && source $HOME/.config/fzf/shell/key-bindings.zsh [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -FPATH=/usr/local/share/zsh/site-functions:$FPATH +FPATH=/usr/local/share/zsh/site-functions:$FPATH xset s off -dpms &>> /dev/null xset b off &>> /dev/null xset s off &>> /dev/null @@ -37,13 +37,13 @@ export GTK_IM_MODULE=ibus export XMODIFIERS=@im=ibus export QT_IM_MODULE=ibus export _JAVA_AWT_WM_NONREPARENTING=1 -export CCACHE_DIR="/mnt/backup/ccache" +export CCACHE_DIR="/usr/ccache" export LC_ALL="en_US.UTF-8" export LANG=en_US.UTF-8 export LC_ALL=en_US.UTF-8 -export BROWSER=/usr/bin/firefox +export BROWSER=/usr/bin/firefox-bin export FZF_DEFAULT_OPTS='--height 40% --layout=reverse' -export EIX_LIMIT_COMPACT=0 +export EIX_LIMIT_COMPACT=0 export TERMINAL="st" export QT_SCALE_FACTOR=1.5 export VISUAL='vim' @@ -73,7 +73,7 @@ alias gadd="git add" alias gpush="git push" alias gpull="git pull" alias glog="git log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --branches" -alias gfg="git checkout master && git fetch upstream && git pull upstream master" +alias gfg="git checkout master && git fetch upstream && git pull upstream master" alias cal="cal -3" alias code="vscodium" alias vpn="sudo /root/.local/bin/protonvpn c -f" @@ -88,6 +88,5 @@ alias dplen="trans pl:en" alias notes="vim $HOME/git/notes/index.md" # Cleaning-up -export KODI_DATA="$HOME/.config/kodi" export PATH=$HOME/.local/bin:$PATH XDG_DATA_DIRS="$HOME/.local/share/flatpak/exports/share:/var/lib/flatpak/exports/share:$XDG_DATA_DIRS"