fix: fixed conflicts + moving to yadm

.bashrc

@@ -0,0 +1,79 @@
+# Configs
+export EDITOR=nvim
+
+# infinite bash history
+# remove '-1' in both places if your bash version < 4.3
+export HISTFILESIZE=-1
+export HISTSIZE=-1
+
+# writes bash history after every command
+export PROMPT_COMMAND="history -a"
+
+# pyenv
+if command -v pyenv >/dev/null 2>&1; then
+  export PYENV_ROOT="$HOME/.pyenv"
+  [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
+  eval "$(pyenv init - bash)"
+fi
+
+if [ -f "$HOME/.bash_private" ]; then
+  . "$HOME/.bash_private"
+fi
+if [ -f "$HOME/.bash_aliases" ]; then
+  . "$HOME/.bash_aliases"
+fi
+
+# saving aliases aliases
+alias aliasm='alias |comm -13 <(grep -h ^alias ~/.bashrc ~/.bash_private | sort) -'
+alias aliasd='aliasm |diff -u --color ~/.bash_aliases -'
+alias aliasr='unalias -a; . ~/.bashrc'
+alias aliass='aliasm > ~/.bash_aliases'
+
+# ls aliases
+alias ll='ls -lah --color=auto'
+alias l='ls --color=auto'
+alias ks='ls --color=auto'
+alias s='ls --color=auto'
+alias ls='ls --color=auto'
+
+# cd aliases
+alias cdp='cd ~/Programming'
+alias cds='cd ~/services'
+alias t='cd ~/tmp'
+
+# rm aliases
+alias cleartmp='rm -r ~/tmp/*'
+
+# edit configs aliases
+alias cfghypr='nvim ~/.config/hypr'
+alias cfgkitty='nvim ~/.config/kitty'
+alias cfgnvim='nvim ~/.config/nvim'
+alias cfgrofi='nvim ~/.config/rofi'
+alias cfgwaybar='nvim ~/.config/waybar'
+alias cfgdunst='nvim ~/.config/dunst'
+alias cfgyazi='nvim ~/.config/yazi'
+
+# utils aliases
+alias y='yazi'
+alias py='python'
+alias pyv='python --version'
+alias clipclear='cliphist wipe'
+alias scrcpy-def='scrcpy -S --no-audio -K'
+alias hload='hyprctl reload'
+alias shy='start-hyprland'
+alias wifi-reload='nmcli r wifi off && nmcli r wifi on'
+alias swagger-docs='sudo host-docs'
+
+# kitty aliases
+alias ssh='kitty +kitten ssh'
+alias edit-in-kitty='kitten edit-in-kitty'
+
+# yay aliases
+alias pzf='yay -Qq | fzf --preview '\''yay -Qil {}'\'' --layout reverse --bind '\''enter:execute(yay -Qil {} | less)'\'' --bind '\''ctrl-r:execute(yay -R {} | less)'\'''
+
+# fun aliases
+alias ff='fastfetch'
+alias mm='unimatrix -f -a -s 92 -l coo -c yellow'
+alias mmbee='unimatrix -f -a -s 86 -u '\''bee'\'' -c yellow'
+alias mmbeesquit='unimatrix -f -s 86 -u '\''beesquit'\'' -c yellow'
+alias mmsnow='unimatrix -u ❄❆❅᪥𑁍⭒*❄❆❅᪥* -c white -a'