From 3147d849e6c45432220527fe82f29f9cbf0baa53 Mon Sep 17 00:00:00 2001
From: Deven Blake <blakedevendesu@gmail.com>
Date: Wed, 6 Jan 2021 21:59:02 -0500
Subject: [PATCH] better aliases, more packages

---
 dotfiles-old/.aliases                         | 70 +++++++++++--------
 dotfiles-old/scripts/dotfiles.sh              | 16 +++--
 dotfiles-old/scripts/packages-arch-pacman.txt |  1 +
 dotfiles-old/scripts/packages-arch-yay.txt    |  1 +
 dotfiles-old/scripts/packages.txt             |  2 +
 5 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/dotfiles-old/.aliases b/dotfiles-old/.aliases
index 1b15e5c..2c41342 100755
--- a/dotfiles-old/.aliases
+++ b/dotfiles-old/.aliases
@@ -1,59 +1,67 @@
-# aliases for using my Commodore monitor with my computer
-alias 1702off="xrandr --output HDMI1 --off"
-alias 1702on="xrandr --output HDMI1 --auto --mode 720x480 --right-of LVDS1"
+# settings for specific monitors
+alias 1702="xrandr --output HDMI1 --auto --mode 720x480 --right-of LVDS1"
+alias mv720="xrandr --output VGA1 --auto --right-of LVDS1"
+
+# audio drive
+alias audio="sudo mount -L 'AUDIO' /mnt/audio"
+
+# private bookmarks
+alias bmarks="firefox file:///home/trinity/bookmarks.html"
 
 # requires bat
 alias cat="bat --theme=ansi-light"
 
 alias cls="clear"
 
+alias firefox="firefox-developer-edition"
+
+alias hdmioff="xrandr --output HDMI1 --off"
+
 # useful aliases
 alias iftoggle="sudo ip link set"
 alias ifswitch="iftoggle $1 down && iftoggle $1 up"
 
 alias imount="idevicepair pair && sudo ifuse -o allow_other /mnt/iphone/"
 
-# windows
 alias ipconfig="ifconfig"
-alias tracert="tracepath"
+
+# other volumes
+mnt() {
+	test -d /mnt/$1 || sudo mkdir /mnt/$1
+	sudo mount /dev/$1 /mnt/$1 && cd /mnt/$1
+}
 
 # i always forget this one but it's useful
 alias p="ping 1.1.1.1"
 
+# my media hard drive
+alias partone="sudo mount -L 'PARTONE' /mnt/partone"
+
 # copy web-browser path to file to clipboard
 path() {
-	echo 'file://'$(realpath $1) | xclip
+	printf "file://%s" $(realpath $1) | xclip
+}
+
+pyenv() {
+	source $1/bin/activate
 }
 
 alias sudo="doas"
 
-# my media hard drive
-alias partone="sudo mount -L 'PARTONE' /mnt/partone"
-# sd card with music on it
-alias audio="sudo mount -L 'AUDIO' /mnt/audio"
-# other volumes
-mnt() {
-	sudo test -d /mnt/$1 || sudo mkdir /mnt/$1
-	sudo mount /dev/$1 /mnt/$1 && cd /mnt/$1
-}
+# Wacom Intuos 2
+alias taboff="xsetwacom set 'Wacom Intuos2 6x8 Pen stylus' MapToOutput LVDS1"
+alias tabon="xsetwacom set 'Wacom Intuos2 6x8 Pen stylus' MapToOutput VGA1"
 
-# aliases for using a VGA monitor, i use these at home and at school
-deskoff() {
-	xsetwacom set "Wacom Intuos2 6x8 Pen stylus" MapToOutput LVDS1
-	xrandr --output VGA1 --off
-}
-deskon() {
-	xrandr --output VGA1 --auto --left-of LVDS1
-	xsetwacom set "Wacom Intuos2 6x8 Pen stylus" MapToOutput VGA1
-}
-alias bedoff="xrandr --output VGA1 --off"
-alias bedon="xrandr --output VGA1 --auto --right-of LVDS1"
+alias tracert="tracepath"
+
+alias vgaoff="xrandr --output VGA1 --off"
 
 # project i'm working on
 ytfeed() {
-	cd $HOME/src/ytfeed.py/
-	source ./bin/activate
-	python ./cli.py
+	pyenv $HOME/src/ytfeed.py/
+	python $HOME/src/ytfeed.py/cli.py
+}
+ytfeedsh() {
+	pyenv $HOME/src/ytfeed.py/
+	python $HOME/src/ytfeed.py/shell.py
 }
