From 54edcf280864dcd2bfcbca6b8b2e056ce1270b99 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Mon, 22 Nov 2021 23:42:32 -0500
Subject: add more stuff

---
 .gitignore                                    |  1 +
 .gitmodules                                   |  6 ------
 alacritty/.config/alacritty/alacritty.yml     | 29 +++++++++++++++++++++++++--
 alacritty/.config/alacritty/dracula-alacritty |  1 -
 bash/.bash_profile                            |  1 -
 bash/.profile                                 |  2 +-
 bin/.local/bin/makechrootbld                  | 19 ++++++++++++++++++
 fish/.config/fish/config.fish                 |  5 +----
 fish/.config/fish/functions/aur-remove.fish   |  4 ++++
 fish/.config/fish/functions/ls.fish           |  3 +++
 fish/.config/fish/functions/vim.fish          |  3 +++
 nvim/.config/nvim/init.vim                    | 13 +++++-------
 zsh/.config/zsh/.zshrc                        | 15 ++++++++++----
 zsh/.local/share/zsh/fast-syntax-highlighting |  1 -
 14 files changed, 75 insertions(+), 28 deletions(-)
 delete mode 160000 alacritty/.config/alacritty/dracula-alacritty
 delete mode 120000 bash/.bash_profile
 create mode 100755 bin/.local/bin/makechrootbld
 create mode 100644 fish/.config/fish/functions/aur-remove.fish
 create mode 100644 fish/.config/fish/functions/ls.fish
 create mode 100644 fish/.config/fish/functions/vim.fish
 delete mode 160000 zsh/.local/share/zsh/fast-syntax-highlighting

diff --git a/.gitignore b/.gitignore
index 05f37de..57f4eda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ fish/.config/fish/completions
 fish/.config/fish/conf.d
 fish/.config/fish/fish_variables
 zsh/.config/zsh/.zcompdump
+zsh/.config/zsh/.zshrc.zwc
diff --git a/.gitmodules b/.gitmodules
index ae5a52f..1ac3c79 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
 [submodule "nvim/.local/share/nvim/site/autoload/vim-plug"]
 	path = nvim/.local/share/nvim/site/autoload/vim-plug
 	url = https://github.com/junegunn/vim-plug.git
-[submodule "alacritty/.config/alacritty/dracula-alacritty"]
-	path = alacritty/.config/alacritty/dracula-alacritty
-	url = https://github.com/dracula/alacritty.git
-[submodule "zsh/.local/share/zsh/fast-syntax-highlighting"]
-	path = zsh/.local/share/zsh/fast-syntax-highlighting
-	url = https://github.com/zdharma-continuum/fast-syntax-highlighting.git
diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index 0d2f7da..1f17be8 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -9,6 +9,31 @@ font:
     style: Regular
   size: 12
 
+# Colors (Dracula)
+colors:
+  # Default colors
+  primary:
+    background: '#282a36'
+    foreground: '#f8f8f2'
 
-import:
-  - /home/seth/.config/alacritty/dracula-alacritty/dracula.yml
+  # Normal colors
+  normal:
+    black:   '#000000'
+    red:     '#ff5555'
+    green:   '#50fa7b'
+    yellow:  '#f1fa8c'
+    blue:    '#caa9fa'
+    magenta: '#ff79c6'
+    cyan:    '#8be9fd'
+    white:   '#bfbfbf'
+
+  # Bright colors
+  bright:
+    black:   '#575b70'
+    red:     '#ff6e67'
+    green:   '#5af78e'
+    yellow:  '#f4f99d'
+    blue:    '#caa9fa'
+    magenta: '#ff92d0'
+    cyan:    '#9aedfe'
+    white:   '#e6e6e6'
diff --git a/alacritty/.config/alacritty/dracula-alacritty b/alacritty/.config/alacritty/dracula-alacritty
deleted file mode 160000
index 05faff1..0000000
--- a/alacritty/.config/alacritty/dracula-alacritty
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 05faff15c0158712be87d200081633d9f4850a7d
diff --git a/bash/.bash_profile b/bash/.bash_profile
deleted file mode 120000
index aa7da3a..0000000
--- a/bash/.bash_profile
+++ /dev/null
@@ -1 +0,0 @@
-.profile
\ No newline at end of file
diff --git a/bash/.profile b/bash/.profile
index e297b42..3e79369 100644
--- a/bash/.profile
+++ b/bash/.profile
@@ -1,5 +1,5 @@
 # add user's bin directory to path
-if [ -d $HOME/.local/bin ]
+if [ -d "$HOME/.local/bin" ]
 then
         export PATH=$HOME/.local/bin:$PATH
 fi
