From 756b7f8c6004fcc1c59159d1d465bddc8de4f773 Mon Sep 17 00:00:00 2001
From: pfm <pfm@meager-software.com>
Date: Tue, 14 Feb 2023 08:59:41 -0600
Subject: [PATCH] Cleanup and minor tweaks

---
 .gitconfig                                    |  2 +-
 .local/share/nvim/site/ftplugin/json.vim      |  6 ----
 .local/share/nvim/site/ftplugin/tex.vim       |  9 -----
 .local/share/nvim/site/plugin/nvim-lint.vim   | 12 -------
 .../nvim/site/plugin/nvim-web-devicons.vim    |  5 ---
 .../share/nvim/site/plugin/telescope.nvim.vim | 14 --------
 .../share/nvim/site/plugin/trouble.nvim.vim   |  5 ---
 .../share/nvim/site/plugin/vim-gitgutter.vim  |  2 --
 .local/share/nvim/site/plugin/vimtex.vim      | 34 -------------------
 install.sh                                    | 13 ++-----
 setup-directories.sh                          | 28 +++++++--------
 11 files changed, 17 insertions(+), 113 deletions(-)
 delete mode 100644 .local/share/nvim/site/ftplugin/json.vim
 delete mode 100644 .local/share/nvim/site/ftplugin/tex.vim
 delete mode 100644 .local/share/nvim/site/plugin/nvim-lint.vim
 delete mode 100644 .local/share/nvim/site/plugin/nvim-web-devicons.vim
 delete mode 100644 .local/share/nvim/site/plugin/telescope.nvim.vim
 delete mode 100644 .local/share/nvim/site/plugin/trouble.nvim.vim
 delete mode 100644 .local/share/nvim/site/plugin/vim-gitgutter.vim
 delete mode 100644 .local/share/nvim/site/plugin/vimtex.vim

diff --git a/.gitconfig b/.gitconfig
index e531981..97e1a70 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,5 @@
 [user]
-    email = pgfm@meager.io
+    email = pfm@meager-software.com
     name  = pfm
 [alias]
     ll = log --oneline --decorate --graph
diff --git a/.local/share/nvim/site/ftplugin/json.vim b/.local/share/nvim/site/ftplugin/json.vim
deleted file mode 100644
index 545e3a0..0000000
--- a/.local/share/nvim/site/ftplugin/json.vim
+++ /dev/null
@@ -1,6 +0,0 @@
-" === JSON Support === {{
-
-" Properly handle comments in JSON.
-autocmd FileType json syntax match Comment +\/\/.\+$+
-
-" }}
diff --git a/.local/share/nvim/site/ftplugin/tex.vim b/.local/share/nvim/site/ftplugin/tex.vim
deleted file mode 100644
index e0e3c72..0000000
--- a/.local/share/nvim/site/ftplugin/tex.vim
+++ /dev/null
@@ -1,9 +0,0 @@
-" === Tex / LaTeX Support === {{
-
-" Default tex flavor to use if not detected.
-let g:tex_flavor = "latex"
-
-" Zathura is a minimal PDF viewer with Vim bindings.
-let g:vimtex_view_method = 'zathura'
-
-" }}
diff --git a/.local/share/nvim/site/plugin/nvim-lint.vim b/.local/share/nvim/site/plugin/nvim-lint.vim
deleted file mode 100644
index 00e8939..0000000
--- a/.local/share/nvim/site/plugin/nvim-lint.vim
+++ /dev/null
@@ -1,12 +0,0 @@
-lua << EOF
-require('lint').linters_by_ft = {
-  html = {'tidy',},
-  markdown = {'vale',},
-  sh = {'shellcheck',},
-  vim = {'vint',},
-  yaml = {'yamllint'},
-}
-EOF
-
-" Run linting after buffer write
-au BufWritePost <buffer> lua require('lint').try_lint()
diff --git a/.local/share/nvim/site/plugin/nvim-web-devicons.vim b/.local/share/nvim/site/plugin/nvim-web-devicons.vim
deleted file mode 100644
index a016a64..0000000
--- a/.local/share/nvim/site/plugin/nvim-web-devicons.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-lua << EOF
-require'nvim-web-devicons'.setup {
-    default = true;
-}
-EOF
diff --git a/.local/share/nvim/site/plugin/telescope.nvim.vim b/.local/share/nvim/site/plugin/telescope.nvim.vim
deleted file mode 100644
index ceef32d..0000000
--- a/.local/share/nvim/site/plugin/telescope.nvim.vim
+++ /dev/null
@@ -1,14 +0,0 @@
-lua << EOF
-local actions = require("telescope.actions")
-local trouble = require("trouble.providers.telescope")
-require('telescope').setup { 
-    defaults = {
-        mappings = {
-            i = { ["<c-t>"] = trouble.open_with_trouble },
-            n = { ["<c-t>"] = trouble.open_with_trouble },
-        },
-    },
-}
-
-require('telescope').load_extension('fzf')
-EOF
diff --git a/.local/share/nvim/site/plugin/trouble.nvim.vim b/.local/share/nvim/site/plugin/trouble.nvim.vim
deleted file mode 100644
index 3da9c2a..0000000
--- a/.local/share/nvim/site/plugin/trouble.nvim.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-lua << EOF
-require("trouble").setup {
-    -- empty = default settings
-}
-EOF
diff --git a/.local/share/nvim/site/plugin/vim-gitgutter.vim b/.local/share/nvim/site/plugin/vim-gitgutter.vim
deleted file mode 100644
index df6c702..0000000
--- a/.local/share/nvim/site/plugin/vim-gitgutter.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-" Let other signs (e.g. linter errors) take precedence over gitgutter
-let g:gitgutter_sign_allow_clobber = 0
diff --git a/.local/share/nvim/site/plugin/vimtex.vim b/.local/share/nvim/site/plugin/vimtex.vim
deleted file mode 100644
index a05b46f..0000000
--- a/.local/share/nvim/site/plugin/vimtex.vim
+++ /dev/null
@@ -1,34 +0,0 @@
-" If the format cannot be determined, use this.
-let g:tex_flavor = 'latex'
-let g:vimtex_view_method = 'zathura'
-
-let g:vimtex_compiler_latexmk = { 
-        \ 'executable' : 'latexmk',
-        \ 'options' : [ 
-        \   '-xelatex',
-        \   '-file-line-error',
-        \   '-synctex=1',
-        \   '-interaction=nonstopmode',
-        \ ],
-        \}
-
-"let g:vimtex_compiler_latexmk = {
-"        \ 'backend' : 'nvim',
-"        \ 'background' : 1,
-"        \ 'build_dir' : '',
-"        \ 'callback' : 1,
-"        \ 'continuous' : 1,
-"        \ 'executable' : 'latexmk',
-"        \ 'hooks' : [],
-"        \ 'options' : [
-"        \   '-xelatex',
-"        \   '-verbose',
-"        \   '-file-line-error',
-"        \   '-synctex=1',
-"        \   '-interaction=nonstopmode',
-"        \ ],
-"        \}
-
-"let g:vimtex_compiler_latexmk_engines = {
-"        \ '_' : '-xelatex',
-"        \}
diff --git a/install.sh b/install.sh
index ed22e28..bd1b524 100755
--- a/install.sh
+++ b/install.sh
@@ -36,12 +36,6 @@ zshrc_source="${__dir}/${zshrc}"
 zshrc_target="${HOME}/${zshrc}"
 zshrc_backup="${backup_dir}/${zshrc_name}"
 