-
-alias bmarks="firefox file:///home/trinity/bookmarks.html"
diff --git a/dotfiles-old/scripts/dotfiles.sh b/dotfiles-old/scripts/dotfiles.sh
index cccf002..c965924 100644
--- a/dotfiles-old/scripts/dotfiles.sh
+++ b/dotfiles-old/scripts/dotfiles.sh
@@ -18,14 +18,15 @@ cp {.Xresources,.aliases,.bashrc,.profile} $HOME/
 
 # dmenu
 cde $HOME/src
-git clone https://git.suckless.org/dmenu
-cde dmenu
-cp $HOME/dotfiles/src/dmenu/config.h ./
-make
-[ "Yes." = $(printf "No.\nYes." | ./dmenu -p "Install dmenu?") ] && sudo make install
+if [ git clone https://git.suckless.org/dmenu ]; then
+	cde dmenu
+	cp $HOME/dotfiles/src/dmenu/config.h ./
+	make
+	[ "Yes." = $(printf "No.\nYes." | ./dmenu -p "Install dmenu?") ] && sudo make install
+fi
 
 # i3wm
-mkdir $HOME/.config/i3
+mkdir -p $HOME/.config/i3
 mkdir $HOME/.config/i3status
 cde $HOME/.config/
 cp $HOME/src/dotfiles/.config/i3/config i3/
@@ -36,7 +37,8 @@ sudo mkdir -p /usr/share/audacious/Skins/
 which audacious && sudo curl https://archive.org/download/winampskin_Sailor_Moon_Gang/Sailor_Moon_Gang.wsz -o /usr/share/audacious/Skins/Sailor_Moon_Gang.wsz
 
 # wallpaper
+cde $HOME
 mkdir -p $HOME/Pictures/Wallpapers
-curl https://ia801502.us.archive.org/3/items/asuka-98/Asuka%2098.jpg -o Pictures/Wallpapers/Asuka\ 98.jpg
+curl https://ia801502.us.archive.org/3/items/asuka-98/Asuka%2098.jpg -o Pictures/Wallpapers/Asuka\ 98.jpg || printf "[ERROR] Could not curl wallpaper.\n"
 
 xrdb -load .Xresources
diff --git a/dotfiles-old/scripts/packages-arch-pacman.txt b/dotfiles-old/scripts/packages-arch-pacman.txt
index c0def88..c7d1816 100644
--- a/dotfiles-old/scripts/packages-arch-pacman.txt
+++ b/dotfiles-old/scripts/packages-arch-pacman.txt
@@ -1,3 +1,4 @@
+asp
 base-devel
 i3status
 iw
diff --git a/dotfiles-old/scripts/packages-arch-yay.txt b/dotfiles-old/scripts/packages-arch-yay.txt
index 768abbe..b910c56 100644
--- a/dotfiles-old/scripts/packages-arch-yay.txt
+++ b/dotfiles-old/scripts/packages-arch-yay.txt
@@ -4,6 +4,7 @@ google-chrome
 gzdoom
 i3-gaps
 i3-swallow
+iwgtk
 minecraft-launcher
 moon-buggy
 ne
diff --git a/dotfiles-old/scripts/packages.txt b/dotfiles-old/scripts/packages.txt
index da93c02..ffbc66a 100644
--- a/dotfiles-old/scripts/packages.txt
+++ b/dotfiles-old/scripts/packages.txt
@@ -7,6 +7,7 @@ dvdbackup
 feh
 ffmpeg
 firefox-developer-edition
+gnome-disk-utility
 gparted
 gvim
 gwenview
@@ -36,6 +37,7 @@ scrot
 sed
 thunar
 thunderbird
+units
 vi
 virtualbox
 vlc