diff --git a/bash/.alias.sh b/bash/.alias.sh index d7451f3..1ce1edb 100644 --- a/bash/.alias.sh +++ b/bash/.alias.sh @@ -60,7 +60,8 @@ alias addpgpkey='gpg --recv-keys' alias clean-trash='sudo rm -rf ~/.local/share/Trash/*' alias clean-journal='sudo journalctl --vacuum-time=2d' alias clean-all='clean-trash && clean-journal && clean-pacmancache && docker-clean-all' -alias dotnet-install='~/.dotnet-install.sh --install-dir /usr/share/dotnet/ -channel Current -version' +alias dotnet-install='~/.dotnet-install.sh --install-dir /usr/share/dotnet/ -channel' +alias mountshares='sudo bash ~/dotfiles/bash/mounts.sh' # cli tools alias crypto='curl -s rate.sx?qF | head -n -2 | tail -n +10' diff --git a/bash/.bashrc b/bash/.bashrc index 34dd7f4..4b85c47 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -17,6 +17,7 @@ source ~/.alias source ~/.custom source ~/.variables sourceIfExists ~/lib/azure-cli/az.completion +eval "$(thefuck --alias)" # evals eval "$(pyenv init -)" @@ -29,7 +30,7 @@ export NVM_DIR="$HOME/.nvm" PS1='[\u@\h \W]\$ ' if [[ $TERM != linux && ! $PROMPT_COMMAND =~ _update_ps1 ]]; then - PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND" + PROMPT_COMMAND="_update_ps1; $PROMPT_COMMAND" fi export PATH=$PATH:/home/mastermindzh/bin diff --git a/computers/dev-pc/xprofile.sh b/computers/dev-pc/xprofile.sh index 24ad850..7a7656d 100644 --- a/computers/dev-pc/xprofile.sh +++ b/computers/dev-pc/xprofile.sh @@ -1,4 +1,2 @@ #!/bin/sh -xrandr --output DVI-I-1 --mode 1920x1080 --pos 0x0 --rotate normal --output DVI-D-1 --primary --mode 1920x1080 --pos 1936x0 --rotate normal --output HDMI-1 --off --output DP-1 --off -xinput --set-prop 14 'libinput Accel Speed' 1 - +xrandr --output DVI-I-0 --off --output DVI-I-1 --mode 1920x1080 --pos 0x0 --rotate normal --output HDMI-0 --off --output DP-0 --off --output DP-1 --off --output DVI-D-0 --primary --mode 1920x1080 --pos 1920x0 --rotate normal diff --git a/config/.gitconfig b/config/.gitconfig index 8222d5b..17c73e6 100644 --- a/config/.gitconfig +++ b/config/.gitconfig @@ -12,3 +12,5 @@ [core] autocrlf = input editor = nano +[pull] + rebase = false diff --git a/i3/config b/i3/config index d3d976b..5551a69 100644 --- a/i3/config +++ b/i3/config @@ -231,7 +231,6 @@ for_window [title="Tidal-hifi - settings"] floating enable ############################################ assign [class="Franz"] $workspace9 assign [class="Enpass-Desktop"] $workspace12 -assign [class="Enpass"] $workspace12 assign [class="VirtualBox Machine"] $workspace11 # database stuff