add xmodmap, changed aliases and locations

2 files changed, 30 insertions, 26 deletions

diff --git a/bash/.bash/01-aliases.bash b/bash/.bash/01-aliases.bash
index b0d4060..514ba56 100644
--- a/bash/.bash/01-aliases.bash
+++ b/bash/.bash/01-aliases.bash
@@ -12,24 +12,27 @@ alias sudo="doas"
 alias l='ls'
 alias sl='ls'
 
-# grep colors
+# always run with args
 alias grep='grep --color=auto'
 alias fgrep='fgrep --color=auto'
 alias egrep='egrep --color=auto'
-
-# ls color and shortcuts
 alias ls='ls --color=auto'              
 alias la='ls -a'
-alias lsd='ls -lh'
-
-# copy an entire file
-alias copy='xclip -sel c <'
+alias ll='ls -lh'
+alias cp='cp -iv'
+alias mv='mv -iv'
+alias g++='g++ --std=c++20'
+alias vim='vim -p'
+alias gs='gs -dNOSAFER'
 
 # cd shortcuts
 alias ..='cd ..'
 alias ...='cd ../..'
 alias ....='cd ../../..'
-alias back='cd -'
+alias b='cd -'
+
+# copy an entire file
+alias copy='xclip -sel c <'
 
 # local apps
 alias carmine-impact='cd /home/bryson/git/cardboard && ./cardboard_unix'
@@ -39,35 +42,27 @@ alias friday-night-funkin='cd /home/bryson/apps/friday-night-funkin && ./Funkin'
 alias overland='cd /home/bryson/apps/overland && ./Overland.x86_64'
 alias sm64ex='cd /home/bryson/git/sm64ex/build/us_pc/./sm64.us.f3dex2e'
 
-# binary renames
+# binary substitutions
 alias java='/usr/local/java/jdk-18.0.1.1/bin/java'
 alias java11='/usr/bin/java'
 alias python='python3'
-alias g++='g++ --std=c++20'
-alias j='autojump'
-alias vim='vim -p'
-alias gs='gs -dNOSAFER'
-#alias gdb="gdb --tui"
-#alias spt="spotifyd && spt"
-
-# quick important file edits
-alias todo='vim ~/.todo/TODO.org'
+alias ed='fzf --height=15 --layout=reverse | sed "s/^/\"/g;s/$/\"/g" | xargs -ro vim'
 
 # common combinations
-alias django='python manage.py'
+alias dj='python manage.py'
 alias smci='sudo make clean install'
 alias smi='sudo make install'
-alias library='xrandr --output HDMI-A-0 --auto --set TearFree on --output eDP --off && xset r rate 300 50'
-alias nolibrary='xrandr --output HDMI-A-0 --off --output eDP --auto'
+alias lib='xrandr --output HDMI-A-0 --auto --output eDP --off && xset r rate 300 50'
+alias nolib='xrandr --output HDMI-A-0 --off --output eDP --auto'
 
 # bash navigation
-alias add-alias='vim ~/.bash/01-aliases.bash; . ~/.bash_profile'
+alias aa='vim ~/.bash/01-aliases.bash; . ~/.bash_profile'
 
-search() {
+s() {
   find . -type f -exec grep ${1} {} \;
 }
 
-sshpixel() {
+ssh-pixel() {
   ssh -p 8022 uO_14O@${1}
 }
 
@@ -76,9 +71,16 @@ alias package.use='sudo vim /etc/portage/package.use'
 alias make.conf='sudo vim /etc/portage/make.conf'
 alias package.license='sudo vim /etc/portage/package.license'
 
-# other garbage
+# fixes
 alias fixwifi='sudo rc-service wpa_supplicant restart'
 alias fixaudio='pacmd set-default-sink alsa_output.usb-0c76_USB_PnP_Audio_Device-00.analog-stereo'
+alias fixjava='export _JAVA_AWT_WM_NONREPARENTING=1 && export AWT_TOOLKIT=MToolkit && wmname LG3D'
+
+# auto elevate
+alias mount='sudo mount'
+alias umount='sudo umount'
+
+# other garbage
 alias macos="cd /home/bryson/git/macOS-Simple-KVM && ./basic.sh"
 alias server="python3 /home/bryson/git/webserver/server.py"
 alias emerge-update="sudo emerge --ask --verbose --update --deep --changed-use @world"
diff --git a/bash/.bash_profile b/bash/.bash_profile
index c5cb988..3ad634e 100644
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -15,4 +15,6 @@ export PATH
 complete -cf doas
 export PATH=$PATH:/home/bryson/.spicetify
 export EDITOR=/usr/bin/vim
-#source "/home/bryson/git/emsdk/emsdk_env.sh"
+source /usr/share/autojump/autojump.bash
+source /usr/share/bash-completion/completions/fzf
+source /usr/share/fzf/key-bindings.bash