restructuring

.gitignore

@@ -4,3 +4,9 @@
 *.swo
 *.DS_STORE
 *desktop.ini
+
+home/.config/Code
+home/.config/google-chrome
+home/.config/libfm
+home/.config/pcmanfm
+home/.config/yay

home/shell/bashrc

@@ -1,7 +1,7 @@
 # Include our shared environment stuff
-source ~/dotfiles/shell/env
+source ~/dotfiles/home/shell/env
-source ~/dotfiles/shell/aliases
+source ~/dotfiles/home/shell/aliases
-source ~/dotfiles/shell/functions
+source ~/dotfiles/home/shell/functions
 
 # Basic options
 export HISTCONTROL=ignoredups

home/shell/env

@@ -25,7 +25,7 @@ export DISABLE_DOTFILES_UPDATE_PROMPT="FALSE"
 export UPDATE_DOTFILES_DAYS=13
 
 # Whether or not to automatically connect to a TMUX session when opening the shell
-export ENABLE_TMUXAC="TRUE"
+export ENABLE_TMUXAC="FALSE"
 
 # If there is not an active tmux session, we probably want one
 # Otherwise, the shell will not open the session again (eg. opening tabs, new terminals)

home/shell/zshrc

@@ -1,7 +1,7 @@
 # Include our shared shell stuff
-source ~/dotfiles/shell/env
+source ~/dotfiles/home/shell/env
-source ~/dotfiles/shell/aliases
+source ~/dotfiles/home/shell/aliases
-source ~/dotfiles/shell/functions
+source ~/dotfiles/home/shell/functions
 
 # History Settings
 export HISTIGNORE="&:ls:[bf]g:exit:reset:clear:cd:cd ..:cd..:replay"

home/stalonetrayrc

@@ -1,137 +0,0 @@
-# vim:filetype=config:tw=80:et
-#
-# This is sample ~/.stalonetrayrc, resembling default configuration.
-# Remember: command line parameters take precedence.
-#
-# Directives introduced in 0.8 are marked with "NEW in 0.8"
-#
-####################################################################
-#
-# stalonetray understands following directives
-#
-####################################################################
-
-# background <color>         # color can be specified as an HTML hex triplet or
-                             # as a name from rgb.txt, note that '#' must be quoted
-background "#777777"
-
-# decorations <decspec>      # set trays window decorations; possible values for
-                             # decspec are: all, title, border, none
-decorations none
-
-# display <display name>     # as usual
-
-# dockapp_mode <mode>        # set dockapp mode, which can be either simple (for
-                             # e.g. OpenBox, wmaker for WindowMaker, or none
-                             # (default). NEW in 0.8.
-dockapp_mode none
-
-# fuzzy_edges [<level>]      # enable fuzzy edges and set fuzziness level. level
-                             # can be from 0 (disabled) to 3; this setting works
-                             # with tinting and/or transparent and/or pixmap
-                             # backgrounds
-fuzzy_edges 0
-
-# geometry <geometry>        # tray's geometry in standard X notation; width and
-                             # height are specified in slot_size multiples
-geometry 1x1+0+0
-
-# grow_gravity <gravity>     # one of N, S, E, W, NW, NE, SW, SE; tray will grow
-                             # in the direction opposite to one specified by
-							 # grow_gravity; if horizontal or vertical
-							 # direction is not specified, tray will not grow in
-							 # that direction
-grow_gravity NW
-
-# icon_gravity <gravity>     # icon placement gravity, one of NW, NE, SW, SE
-icon_gravity NW
-
-# icon_size <int>            # specifies dimensions of typical icon slot
-icon_size 24
-
-# log_level <level>          # controls the amount of logging output, level can
-                             # be err (default), info, or trace (enabled only
-                             # when stalonetray configured with --enable-debug)
-                             # NEW in 0.8.
-log_level err
-
-# kludges kludge[,kludge]    # enable specific kludges to work around
-                             # non-conforming WMs and/or stalonetray bugs.
-                             # NEW in 0.8. Argument is a
-                             # comma-separated list of
-                             # * fix_window_pos - fix tray window position on
-                             #     erroneous moves by WM
-                             # * force_icons_size - ignore resize events on all
-                             #     icons; force their size to be equal to
-                             #     icon_size
-                             # * use_icon_hints - use icon window hints to
-                             #     dtermine icon size
-
-# max_geometry <geometry>    # maximal tray dimensions; 0 in width/height means
-                             # no limit
-max_geometry 0x0
-
-# no_shrink [<bool>]         # disables shrink-back mode
-no_shrink false
-
-# parent_bg [<bool>]         # whether to use pseudo-transparency
-                             # (looks better when reparented into smth like FvwmButtons)
-parent_bg true
-
-# pixmap_bg <path_to_xpm>    # use pixmap from specified xpm file for (tiled) background
-# pixmap_bg /home/user/.stalonetraybg.xpm
-
-# scrollbars <mode>          # enable/disable scrollbars; mode is either
-                             # vertical, horizontal, all or none (default)
-                             # NEW in 0.8.
-scrollbars none
-
-# scrollbars-size <size>     # scrollbars step in pixels; default is slot_size / 4
-# scrollbars-step 8
-
-# scrollbars-step <step>     # scrollbars step in pixels; default is slot_size / 2
-# scrollbars-step 32
-
-# slot_size <int>            # specifies size of icon slot, defaults to
-                             # icon_size NEW in 0.8.
-
-# skip_taskbar [<bool>]      # hide tray`s window from the taskbar
-skip_taskbar true
-
-# sticky [<bool>]            # make a tray`s window sticky across the
-                             # desktops/pages
-sticky true
-
-# tint_color <color>         # set tinting color
-tint_color white
-
-# tint_level <level>         # set tinting level; level ranges from 0 (disabled)
-                             # to 255
-tint_level 0
-
-# transparent [<bool>]       # whether to use root-transparency (background
-                             # image must be set with Esetroot or compatible utility)
-transparent false
-
-# vertical [<bool>]          # whether to use vertical layout (horisontal layout
-                             # is used by default)
-vertical false
-
-# window_layer <layer>       # set the EWMH-compatible window layer; one of:
-                             # bottom, normal, top
-window_layer normal
-
-# window_strut <mode>        # enable/disable window struts for tray window (to
-                             # avoid converting of tray window by maximized
-                             # windows); mode defines to which screen border tray
-                             # will be attached; it can be either top, bottom,
-                             # left, right, none or auto (default)
-window_strut auto
-
-# window_type <type>         # set the EWMH-compatible window type; one of:
-                             # desktop, dock, normal, toolbar, utility
-window_type normal
-
-# xsync [<bool>]             # whether to operate on X server synchronously (SLOOOOW)
-xsync false
-