-ps1=".startup/ps1"
-ps1_name="ps1"
-ps1_source="${__dir}/${ps1}"
-ps1_target="${HOME}/${ps1}"
-ps1_backup="${backup_dir}/${ps1_name}"
-
 profile=".profile"
 profile_name="profile"
 profile_source="${__dir}/${profile}"
@@ -97,7 +91,7 @@ ssh_agent_target="${HOME}/${ssh_agent}"
 ssh_agent_backup="${backup_dir}/${ssh_agent_name}"
 
 function display_configs {
-    echo 'Supported config targets: all, bashrc, zshrc, ps1, profile, i3, i3status, xresources, gitconfig, gitignore, alacritty, fontconfig, ssh_agent, nvim'
+    echo 'Supported config targets: all, bashrc, zshrc, profile, i3, i3status, xresources, gitconfig, gitignore, alacritty, fontconfig, ssh_agent, nvim'
 }
 
 function display_usage {
@@ -231,8 +225,8 @@ done
 
 # Ensure the backup directory exists (if backups are requested).
 if $auto_backup; then
-    if [ ! -d $backup_dir ]; then
-        if `mkdir $backup_dir`; then
+    if [ ! -d "$backup_dir" ]; then
+        if eval mkdir "$backup_dir"; then
             echo -e "${COLOR_NOTIFY}[Note]${NC} created '$backup_dir' to store dotfile backups."
         else
             echo -e "${COLOR_ERROR}[Error]${NC} Failed to create backup directory '$backup_dir'."
@@ -243,7 +237,6 @@ fi
 # Install all requested configurations.
 install_config "${bashrc_name}" "${bashrc_source}" "${bashrc_target}" "${bashrc_backup}"
 install_config "${zshrc_name}" "${zshrc_source}" "${zshrc_target}" "${zshrc_backup}"
-install_config "${ps1_name}" "${ps1_source}" "${ps1_target}" "${ps1_backup}"
 install_config "${profile_name}" "${profile_source}" "${profile_target}" "${profile_backup}"
 install_config "${i3_name}" "${i3_source}" "${i3_target}" "${i3_backup}"
 install_config "${i3status_name}" "${i3status_source}" "${i3status_target}" "${i3status_backup}"
diff --git a/setup-directories.sh b/setup-directories.sh
index a8fa297..48928b9 100755
--- a/setup-directories.sh
+++ b/setup-directories.sh
@@ -4,18 +4,16 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-mkdir $HOME/bin
-mkdir $HOME/log
-mkdir $HOME/log/$USER
-mkdir $HOME/opt
-mkdir $HOME/src
-mkdir -p $HOME/.dotfiles/backups
-mkdir -p $HOME/.config
-mkdir -p $HOME/.config/alacritty
-mkdir -p $HOME/.config/fontconfig
-mkdir -p $HOME/.config/i3
-mkdir -p $HOME/.config/i3status
-mkdir -p $HOME/.config/nvim
-mkdir -p $HOME/.startup
-mkdir -p $HOME/.local/share/nvim/site/ftplugin
-mkdir -p $HOME/.local/share/nvim/site/plugin
+mkdir "$HOME/bin"
+mkdir "$HOME/log"
+mkdir "$HOME/log/$USER"
+mkdir "$HOME/opt"
+mkdir "$HOME/src"
+mkdir -p "$HOME/.dotfiles/backups"
+mkdir -p "$HOME/.config"
+mkdir -p "$HOME/.config/alacritty"
+mkdir -p "$HOME/.config/fontconfig"
+mkdir -p "$HOME/.config/i3"
+mkdir -p "$HOME/.config/i3status"
+mkdir -p "$HOME/.config/nvim"
+mkdir -p "$HOME/.startup"