Massive refactor to support Manjaro

Author: elamperti

.editorconfig

@@ -6,7 +6,7 @@ root = true
 
 [*]
 charset = utf-8
-indent_size = 4
+indent_size = 2
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true

.gitmodules

@@ -2,5 +2,5 @@
 	path = common/bashlog
 	url = https://github.com/elamperti/bashlog.git
 [submodule "common/progressbar"]
-	path = common/progressbar
+	path = utils/common/progressbar
 	url = https://github.com/elamperti/bash-progressbar.git

README.md

@@ -5,6 +5,7 @@ See [requirements](#requirements), [setup instructions](#installing) and [how to
 There's also some [unrelated documentation](./docs/).
 
 ## Screenshots
+
 ![i3 desktop](https://user-images.githubusercontent.com/910672/46715151-2b80e280-cc35-11e8-99ee-d681e4e74ab5.jpg)
 ![tmux featuring vim and bash](https://user-images.githubusercontent.com/910672/44622666-921f8c00-a893-11e8-86a4-1b3355ada324.jpg)
 ![bash prompt in a git repo](https://user-images.githubusercontent.com/910672/44622668-92b82280-a893-11e8-9b74-78e4693c179d.jpg)
@@ -22,6 +23,7 @@ The setup will look for the following packages (and try to install them, if you
   * `stow` to symlink several files
 
 ## Installing
+
 Just execute `setup.sh` and keep an eye on what happens :crystal_ball:
 
 ```sh
@@ -59,16 +61,16 @@ After installing all the required packages, bundle scripts will finish their ins
 You should really take a look at [`setup.sh`](./setup.sh) to see what it does. Apart from that, you may want to change the following to suit your needs:
 
   * [Files in `shell/`](./shell/), which are most of the dotfiles
-  * [Files in `home/`](./home/), which will be symlinked to your home folder
-  * [Package lists](./common/package-lists.sh)
+  * [Files in `home/`](./home/), which will be symlinked to your home directory
+  * [Package lists](./config/package-lists.sh)
   * [Bundles](./bundles/), for more details see [the guide](./bundles/about-bundles.md)
   * `~/.bash*` files affixed with `.local` will be sourced (as long as they have their corresponding file in [`shell`](./shell/)
   * Edit the [prompt templates](./art/prompt/templates/), or create a style for an existing one (it's as easy as changing values in a JSON file)
   * Add your own [ascii art](./art/motd/) to use it as MOTD, or custom scripts in [`motd/`](./motd/); the MOTD wizard will let you pick which ones to use.
 
 ## Testing
 
-Tests are written using [Bats](https://github.com/sstephenson/bats) and live in the [`test`](./test/) folder. To run them locally:
+Tests are written using [Bats](https://github.com/sstephenson/bats) and live in the [`test`](./test/) directory. To run them locally:
 
 ```sh
 bats test

aliases/apt.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# apt shortcuts
+alias sapar='sudo apt-get autoremove'
+alias sapi='sudo apt-get install'
+alias sapr='sudo apt-get remove'
+alias saps='sudo apt-cache search'
+alias sapu='sudo apt-get update'
+alias sapup='sudo apt-get upgrade'
+alias sapy='sudo apt-get install -y'
+

aliases/colorize.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Colorize things
+alias dir='dir --color=auto'
+alias egrep='egrep --color=auto'
+alias fgrep='fgrep --color=auto'
+alias grep='grep --color=auto'
+alias ls='ls --color=auto'

shell/.bash_aliases aliases/git.sh

@@ -1,48 +1,5 @@
 #!/bin/bash
 
-# Colorize things
-alias dir='dir --color=auto'
-alias egrep='egrep --color=auto'
-alias fgrep='fgrep --color=auto'
-alias grep='grep --color=auto'
-alias ls='ls --color=auto'
-
-# Other useful aliases
-alias :q='exit'
-alias chx='chmod +x'
-alias df='df -h'
-alias du='du -h'
-alias la='ls -lAh --group-directories-first'
-alias lad='ls -lAh --color=always|grep "^d" --color=never'
-alias map='xargs -n1'
-alias s='cd ..'
-alias sl='ls'
-alias units='units -1 --compact -o '"'"'%.4g'"'"
-alias poewroff='poweroff'
-
-# Turn Bash history on/off
-alias histoff='set +o history'
-alias histon='set -o history'
-
-# Short utilities
-alias cc='xclip -selection clip'
-alias https='http --default-scheme=https'
-alias tk='pkill'
-alias ports='sudo netstat -tulpn'
-
-alias e='vim'
-alias o='xdg-open'
-alias q='exit'
-
-# apt shortcuts
-alias sapar='sudo apt-get autoremove'
-alias sapi='sudo apt-get install'
-alias sapr='sudo apt-get remove'
-alias saps='sudo apt-cache search'
-alias sapu='sudo apt-get update'
-alias sapup='sudo apt-get upgrade'
-alias sapy='sudo apt-get install -y'
-
 # Git shortcut madness
 alias g='git'
 alias ga='git add'
@@ -79,8 +36,8 @@ alias grbm='git rebase master'
 alias grm='git rm --cached'
 alias grs='git reset'
 alias gs='git status' # -sb
-alias gsa='git stash apply'
 alias gsh='git stash save'
+alias gsha='git stash apply'
 alias gsl='git stash list'
 alias gsp='git stash pop'
 alias gsw='git show'
@@ -118,7 +75,3 @@ if type __git_complete &>/dev/null; then
   __git_complete gsl _git_stash
   __git_complete gsp _git_stash
 fi
-
-# Ledger
-alias led='ledger'
-alias lbr='led bal Expenses --effective --flat -S amount --no-total --period'

aliases/ledger.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Ledger
+alias led='ledger'
+alias lbr='led bal Expenses --effective --flat -S amount --no-total --period'

aliases/misc.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Other useful aliases
+alias :q='exit'
+alias chx='chmod +x'
+alias df='df -h'
+alias du='du -h'
+alias la='ls -lAh --group-directories-first'
+alias lad='ls -lAh --color=always|grep "^d" --color=never'
+alias map='xargs -n1'
+alias s='cd ..'
+alias sl='ls'
+alias units='units -1 --compact -o '"'"'%.4g'"'"
+alias poewroff='poweroff'
+
+# Turn Bash history on/off
+alias histoff='set +o history'
+alias histon='set -o history'
+
+alias e='vim'
+alias o='xdg-open'
+alias q='exit'

aliases/pacman.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# yay+pacman shortcuts
+alias pacup='sudo pacman -Syu'
+alias paca='yay -S'
+alias pacar='sudo pacman -Qdtq'
+alias pacr='sudo pacman -R'
+alias pacq='yay -Ss'

aliases/utils.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# Short utilities
+alias cc='xclip -selection clip'
+alias https='http --default-scheme=https'
+alias ntpup='sudo ntpdate time.cloudflare.com'
+alias tk='pkill'
+alias ports='sudo netstat -tulpn'

art/prompt/generate.py

@@ -80,19 +80,19 @@ def main():
 
     template_path = 'templates/' + args.template + '/' + args.template + '.template'
     try:
-        template = open(template_path, 'r').read().decode('utf-8')
+        template = open(template_path, 'r').read()
     except IOError:
         print ('Template <' + args.template + '> not found')
         exit(1)
 
     variables_path = 'templates/' + args.template + '/styles/' + 'default.json'
-    variables = json.loads(open(variables_path, 'r').read().decode('utf-8'))
+    variables = json.loads(open(variables_path, 'r').read())
 
     # Alt style besides 'default'
     if args.style != 'default':
         style_path = 'templates/' + args.template + '/styles/' + args.style + '.json'
         try:
-            style = json.loads(open(style_path, 'r').read().decode('utf-8'))
+            style = json.loads(open(style_path, 'r').read())
         except IOError:
             print ('Style <'+ args.style + '> not found')
             exit(1)

art/prompt/templates/fancy/fancy.template

@@ -90,10 +90,9 @@ completely_dynamic_prompt() {
     ##############
 
     # Username
-    {~ !show_battery_level ~}
     # Reset, set username background color
     PS1+="\[\e[0m\]{{ colors.user_bg }}"
-    {~ /show_battery_level ~}
+
     # Set username color for SSH connctions, overriden later if local
     PS1+="{{ colors.ssh_user_fg }}"
     # Show user icon only if not going through a SSH connection
@@ -353,8 +352,8 @@ set_prompts() {
     export PS4
 }
 
-# Color theme, if it is just in this particular place
-# ToDo: make this more flexible
+# Color theme
+# ToDo: make this path more flexible
 [[ -s "$HOME/dotfiles/art/colors/{{ strings.palette }}.sh" ]] &&
     source "$HOME/dotfiles/art/colors/{{ strings.palette }}.sh"
 

bundles/bundle-tools.sh

@@ -2,7 +2,7 @@
 
 RESPONSE=""
 pushd "$(dirname "${BASH_SOURCE[0]}")/.." &> /dev/null
-source "common/utils.sh"
+source "utils/common/functions.sh"
 popd &> /dev/null
 
 trap on_unload EXIT

bundles/minecraft/minecraft.sh

@@ -12,40 +12,41 @@ verify_requirements() {
 }
 
 on_init() {
-    if ! cmd_exists "java"; then
-        send_cmd enqueue_packages "openjdk-7-jre"
-    fi
+  # if ! cmd_exists "java"; then
+  #   send_cmd enqueue_packages "openjdk-7-jre"
+  # fi
+  return
 }
 
 after_installs() {
-    local minecraft_path="$HOME/bin/minecraft"
-    local minecraft_launcher="${minecraft_path}/minecraft.jar"
-    local minecraft_icon="${minecraft_path}/minecraft.png"
-    local minecraft_shortcut="$HOME/Desktop/minecraft.desktop"
+  local minecraft_path="$HOME/bin/minecraft"
+  local minecraft_launcher="${minecraft_path}/minecraft.jar"
+  local minecraft_icon="${minecraft_path}/minecraft.png"
+  local minecraft_shortcut="$HOME/Desktop/minecraft.desktop"
 
-    # Downloads Minecraft installer if missing
-    if [ ! -f ${minecraft_launcher} ]; then
-        mkdir -p "${minecraft_path}" &>/dev/null
-        curl --silent -kfLo "${minecraft_launcher}" \
-            "http://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar"
-        # Fail if download failed
-        if [ ! $? ]; then
-            exit 1
-        fi
+  # Downloads Minecraft installer if missing
+  if [ ! -f ${minecraft_launcher} ]; then
+    mkdir -p "${minecraft_path}" &>/dev/null
+    curl --silent -kfLo "${minecraft_launcher}" \
+        "http://s3.amazonaws.com/Minecraft.Download/launcher/Minecraft.jar"
+    # Fail if download failed
+    if [ ! $? ]; then
+      exit 1
     fi
+  fi
 
-    # Make it executable
-    chmod +x "${minecraft_launcher}"
+  # Make it executable
+  chmod +x "${minecraft_launcher}"
 
-    # Downloads Minecraft icon if missing
-    if [ ! -f ${minecraft_icon} ]; then
-        curl --silent -kfLo ${minecraft_icon} \
-            "https://i.imgur.com/cNN2mo5.png"
-    fi
+  # Downloads Minecraft icon if missing
+  if [ ! -f ${minecraft_icon} ]; then
+    curl --silent -kfLo ${minecraft_icon} \
+        "https://i.imgur.com/cNN2mo5.png"
+  fi
 
-    # Create desktop launcher
-    if [ -d "$HOME/Desktop" ]; then
-        cat > ${minecraft_shortcut} <<EOF
+  # Create desktop launcher
+  if [ -d "$HOME/Desktop" ]; then
+    cat > ${minecraft_shortcut} <<EOF
 [Desktop Entry]
 Encoding=UTF-8
 Version=1.0
@@ -58,8 +59,8 @@ Icon=${minecraft_icon}
 Categories=Game;
 Comment=Block building game
 EOF
-    chmod +x "${minecraft_shortcut}"
-    fi
+  chmod +x "${minecraft_shortcut}"
+  fi
 }
 
 # The following line is necessary.

bundles/vim/vim/vimrc

@@ -387,7 +387,7 @@ if has('autocmd')
     autocmd FileType ledger vnoremap <silent> <buffer> <Tab> :LedgerAlign<CR>
     autocmd FileType ledger inoremap <silent> <Tab> <C-r>=ledger#autocomplete_and_align()<CR>
 
-    autocmd FileType ledger inoremap <leader>l <C-R>=strftime('%m-%d')<CR> * 
+    autocmd FileType ledger inoremap <leader>l <C-R>=strftime('%m-%d')<CR> *
 endif
 
 noremap <silent><buffer> <2-LeftMouse> :call ledger#transaction_state_toggle(line('.'), '*?!')<CR>
@@ -423,7 +423,8 @@ if has('autocmd')
 
     augroup HiglightTODO
         autocmd!
-        autocmd WinEnter,VimEnter * :silent! call matchadd('Todo', 'TODO\|ToDo\|Todo\|FIXME', -1)
+        autocmd WinEnter,BufEnter * if &filetype != "ledger"
+            \ | :silent! call matchadd('Todo', 'TODO\|ToDo\|Todo\|FIXME', -1)
     augroup END
 
     " Toggle relative line numbers depending on mode