Update directory names

diff --git a/README.md b/README.md
index a156a56..7d4a668 100644 (file)
--- a/README.md
+++ b/README.md
@@ -118,53 +118,3 @@ Reading list
 - https://aur.archlinux.org/cgit/aur.git/tree/?h=xinit-xsession
 - https://wiki.archlinux.org/index.php/PCManFM
 - https://www.ibm.com/developerworks/library/os-xapianomega/
-
-Directory tree organization
----------------------------
-An incomplete sketch.
-
-```
-$HOME/
-    bin/
-    etc/
-    irc/
-    lib/
-    opt/
-    tmp/
-    usr/
-    var/
-    Archives/
-        Audio/
-        Backups/
-            $machine/
-        Documents/
-        Image/
-            Misc/
-            Photos/
-                $year/
-                    $month/
-                        $day/
-                            ?$event_name/
-            Screenshots/
-            Wallpapers/
-        Software/
-            bin/
-                $vendor/
-            src/
-                packages/
-                repos/
-                    remote/
-                        $server/
-                            $repo/
-                tarballs/
-        Video/
-            Film/
-                $film/
-            Web/
-                $server/
-    Experiments/
-        ${timestamp}--${experiment-name}/
-    Projects/
-        $project/
-    Work/
-```

diff --git a/home-dir-tree.txt b/home-dir-tree.txt
index 5d29b4d..4ef073e 100644 (file)
--- a/home-dir-tree.txt
+++ b/home-dir-tree.txt
@@ -28,24 +28,24 @@ new
 .local/mnt
 .local/opt
 .local/var
-arch
-arch/audio
-arch/doc
-arch/img
-arch/img/photo
-arch/sw
-arch/sw/bin
-arch/sw/src
-arch/video
+arc
+arc/aud
+arc/doc
+arc/img
+arc/img/photo
+arc/soft
+arc/soft/bin
+arc/soft/src
+arc/vid
 down
-down/audio
+down/aud
 down/books
 down/fonts
 down/img
 down/papers
-down/sw
-down/video
-exer
+down/soft
+down/vid
+ex
 fork
 fork/suckless
 proj
@@ -56,10 +56,10 @@ work
 x
 
 .local  even more-local /usr/local
-arch    archives
+arc     archives
 bin     binaries/executables
 down    downloads
-exer    exercises
+ex      exercises
 fork    forks
 proj    projects
 sch     school
@@ -68,23 +68,23 @@ x       experiments
 
 map
 ---
-Archives            -->  arch
-Archives/Audio      -->  arch/audio
-Archives/Documents  -->  arch/doc
-Archives/Images     -->  arch/img
-Archives/Software   -->  arch/sw
-Archives/Videos     -->  arch/video
-DONE                ~~>  doc/TODO.md
+Archives            -->  arc
+Archives/Audio      -->  arc/aud
+Archives/Documents  -->  arc/doc
+Archives/Images     -->  arc/img
+Archives/Software   -->  arc/soft
+Archives/Videos     -->  arc/vid
+DONE                ~~>  doc/TODO/
 Documents           -->  doc
-Downloads           -->  down
-Exercises           -->  exer
+Downloads           -->  tmp/dl  # TODO Not .local/tml/dl ?
+Exercises           -->  ex
 Experiments         -->  x
 Forks               -->  fork
 Projects            -->  proj
 Projects/priv       -->  proj/prv
 Projects/pub        -->  proj/pub
 School              -->  sch
-TODO                ~~>  doc/TODO.md
+TODO                ~~>  doc/TODO/
 Work                -->  work
 bin                 -->  .local/bin
 lib                 -->  .local/lib

diff --git a/home/.config/screengrab/screengrab.conf b/home/.config/screengrab/screengrab.conf
index 7c6ffba..41b6a59 100644 (file)
--- a/home/.config/screengrab/screengrab.conf
+++ b/home/.config/screengrab/screengrab.conf
@@ -2,7 +2,7 @@
 CopyFilenameToClipboard=0
 autoSave=false
 autoSaveFirst=false
-defDir=/home/siraaj/Archives/Images/Screenshots/
+defDir=/home/siraaj/arc/img/Screenshots/
 defFilename=screen
 defImgFormat=png
 defScreenshotType=Area

diff --git a/home/.mpdconf b/home/.mpdconf
index a2b752e..f5dd7d2 100644 (file)
--- a/home/.mpdconf
+++ b/home/.mpdconf
@@ -1,5 +1,5 @@
 #
-music_directory                    "~/Archives/Audio"
+music_directory                    "~/arc/aud"
 playlist_directory                 "~/var/lib/mpd/playlists"
 db_file                            "~/var/lib/mpd/tag_cache"
 log_file                           "~/var/log/mpd/mpd.log"