diff --git a/bin/.local/bin/makechrootbld b/bin/.local/bin/makechrootbld
new file mode 100755
index 0000000..c1d1ae6
--- /dev/null
+++ b/bin/.local/bin/makechrootbld
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+echo "creating arch chroot..."
+CHROOT=$(pwd)/chroot
+mkdir $CHROOT
+mkarchroot $CHROOT/root base-devel
+
+echo "upgrading chroot..."
+arch-nspawn $CHROOT/root pacman -Syu
+
+echo "building package..."
+makechrootpkg -c -u -T -r $CHROOT
+
+echo "removing chroot"
+sudo rm -rf $CHROOT
+
+echo "installing package"
+sudo pacman -U *.pkg*
+echo "DONE !"
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 84fe466..78d52f3 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -1,12 +1,9 @@
 #!/bin/fish
 
 # defaults
+set -Ux VISUAL nvim
 set -Ux EDITOR nvim
 set -Ux PAGER moar
 
-# abbrs
-abbr ls exa
-abbr vim nvim
-
 # prompt
 starship init fish | source
diff --git a/fish/.config/fish/functions/aur-remove.fish b/fish/.config/fish/functions/aur-remove.fish
new file mode 100644
index 0000000..e7749d5
--- /dev/null
+++ b/fish/.config/fish/functions/aur-remove.fish
@@ -0,0 +1,4 @@
+function aur-remove {
+    repo-remove /var/lib/repo/aur/aur.db.tar.gz $argv
+done
+
diff --git a/fish/.config/fish/functions/ls.fish b/fish/.config/fish/functions/ls.fish
new file mode 100644
index 0000000..9d08de4
--- /dev/null
+++ b/fish/.config/fish/functions/ls.fish
@@ -0,0 +1,3 @@
+function ls
+    exa $argv
+end
diff --git a/fish/.config/fish/functions/vim.fish b/fish/.config/fish/functions/vim.fish
new file mode 100644
index 0000000..f0a542e
--- /dev/null
+++ b/fish/.config/fish/functions/vim.fish
@@ -0,0 +1,3 @@
+function vim
+    nvim $argv
+end
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 9f9eab2..e6d181f 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -6,22 +6,19 @@
 call plug#begin()
 
 Plug 'itchyny/lightline.vim'
-Plug 'arcticicestudio/nord-vim'
-Plug 'dracula/vim', { 'as': 'dracula' }
 Plug 'preservim/nerdtree'
 Plug 'sheerun/vim-polyglot'
+Plug 'dracula/vim', { 'as': 'dracula' }
 
 call plug#end()
 
 " settings
-colorscheme dracula
 set termguicolors
 set nocompatible
+set tabstop=2
+set shiftwidth=2
 set expandtab
-set tabstop=4
-set shiftwidth=4
-let g:lightline = {
-      \ 'colorscheme': 'dracula',
-      \ }
 syntax on
 filetype plugin indent on
+colorscheme dracula
+let g:lightline = {'colorscheme': 'dracula'}
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 8960791..b58d3f2 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -4,7 +4,6 @@
 if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
   source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 fi
-
 #
 # g3tchoo's zshrc
 #
@@ -30,6 +29,7 @@ SAVEHIST=1000
 # defaults
 export EDITOR='nvim'
 export VISUAL='nvim'
+export PAGER='moar'
 export TERM=xterm-256color
 
 # alias
@@ -38,9 +38,16 @@ alias ls='exa'
 alias la='ls -a'
 alias g='git'
 
-source "$HOME/.local/share/zsh/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh"
-source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
-source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme
+# antigen plugins
+if [[ -f /usr/share/zsh/share/antigen.zsh ]]; then
+  source /usr/share/zsh/share/antigen.zsh
+else
+  source "$HOME/.local/share/zsh/antigen.zsh"
+fi
+antigen bundle zdharma-continuum/fast-syntax-highlighting
+antigen bundle zsh-users/zsh-completions
+antigen theme romkatv/powerlevel10k
+antigen apply
 
 # To customize prompt, run `p10k configure` or edit ~/.config/zsh/.p10k.zsh.
 [[ ! -f ~/.config/zsh/.p10k.zsh ]] || source ~/.config/zsh/.p10k.zsh
diff --git a/zsh/.local/share/zsh/fast-syntax-highlighting b/zsh/.local/share/zsh/fast-syntax-highlighting
deleted file mode 160000
index 585c089..0000000
--- a/zsh/.local/share/zsh/fast-syntax-highlighting
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 585c089968caa1c904cbe926ff04a1be9e3d8f42
-- 
cgit v1.2.3