From 5562c303ade0d68a9825dbdde5b5169d55d63cee Mon Sep 17 00:00:00 2001
From: ObserverOfTime <chronobserver@disroot.org>
Date: Wed, 3 Jul 2019 19:19:12 +0300
Subject: [PATCH] Move Ruby packages to Arch (quarry repo)

---
 .bash_aliases                 |  9 ---------
 .bash_profile                 | 14 +++++++++-----
 .gitconfig                    |  8 +-------
 .local/arch/init.sh           |  7 ++++---
 .local/arch/packages.repo.txt |  4 ++--
 .local/ruby/Gemfile           | 11 -----------
 README.md                     |  5 -----
 7 files changed, 16 insertions(+), 42 deletions(-)
 delete mode 100644 .local/ruby/Gemfile

diff --git a/.bash_aliases b/.bash_aliases
index b17d17c..a4e408f 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -54,15 +54,6 @@ alias l1='ls -ANFH1'
 alias l='ls -lhNFHB'
 # }}}
 
-# Switch between git & hub commands {{{
-git() {
-    case "$1" in
-        alias|fork|pr) command git "$@" ;;
-        *) command hub "$@" ;;
-    esac
-}
-# }}}
-
 # Add an alert function for long running commands {{{
 alert() { # Use like so: sleep 10; alert
   # shellcheck disable=SC2181
diff --git a/.bash_profile b/.bash_profile
index 85091f8..6127c12 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -35,11 +35,9 @@ export EDITOR=nvim
 # Set the default browser to firefox
 export BROWSER=firefox
 
-# Set the android sdk directory
-export ANDROID_HOME=~/.android/sdk/
-
-# Set the path used by go
+# Set the paths used by go {{{
 export GOPATH="$HOME/.local/go"
+# }}}
 
 # Set the paths used by rubygems {{{
 export GEM_HOME="$HOME/.local/ruby"
@@ -47,12 +45,18 @@ export GEM_SPEC_CACHE="$GEM_HOME/specs"
 export GEM_PATH="$GEM_HOME:/usr/lib/ruby/gems/2.6.0"
 # }}}
 
-# Set the path used by perl5 {{{
+# Set the paths used by perl5 {{{
 export PERL5LIB="$HOME/.local/perl/lib/perl5"
 export PERL_CPANM_OPT="-l ~/.local/perl"
 export PERL_CPANM_HOME="$HOME/.local/perl/.cpanm"
 # }}}
 
+# Set the paths used by the android sdk {{{
+export ANDROID_EMULATOR_HOME="$HOME/.local/android/emulator"
+export ANDROID_AVD_HOME="$HOME/.local/android/avd"
+export ANDROID_SDK_ROOT="$HOME/.local/android/sdk"
+# }}}
+
 # Set the search path for commands
 export PATH="$HOME/.local/bin:$PATH:$GOPATH/bin:$GEM_HOME/bin:$HOME/.yarn/bin"
 
diff --git a/.gitconfig b/.gitconfig
index 103bf42..9a77987 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -11,12 +11,6 @@
 [credential]
 	helper = store
 
-[github]
-	user = ObserverOfTime
-
-[web]
-	browser = ${BROWSER:-firefox}
-
 [gpg]
 	program = gpg2
 
@@ -78,6 +72,7 @@
 	wdiff = diff --word-diff
 	cdiff = diff --word-diff-regex=. --color-words
 	conflicts = diff --name-only --diff-filter=U
+	root = rev-parse --show-toplevel
 	shallow = clone --single-branch --depth=1
 	lab = !git clone git@gitlab.com:"$1" "${@:2}" "#"
 	aur = !git clone aur@aur.archlinux.org:"$1" "${@:2}" "#"
@@ -117,7 +112,6 @@
 			-sSX PATCH \"https://api.github.com/repos/$user/${2:-$root}\" \
 			-d \"{\\\"name\\\": \\\"${1:?}\\\"}\"; \
 		git remote set-url \"${3:-origin}\" \"https://github.com/$user/$1\" )"
-	open-page = "!xdg-open \"$(basename \"$(git root)\")\""
 
 [url "git@github.com:"]
 	insteadOf = https://github.com/
diff --git a/.local/arch/init.sh b/.local/arch/init.sh
index d819af1..64e7b5c 100755
--- a/.local/arch/init.sh
+++ b/.local/arch/init.sh
@@ -1,12 +1,13 @@
 #!/bin/bash -e
 
-# Enable multilib & add oracle repo {{{
+# Enable multilib & add extra repos {{{
 sudo cp /etc/pacman.conf{,.bak}
 sudo sed -i /etc/pacman.conf \
   -e 's/^#\(Color\)/\1\nILoveCandy/' \
   -e '/\[multilib\]/,/Include/s/^#//' \
-  -e '$ a [oracle]\nSigLevel = OptionalTrustAll' \
-  -e '$ a Server = http://linux.shikadi.net/arch/$repo/$arch'
+  -e '$ a [oracle]\nSigLevel = Optional TrustAll' \
+  -e '$ a Server = http://linux.shikadi.net/arch/$repo/$arch' \
+  -e '$ a [quarry]\nServer = https://pkgbuild.com/~anatolik/quarry/x86_64/'
 # }}}
 
 # Update system and install basic packages {{{
diff --git a/.local/arch/packages.repo.txt b/.local/arch/packages.repo.txt
index 71626b9..4925446 100644
--- a/.local/arch/packages.repo.txt
+++ b/.local/arch/packages.repo.txt
@@ -99,8 +99,8 @@ rclone
 ripgrep
 rstcheck
 ruby
-ruby-bundler
-rubygems
+ruby-jekyll
+ruby-travis
 screenfetch
 scribus
 sddm-kcm
diff --git a/.local/ruby/Gemfile b/.local/ruby/Gemfile
deleted file mode 100644
index 45ee88a..0000000
--- a/.local/ruby/Gemfile
+++ /dev/null
@@ -1,11 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'jekyll'
-gem 'neovim'
-gem 'rake'
-gem 'rdoc'
-gem 'ronn'
-gem 'rouge'
-gem 'sqlint'
-gem 'travis'
-
diff --git a/README.md b/README.md
index 03667c9..e88ed1f 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,6 @@ Managed via [dotfiles.sh](https://github.com/eli-schwartz/dotfiles.sh)
 ## [Pip](https://pypi.org/project/pip/)
 
 * [.config/pip/pip.conf](.config/pip/pip.conf): configuration file
-* [.config/pip/requirements.txt](.config/pip/requirements.txt): package list
 
 ## [Pycodestyle](http://pycodestyle.pycqa.org/en/latest/)
 
@@ -97,10 +96,6 @@ Managed via [dotfiles.sh](https://github.com/eli-schwartz/dotfiles.sh)
 
 * [.pug-lintrc.json](.pug-lintrc.json): configuration file
 
-## [Ruby](https://www.ruby-lang.org/en/)
-
-* [.local/ruby/Gemfile](.local/ruby/Gemfile): package list
-
 ## [Stylelint](https://stylelint.io/)
 
 * [.stylelintrc.json](.stylelintrc.json): configuration file