From 8facafa3e04ad7420e6a9f0e8d34fdd2f443e71f Mon Sep 17 00:00:00 2001
From: Austen Adler <stonewareslord@gmail.com>
Date: Sun, 14 Jan 2018 23:58:31 -0500
Subject: [PATCH] Use gitea

---
 scripts/sync.sh |  6 ++---
 shells/zshrc    | 26 +++++++++----------
 vim/vimrc       | 68 ++++++++++++++++++++++++-------------------------
 3 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/scripts/sync.sh b/scripts/sync.sh
index 50dc9d4..12b501d 100755
--- a/scripts/sync.sh
+++ b/scripts/sync.sh
@@ -26,12 +26,12 @@ sync_config() {
     if command -v zsh 2>&1 >/dev/null; then
       for i in lpr oh-my-git-themes omg zsh-syntax-highlighting; do
         if [ ! -d ~/.zsh-git/"$i" ]; then
-          git clone "https://austenwares.com/gitea/stonewareslord/$i.git" ~/.zsh-git/"$i"
+          git clone "https://gitea.austenwares.com/stonewareslord/$i.git" ~/.zsh-git/"$i"
         fi
       done
     fi
     if [ ! -d ~/.fzf ] ; then
-      git clone "https://austenwares.com/gitea/stonewareslord/fzf.git" ~/.fzf
+      git clone "https://gitea.austenwares.com/stonewareslord/fzf.git" ~/.fzf
       ~/.fzf/install --bin
     fi
   else
@@ -69,7 +69,7 @@ sync_custom() {
   fi
   if [[ ! -d ~/.zsh-git/custom-config ]]; then
     #TODO: Figure out if I should use ssh or https cloning
-    #git clone https://austenwares.com/gitea/stonewareslord/custom-config
+    #git clone https://gitea.austenwares.com/stonewareslord/custom-config
     git clone git@austenwares.com:stonewareslord/custom-config ~/.zsh-git/custom-config
   fi
   remove ~/.gitconfig
diff --git a/shells/zshrc b/shells/zshrc
index 27a1c19..4688820 100644
--- a/shells/zshrc
+++ b/shells/zshrc
@@ -50,7 +50,7 @@ sv () {
   while (( $# > 1 )); do
     if [[ "$command" == "i" ]]; then
       echo "Status of $1"
-      service "$1" status
+      rc-service "$1" status
       shift
       continue
     fi
@@ -61,15 +61,15 @@ sv () {
     fi
     if [[ "$command" == "r" ]]; then
       echo "Restarting $1"
-      sudo service "$1" restart
+      sudo rc-service "$1" restart
     elif [[ "$command" == "s" ]]; then
       echo "Starting $1"
-      sudo service "$1" start
+      sudo rc-service "$1" start
     elif [[ "$command" == "x" ]]; then
       echo "Stopping $1"
-      sudo service "$1" stop
+      sudo rc-service "$1" stop
     else
-      sudo service "$1" "$command"
+      sudo rc-service "$1" "$command"
     fi
     shift
   done
@@ -301,12 +301,12 @@ if test -f /etc/gentoo-release; then
   }
 elif test -f /etc/lsb-release; then
   # Ubuntu
-  alias install='sudo apt-get --show-progress install'
-  alias remove='sudo apt-get --show-progress remove'
-  alias update='sudo apt-get update'
-  alias upgrade='sudo apt-get --show-progress upgrade'
-  alias autoremove='sudo apt-get --show-progress autoremove'
-  alias updateall='sudo sh -c "apt-get update;apt-get upgrade -y;apt-get dist-upgrade -y;apt-get autoremove -y"'
+  alias install='sudo apt install'
+  alias remove='sudo apt remove'
+  alias update='sudo apt update'
+  alias upgrade='sudo apt upgrade'
+  alias autoremove='sudo apt autoremove'
+  alias updateall='sudo sh -c "apt update;apt full-upgrade -y"'
   alias search='apt-cache search'
 fi
 alias ..='k ..'
@@ -389,7 +389,7 @@ paste() {
 }
 linx() {
   if [[ -z "$1" ]]; then
-    curl -T- -H "Linx-Randomize: yes" -H "Linx-Expiry: 2592000" https://austenwares.com/linx/upload | perl -pe 's/https:\/\/austenwares.com\/linx\/(\w+)/https:\/\/austenwares.com\/linx\/selif\/\1/'
+    curl -T- -H "Linx-Randomize: yes" -H "Linx-Expiry: 2592000" https://linx.austenwares.com/upload | perl -pe 's/https:\/\/linx.austenwares.com\/(\w+)/https:\/\/linx.austenwares.com\/selif\/\1/'
   elif (( $# == 1 )) && [[ -f "$1" ]]; then
     linx < "$1"
   else
@@ -506,7 +506,7 @@ create-repo(){
   read username
   echo -n "Password: "
   read  -s password
-  curl --user "$username:$password" -d name="$1" -d private="$PRIVATE" https://austenwares.com/gitea/api/v1/user/repos
+  curl --user "$username:$password" -d name="$1" -d private="$PRIVATE" https://gitea.austenwares.com/api/v1/user/repos
 }
 hsh(){
   FILE="$1"
diff --git a/vim/vimrc b/vim/vimrc
index 1d3b2b1..f657d2e 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -259,81 +259,81 @@ else
   call plug#begin('~/.vim/plugged')
 endif
 " Code writing {
-  Plug 'https://austenwares.com/gitea/vim/vim-autoformat', { 'on': 'Autoformat'}
+  Plug 'https://gitea.austenwares.com/vim/vim-autoformat', { 'on': 'Autoformat'}
     "Adds autoformat command | https://github.com/Chiel92/vim-autoformat
-  Plug 'https://austenwares.com/gitea/vim/vim-surround'
+  Plug 'https://gitea.austenwares.com/vim/vim-surround'
     "Surround selection in ({\"' or HTML tags  | https://github.com/tpope/vim-surround
-  Plug 'https://austenwares.com/gitea/vim/syntastic'
+  Plug 'https://gitea.austenwares.com/vim/syntastic'
     "Syntax checker | https://github.com/scrooloose/syntastic
-  Plug 'https://austenwares.com/gitea/vim/nerdtree', { 'on':  'NERDTreeToggle' }
+  Plug 'https://gitea.austenwares.com/vim/nerdtree', { 'on':  'NERDTreeToggle' }
     "File browser | https://github.com/scrooloose/nerdtree
-  Plug 'https://austenwares.com/gitea/vim/vim-easymotion'
+  Plug 'https://gitea.austenwares.com/vim/vim-easymotion'
     "Move around quickly in a document | https://github.com/Lokaltog/vim-easymotion
-  "Plug 'https://austenwares.com/gitea/vim/gundo.vim', { 'on': 'GundoToggle' }
+  "Plug 'https://gitea.austenwares.com/vim/gundo.vim', { 'on': 'GundoToggle' }
     "Visual undo | https://github.com/sjl/gundo.vim
-  Plug 'https://austenwares.com/gitea/vim/vim-exchange'
+  Plug 'https://gitea.austenwares.com/vim/vim-exchange'
     "Exchange two selections of text | https://github.com/tommcdo/vim-exchange
-  Plug 'https://austenwares.com/gitea/vim/vim-repeat'
+  Plug 'https://gitea.austenwares.com/vim/vim-repeat'
     "Repeat last tpope command with . | https://github.com/tpope/vim-repeat
-  Plug 'https://austenwares.com/gitea/vim/vim-fugitive'
+  Plug 'https://gitea.austenwares.com/vim/vim-fugitive'
     "Great Vim-Git compatibility | https://github.com/tpope/vim-fugitive
-  Plug 'https://austenwares.com/gitea/vim/ctrlp.vim'
+  Plug 'https://gitea.austenwares.com/vim/ctrlp.vim'
     "Fuzzy file search | https://github.com/kien/ctrlp.vim
-  Plug 'https://austenwares.com/gitea/vim/tabular', { 'on': 'Tab' }
+  Plug 'https://gitea.austenwares.com/vim/tabular', { 'on': 'Tab' }
     "Quickly make tables in vim | https://github.com/godlygeek/tabular
-  Plug 'https://austenwares.com/gitea/vim/UltiSnips'
+  Plug 'https://gitea.austenwares.com/vim/UltiSnips'
     "Adds snippet support | https://github.com/sirver/UltiSnips
-  Plug 'https://austenwares.com/gitea/vim/vim-snippets'
+  Plug 'https://gitea.austenwares.com/vim/vim-snippets'
     "Add snippets | https://github.com/honza/vim-snippets
-  Plug 'https://austenwares.com/gitea/vim/eregex.vim'
+  Plug 'https://gitea.austenwares.com/vim/eregex.vim'
     "Real regexes in vim | https://github.com/othree/eregex.vim
-  Plug 'https://austenwares.com/gitea/vim/vim-signify'
+  Plug 'https://gitea.austenwares.com/vim/vim-signify'
     "Git information inline | https://github.com/mhinz/vim-signify
-  Plug 'https://austenwares.com/gitea/vim/auto-pairs'
+  Plug 'https://gitea.austenwares.com/vim/auto-pairs'
     "Automatic pairs | https://github.com/jiangmiao/auto-pairs
-  Plug 'https://austenwares.com/gitea/vim/YouCompleteMe'
+  Plug 'https://gitea.austenwares.com/vim/YouCompleteMe'
     "Autocompletion | https://github.com/Valloric/YouCompleteMe
-  "Plug 'https://austenwares.com/gitea/vim/vim-java-getset.git'
-    "Java getters and setters| https://austenwares.com/gitea/vim/vim-java-getset.git
-  Plug 'https://austenwares.com/gitea/vim/double-tap.git'
+  "Plug 'https://gitea.austenwares.com/vim/vim-java-getset.git'
+    "Java getters and setters| https://gitea.austenwares.com/vim/vim-java-getset.git
+  Plug 'https://gitea.austenwares.com/vim/double-tap.git'
     "Double tap for comments
   " }
 " Style {
-  "Plug 'https://austenwares.com/gitea/vim/vim-indent-guides'
+  "Plug 'https://gitea.austenwares.com/vim/vim-indent-guides'
     "Indentation guides | https://github.com/nathanaelkane/vim-indent-guides
-  "Plug 'https://austenwares.com/gitea/vim/vim-airline'
+  "Plug 'https://gitea.austenwares.com/vim/vim-airline'
     "Bottom status bar | https://github.com/bling/vim-airline
-  Plug 'https://austenwares.com/gitea/vim/vim-colors'
+  Plug 'https://gitea.austenwares.com/vim/vim-colors'
     "Theme pack | https://github.com/spf13/vim-colors
-  Plug 'https://austenwares.com/gitea/vim/csapprox'
+  Plug 'https://gitea.austenwares.com/vim/csapprox'
     "256 color vim in terminal | https://github.com/godlygeek/csapprox
   " }
 " Syntax {
-  Plug 'https://austenwares.com/gitea/vim/vimtex'
+  Plug 'https://gitea.austenwares.com/vim/vimtex'
     "Latex | https://github.com/lervag/vimtex
-  Plug 'https://austenwares.com/gitea/vim/vim-polyglot'
+  Plug 'https://gitea.austenwares.com/vim/vim-polyglot'
     "Many languages | https://github.com/sheerun/vim-polyglot
-  Plug 'https://austenwares.com/gitea/vim/vim-vimperator'
+  Plug 'https://gitea.austenwares.com/vim/vim-vimperator'
     "Vimperator for vim | https://github.com/superbrothers/vim-vimperator
-  Plug 'https://austenwares.com/gitea/vim/i3-vim-syntax'
+  Plug 'https://gitea.austenwares.com/vim/i3-vim-syntax'
     "i3 syntax | https://github.com/PotatoesMaster/i3-vim-syntax
   " }
 " Misc {
-  Plug 'https://austenwares.com/gitea/vim/flappyvird-vim', { 'on': [] }
+  Plug 'https://gitea.austenwares.com/vim/flappyvird-vim', { 'on': [] }
     "The amazing Flappy Bird game | https://github.com/mattn/flappyvird-vim
-  Plug 'https://austenwares.com/gitea/vim/vim-gnupg'
+  Plug 'https://gitea.austenwares.com/vim/vim-gnupg'
     "GPG support | https://github.com/jamessan/vim-gnupg
-  Plug 'https://austenwares.com/gitea/vim/vim-bracketed-paste'
+  Plug 'https://gitea.austenwares.com/vim/vim-bracketed-paste'
     "Automatic :set paste funcationality | https://github.com/ConradIrwin/vim-bracketed-paste
-  Plug 'https://austenwares.com/gitea/vim/HiCursorWords'
+  Plug 'https://gitea.austenwares.com/vim/HiCursorWords'
     "Highlight word under cursor automatically | http://www.vim.org/scripts/script.php?script_id=4306
 " }
 " Unused {
-  "Plug 'https://austenwares.com/gitea/vim/mirror.vim'
+  "Plug 'https://gitea.austenwares.com/vim/mirror.vim'
   "  "Edit files remotely | https://github.com/zenbro/mirror.vim
 " }
 " Staging {
-  "Plug 'https://austenwares.com/gitea/vim/vim-symfony'
+  "Plug 'https://gitea.austenwares.com/vim/vim-symfony'
   "Plug 'dracula/vim'
 
   "Plug 'idanarye/vim-vebugger'