From 7a81623e8d99c38c234a96f8e45dbf8923f09ee7 Mon Sep 17 00:00:00 2001
From: tavo-wasd <gustavo@gustavocalvo.xyz>
Date: Fri, 4 Aug 2023 11:09:52 -0600
Subject: [PATCH] little modifications

---
 X11/xinitrc                   |  2 +-
 scripts/handbrake             |  4 ----
 scripts/menu/menu-addbookmark |  4 ++--
 scripts/menu/menu-bookmarks   |  2 +-
 scripts/menu/menu-scripts     |  3 ---
 shell/aliasrc                 | 41 ++++++++++++++++++++---------------
 6 files changed, 27 insertions(+), 29 deletions(-)
 delete mode 100755 scripts/handbrake
 delete mode 100755 scripts/menu/menu-scripts

diff --git a/X11/xinitrc b/X11/xinitrc
index d29ba14..53dbdce 100644
--- a/X11/xinitrc
+++ b/X11/xinitrc
@@ -20,7 +20,7 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
 systemctl --user import-environment DISPLAY &
 setxkbmap en &
 xset r rate 300 50 &
-hsetroot -cover /home/tavo/Media/Pictures/Backgrounds/71.jpg
+hsetroot -cover /home/tavo/Media/Pictures/Backgrounds/71.jpg &
 dwmblocks &
 clipmenud &
 ps -C dunst | grep -q dunst || dunst &
diff --git a/scripts/handbrake b/scripts/handbrake
deleted file mode 100755
index e642bed..0000000
--- a/scripts/handbrake
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-# Default command is ghb for some reason
-
-ghb
diff --git a/scripts/menu/menu-addbookmark b/scripts/menu/menu-addbookmark
index 5b77b3f..03b90ce 100755
--- a/scripts/menu/menu-addbookmark
+++ b/scripts/menu/menu-addbookmark
@@ -4,12 +4,12 @@
 
 bookmark="$(xsel -ob)"
 
-if grep -q "$bookmark" "$HOME/Documents/bookmarks" ; then
+if grep -q "$bookmark" "$HOME/Desktop/bookmarks" ; then
     notify-send "󰃀 Bookmarks" "Already bookmarked"
 else
     name="$(menu 'Bookmark name:' empty)"
     [ -z "$name" ] && exit
     entry="$name-$bookmark"
-    echo "$entry" >> "$HOME/Documents/bookmarks"
+    echo "$entry" >> "$HOME/Desktop/bookmarks"
     notify-send "󰃀 Bookmarks" "Added '$entry'"
 fi
diff --git a/scripts/menu/menu-bookmarks b/scripts/menu/menu-bookmarks
index c41f44e..98ad550 100755
--- a/scripts/menu/menu-bookmarks
+++ b/scripts/menu/menu-bookmarks
@@ -2,7 +2,7 @@
 # Open URLs from bookmarks file
 
 # Print site names, then get URL based on the name. Exit if empty
-name=$(cut -d '-' -f 1 $HOME/Documents/bookmarks | grep -v '^#' | sed '/^\s*$/d' | menu "Site:")
+name=$(cut -d '-' -f 1 $HOME/Desktop/bookmarks | grep -v '^#' | sed '/^\s*$/d' | menu "Site:")
 [ -z "$name" ] && exit
 
 grep "$name" $HOME/Documents/bookmarks | cut -d '-' -f 2- | xsel -ib && notify-send "󰃀 Bookmarks" "'$name' copied to clipboard"
diff --git a/scripts/menu/menu-scripts b/scripts/menu/menu-scripts
deleted file mode 100755
index 00c72cf..0000000
--- a/scripts/menu/menu-scripts
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-$(ls ~/.config/scripts/ | menu "Script:")
diff --git a/shell/aliasrc b/shell/aliasrc
index 79aa277..f3fdc19 100644
--- a/shell/aliasrc
+++ b/shell/aliasrc
@@ -1,30 +1,35 @@
 #!/bin/bash
 
+# Common
 alias \
-    prt="cd $HOME/Media/Pictures/Screenshots/ && ls" \
-    bkg="cd $HOME/Media/Pictures/Backgrounds/ && ls" \
-    img="cd $HOME/Media/Pictures/ && ls" \
-    vid="cd $HOME/Media/Videos/ && ls" \
-    mus="cd $HOME/Media/Music/ && ls" \
-    tmp="cd $HOME/Desktop/local/temp/ && ls" \
-    www="cd $HOME/Desktop/www/ && ls" \
-    src="cd $HOME/.local/src/ && ls" \
-    doc="cd $HOME/Documents/ && ls" \
-    dow="cd $HOME/Downloads/ && ls" \
-    prj="cd $HOME/Projects/ && ls" \
-    dsk="cd $HOME/Desktop/ && ls" \
-    cfg="cd $HOME/.config/ && ls" \
-    ent="cd /mnt/Entr/ && ls" \
-    fzf-edit-script="fzf_nav /home/$(whoami)/.config/scripts" \
     ls="exa -al --group-directories-first" \
     fzf="fzf --cycle --reverse" \
-    newsboat="newsboat -u ~/Documents/personal/rss" \
     diff="diff --color=auto" \
     grep="grep --color=auto" \
-    notes="note list" \
-    def="dict" \
     calc="bc -l" \
     cp="cp -iv" \
     mv="mv -iv" \
     rm="rm -iv" \
     vim="nvim" \
+
+# Directories
+alias \
+    tmp="cd $HOME/Desktop/local/temp/ && ls" \
+    www="cd $HOME/Desktop/www/ && ls" \
+    dsk="cd $HOME/Desktop/ && ls" \
+    dow="cd $HOME/Downloads/ && ls" \
+    prj="cd $HOME/Projects/ && ls" \
+    prt="cd $HOME/Media/Pictures/Screenshots/ && ls" \
+    bkg="cd $HOME/Media/Pictures/Backgrounds/ && ls" \
+    img="cd $HOME/Media/Pictures/ && ls" \
+    vid="cd $HOME/Media/Videos/ && ls" \
+    mus="cd $HOME/Media/Music/ && ls" \
+    src="cd $HOME/.local/src/ && ls" \
+    cfg="cd $HOME/.config/ && ls" \
+
+# Launch args
+alias \
+    fzf-edit-script="fzf_nav /home/$(whoami)/.config/scripts" \
+    newsboat="newsboat -u ~/Documents/personal/rss" \
+    notes="note list" \
+    def="dict" \