diff --git a/home/.xbindkeysrc b/home/.xbindkeysrc
index ebf8c14..5c7a51c 100644 (file)
--- a/home/.xbindkeysrc
+++ b/home/.xbindkeysrc
@@ -137,15 +137,15 @@
     Mod4 + e
 
 # Edit specific files
-"cd ~/Documents/TODO && gvim TODO.md"
+"cd ~/doc/TODO && gvim TODO.md"
     Mod4 + t
-"cd ~/Documents/ideas && gvim ideas.md"
+"cd ~/doc/ideas && gvim ideas.md"
     Mod4 + i
-"cd ~/Documents/drafts && gvim drafts.md"
+"cd ~/doc/drafts && gvim drafts.md"
     Mod4 + d
-"cd ~/Documents/bookmarks && gvim bookmarks.md"
+"cd ~/doc/bookmarks && gvim bookmarks.md"
     Mod4 + b
-"cd ~/Documents/quotations && gvim quotations.md"
+"cd ~/doc/quotations && gvim quotations.md"
     Mod4 + q
 
 # File browser

diff --git a/home/bin/experiment b/home/bin/experiment
index 3a40a51..0faa918 100755 (executable)
--- a/home/bin/experiment
+++ b/home/bin/experiment
@@ -7,7 +7,7 @@ name="$1";
 if [ "$name" != "" ];
 then
     timestamp=`date +'%F--%H-%M--%S'`;
-    directory="$HOME/Experiments/$timestamp--$name";
+    directory="$HOME/x/$timestamp--$name";
     mkdir -p "$directory";
     cd "$directory";
     echo "# $name\n" > README.md;

diff --git a/home/lib/login_aliases.sh b/home/lib/login_aliases.sh
index 6c781ce..2ef69b6 100644 (file)
--- a/home/lib/login_aliases.sh
+++ b/home/lib/login_aliases.sh
@@ -11,9 +11,9 @@ alias tm='tmux'
 #alias startx='printf "Use a specialized startx-...\n"'
 alias mans='man $(man -k . | sort | fzf -e | awk "{print \$1}")'
 alias twread='twtxt timeline --limit 1000 | less'
-alias todo='cd ~/Documents/TODO && vim TODO.md'
+alias todo='cd ~/doc/TODO && vim TODO.md'
 alias work_todo="cd $DIR_WORK/docs/TODO && vim -c NERDTreeFind TODO.txt"
-alias drafts='cd ~/Documents/drafts && vim drafts.md'
-alias bookmarks='cd ~/Documents/bookmarks && vim bookmarks.md'
-alias ideas='cd ~/Documents/ideas && vim ideas.md'
-alias quotes='cd ~/Documents/quotations && vim quotations.md'
+alias drafts='cd ~/doc/drafts && vim drafts.md'
+alias bookmarks='cd ~/doc/bookmarks && vim bookmarks.md'
+alias ideas='cd ~/doc/ideas && vim ideas.md'
+alias quotes='cd ~/doc/quotations && vim quotations.md'

diff --git a/home/lib/login_functions.sh b/home/lib/login_functions.sh
index ac788be..9af3af1 100644 (file)
--- a/home/lib/login_functions.sh
+++ b/home/lib/login_functions.sh
@@ -233,7 +233,7 @@ hump() {
 }
 
 howto() {
-    cat "$(find  ~/Archives/Documents/HOWTOs -mindepth 1 -maxdepth 1 | sort | fzf)"
+    cat "$(find  ~/arc/doc/HOWTOs -mindepth 1 -maxdepth 1 | sort | fzf)"
 }
 
 _yt() {

diff --git a/home/lib/login_variables.sh b/home/lib/login_variables.sh
index c40641c..8d3c2e6 100644 (file)
--- a/home/lib/login_variables.sh
+++ b/home/lib/login_variables.sh
@@ -1,12 +1,12 @@
 export PATH=$HOME/bin:$HOME/.local/bin:$HOME/go/bin:/snap/bin:/sbin:/usr/sbin:$PATH
 export EDITOR=vim
 export VISUAL=$EDITOR
-export DIR_GITHUB="${HOME}/Archives/Software/src/repos/remote/github.com"
-export DIR_AUDIO="${HOME}/Archives/Audio"
-export DIR_VIDEO="${HOME}/Archives/Videos"
+export DIR_GITHUB="${HOME}/arc/soft/src/repos/remote/github.com"
+export DIR_AUDIO="${HOME}/arc/aud"
+export DIR_VIDEO="${HOME}/arc/vid"
 export DIR_YOUTUBE_VIDEO="${DIR_VIDEO}/Web/youtube.com"
 export DIR_YOUTUBE_AUDIO="${DIR_AUDIO}/youtube.com"
-export DIR_NOTES="$HOME/Documents/notes"
+export DIR_NOTES="$HOME/doc/notes"
 export DIR_LOG="$HOME/var/log"
 export DIR_LOG_MPD="$DIR_LOG/mpd"
 export FILE_LOG_MPD="$DIR_LOG_MPD/mpd.log"