install.sh

@@ -41,7 +41,7 @@ read -p "Press enter to install my dotfiles " WAIT_FOR_INPUT
 
 read -p "[Dotfiles] Would you like to detect distro and auto-install dependencies? [Y/n]: " line
 if [[ "$line" == Y* ]] || [[ "$line" == y* ]] || [ -z "$line" ]; then
-    distrourl="https://raw.githubusercontent.com/alopexc0de/dotfiles/master/.bin"
+    distrourl="https://raw.githubusercontent.com/alopexc0de/dotfiles/master/internal_bin"
     if [ -f /etc/arch-release ]; then
         bash <(curl -sL $distrourl/install.arch)
     elif [ -f /etc/debian_version ]; then
@@ -57,9 +57,9 @@ if ! which git >>/dev/null ; then
 fi
 
 # If the update script exists, try to do a normal update
-if [ -x "$basedir/.bin/check_for_upgrade.sh" ]; then
+if [ -x "$basedir/internal_bin/check_for_upgrade.sh" ]; then
     source "$basedir/shell/env"
-    env _DOTFILES=$basedir DISABLE_UPDATE_PROMPT='FALSE' zsh -f $basedir/.bin/check_for_upgrade.sh
+    env _DOTFILES=$basedir DISABLE_UPDATE_PROMPT='FALSE' zsh -f $basedir/internal_bin/check_for_upgrade.sh
 else
     echo "Cloning dotfiles to $basedir"
     rm -rf $basedir
@@ -69,16 +69,18 @@ fi
 # Start installing config
 
 echo "Creating Symlinks..."
-symlink $basedir/shell/zshrc $HOME/.zshrc
+# Environment
-symlink $basedir/shell/bashrc $HOME/.bashrc
-symlink $basedir/home/tmux.conf $HOME/.tmux.conf
-symlink $basedir/home/vimrc $HOME/.vimrc
-symlink $basedir/home/gitconfig $HOME/.gitconfig
-symlink $basedir/home/Xresources $HOME/.Xresources
-symlink $basedir/home/terminator $HOME/.config/terminator
-symlink $basedir/home/stalonetrayrc $HOME/.stalonetrayrc
-symlink $basedir/home/.config $HOME/.config
 symlink $basedir/home/.local $HOME/.local
+symlink $basedir/home/.config $HOME/.config
+
+symlink $basedir/home/Xresources $HOME/.Xresources
+symlink $basedir/home/gitconfig $HOME/.gitconfig
+
+symlink $basedir/home/shell/tmux.conf $HOME/.tmux.conf
+symlink $basedir/home/shell/bashrc $HOME/.bashrc
+symlink $basedir/home/shell/zshrc $HOME/.zshrc
+symlink $basedir/home/shell/vimrc $HOME/.vimrc
+
 
 echo "Installing VIM Pathogen..."
 mkdir -p $HOME/.vim/autoload $HOME/.vim/bundle
@@ -107,6 +109,7 @@ symlink $basedir/i3/wallpaper.sh $HOME/.i3/wallpaper.sh
 symlink $basedir/i3/screenshotter.sh $HOME/.i3/screenshotter.sh
 symlink $basedir/i3/compton.conf $HOME/.compton.conf
 symlink $basedir/i3/i3blocks $bindir/i3blocks
+symlink $basedir/i3/stalonetrayrc $HOME/.stalonetrayrc
 
 echo "Installing shell-history"
 python3 -m pip install shellhistory

internal_bin/check_for_upgrade.sh

@@ -16,7 +16,7 @@ function _update_dotfiles_update() {
 }
 
 function _upgrade_dotfiles() {
-  env _DOTFILES=$_DOTFILES sh $_DOTFILES/.bin/upgrade.sh
+  env _DOTFILES=$_DOTFILES sh $_DOTFILES/internal_bin/upgrade.sh
   # update the zsh file
   _update_dotfiles_update
 }