From 173a51d4ae7ebca7e9b7d175ba314ff35a60d5ab Mon Sep 17 00:00:00 2001
From: Bryson Steck <brysonsteck@protonmail.com>
Date: Mon, 21 Nov 2022 09:37:00 -0700
Subject: fix submodule and other small things

---
 .gitmodules                |  2 +-
 bash/.bash/01-aliases.bash | 21 +++++++--------------
 bash/.bash_profile         |  7 ++++---
 update.sh                  |  4 ++--
 x/.xinitrc                 |  4 ++--
 5 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index f2a72cd..cc33d4a 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "dwm"]
 	path = dwm
-  url = git@github.com:brysonsteck/dwm
+  url = git@codeberg.org:brysonsteck/dwm
 [submodule "vim/colors/gruvbox"]
 	path = vim/colors/gruvbox
 	url = git@github.com:morhetz/gruvbox
diff --git a/bash/.bash/01-aliases.bash b/bash/.bash/01-aliases.bash
index 514ba56..cae8190 100644
--- a/bash/.bash/01-aliases.bash
+++ b/bash/.bash/01-aliases.bash
@@ -31,17 +31,16 @@ alias ...='cd ../..'
 alias ....='cd ../../..'
 alias b='cd -'
 
+# portage aliases
+alias emerge-update="sudo emerge --ask --verbose --update --deep --changed-use @world"
+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'
+alias world='vim -R /var/lib/portage/world'
+
 # copy an entire file
 alias copy='xclip -sel c <'
 
-# local apps
-alias carmine-impact='cd /home/bryson/git/cardboard && ./cardboard_unix'
-alias celeste='cd /home/bryson/apps/celeste && ./Celeste.bin.x86_64'
-alias dont-move='cd /home/bryson/apps/dont-move && ./DontMove'
-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 substitutions
 alias java='/usr/local/java/jdk-18.0.1.1/bin/java'
 alias java11='/usr/bin/java'
@@ -66,11 +65,6 @@ ssh-pixel() {
   ssh -p 8022 uO_14O@${1}
 }
 
-# common portage files
-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'
-
 # 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'
@@ -83,5 +77,4 @@ 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 3ad634e..6539cd9 100644
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -9,12 +9,13 @@ if [ -f ~/.bashrc ]; then
 fi
 
 # User specific environment and startup programs
-#. /usr/share/autojump/autojump.bash
+export EDITOR=/usr/bin/vim
+export TERMINAL=/usr/bin/alacritty
+export BROWSER=/usr/bin/librewolf-bin
 
 export PATH
-complete -cf doas
 export PATH=$PATH:/home/bryson/.spicetify
-export EDITOR=/usr/bin/vim
+complete -cf doas
 source /usr/share/autojump/autojump.bash
 source /usr/share/bash-completion/completions/fzf
 source /usr/share/fzf/key-bindings.bash
diff --git a/update.sh b/update.sh
index 7bc904f..112f19f 100755
--- a/update.sh
+++ b/update.sh
@@ -13,8 +13,8 @@ cp ~/.Xresources ./x
 cp ~/.Xmodmap ./x
 
 # other config files
-cp -r ~/.config/dunst/ ./dunst
-cp -r ~/.config/htop/ ./htop
+cp ~/.config/dunst/dunstrc ./dunst
+cp ~/.config/htop/htoprc ./htop
 
 # update submodules
 git submodule update --remote --merge
diff --git a/x/.xinitrc b/x/.xinitrc
index 753b518..efd3270 100644
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -75,8 +75,8 @@ feh --bg-fill git/wallpapers-exorcist/gruvbox/canyon.jpg git/wallpapers-exorcist
 if $(lsusb | grep -qi "Unicomp"); then
   xmodmap -e "remove mod1 = Alt_L"
   xmodmap -e "remove mod4 = Super_L"
-  xmodmap -e "remove mod1 = Super_L"
-  xmodmap -e "remove mod4 = Alt_L"
+  xmodmap -e "add mod1 = Super_L"
+  xmodmap -e "add mod4 = Alt_L"
 fi
 
 # start dwm
-- 
cgit v1.2.3