configs/nvim/lua/cmp-setup.lua

@@ -2,6 +2,7 @@
 -- See `:help cmp`
 local cmp = require 'cmp'
 local luasnip = require 'luasnip'
+local lspkind = require('lspkind')
 require('luasnip.loaders.from_vscode').lazy_load()
 luasnip.config.setup {}
 

configs/nvim/lua/keymaps.lua

@@ -61,11 +61,4 @@ vim.api.nvim_create_autocmd('TextYankPost', {
   pattern = '*',
 })
 
--- Git stuff
-vim.keymap.set('n', '<leader>gs', ":G status<CR>")
-vim.keymap.set('n', '<leader>ga', ":G add %<CR>")
-vim.keymap.set('n', '<leader>gc', [[:G commit -m ''<Left>]])
-vim.keymap.set('n', '<leader>gp', ":G push<CR>")
-
-
 -- vim: ts=2 sts=2 sw=2 et

configs/nvim/lua/lazy-plugins.lua

@@ -183,42 +183,6 @@ require('lazy').setup({
     },
   },
 
-  {
-    'stevearc/conform.nvim',
-    event = { 'BufReadPre', 'BufNewFile' },
-    config = function()
-      local conform = require 'conform'
-
-      conform.setup {
-        formatters_by_ft = {
-          bash = { 'shellharden', 'beautysh' },
-          css = { { 'prettierd', 'prettier' } },
-          html = { 'htmlbeautifier' },
-          javascript = { { 'prettierd', 'prettier' } },
-          javascriptreact = { { 'prettierd', 'prettier' } },
-          json = { { 'prettierd', 'prettier' } },
-          lua = { 'stylua' },
-          markdown = { { 'prettierd', 'prettier' } },
-          rust = { 'rustfmt' },
-          scss = { { 'prettierd', 'prettier' } },
-          sh = { 'shellharden', 'beautysh' },
-          toml = { 'taplo' },
-          typescript = { { 'prettierd', 'prettier' } },
-          typescriptreact = { { 'prettierd', 'prettier' } },
-          yaml = { 'yamlfix' },
-          zsh = { 'shellharden', 'beautysh' },
-        },
-      }
-
-      vim.keymap.set({ 'n', 'v' }, '<leader>f', function()
-        conform.format {
-          lsp_fallback = true,
-          async = true,
-          timeout_ms = 500,
-        }
-      end, { desc = 'Format file or range (in visual mode)' })
-    end,
-  },
   {
     -- Highlight, edit, and navigate code
     'nvim-treesitter/nvim-treesitter',
@@ -228,7 +192,7 @@ require('lazy').setup({
     build = ':TSUpdate',
   },
 
-  -- require 'kickstart.plugins.autoformat',
+  require 'kickstart.plugins.autoformat',
   -- require 'kickstart.plugins.debug',
   --    For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins
 }, {})

configs/nvim/lua/lsp-setup.lua

@@ -75,13 +75,13 @@ require('mason-lspconfig').setup()
 --  If you want to override the default filetypes that your language server will attach to you can
 --  define the property 'filetypes' to the map in question.
 local servers = {
-  bashls = {},
+  -- clangd = {},
-  cssls = {},
+  -- gopls = {},
-  docker_compose_language_service = {},
+  -- pyright = {},
-  dockerls = {},
+  -- rust_analyzer = {},
-  gopls = {},
+  -- tsserver = {},
-  html = {},
+  -- html = { filetypes = { 'html', 'twig', 'hbs'} },
-  jsonls = {},
+
   lua_ls = {
     Lua = {
       workspace = { checkThirdParty = false },
@@ -90,14 +90,6 @@ local servers = {
       -- diagnostics = { disable = { 'missing-fields' } },
     },
   },
-  marksman = {},
-  mutt_ls = {},
-  pyright = {},
-  rust_analyzer = {},
-  tailwindcss = {},
-  tsserver = {},
-  yamlls = {},
-  zls = {},
 }
 
 -- Setup neovim lua configuration
@@ -112,7 +104,6 @@ local mason_lspconfig = require 'mason-lspconfig'
 
 mason_lspconfig.setup {
   ensure_installed = vim.tbl_keys(servers),
-  automatic_installation = true,
 }
 
 mason_lspconfig.setup_handlers {

configs/nvim/lua/treesitter-setup.lua

@@ -4,17 +4,12 @@
 vim.defer_fn(function()
   require('nvim-treesitter.configs').setup {
     -- Add languages to be installed here that you want installed for treesitter
-    ensure_installed = {
+    ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
-      'markdown_inline' -- Markdown has/needs(atm) 2 packages and this one isn't installed automatically
-    },
 
     -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
     auto_install = true,
 
-    highlight = {
+    highlight = { enable = true },
-      enable = true,
-      additional_vim_regex_highlighting = false,
-    },
     indent = { enable = true },
     incremental_selection = {
       enable = true,

configs/shell/profile

@@ -1,16 +1,14 @@
-#!/bin/sh
+#!/bin/bash
 
 # Keyboard lights
 [ -x "$(command -v g610-led)" ] && g610-led -a ff
 
 # Colors
-[ -x "$(command -v wal)" ] && wal -Rnq
+[ -x "$(command -v wal)" ] && wal -R
 
-export PATH
+export PATH="$PATH:$(du "$HOME/.local/bin" | cut -f2 | paste -sd ':' -)"
-PATH="$PATH:$(du "$HOME/.local/bin" | cut -f2 | paste -sd ':' -)"
+if test -d $HOME/.local/share/cargo/bin; then
-
+    export PATH=$PATH:$HOME/.local/share/cargo/bin
-if test -d "$HOME"/.local/share/cargo/bin; then
-    PATH="$PATH:$HOME/.local/share/cargo/bin"
 fi
 
 unsetopt PROMPT_SP
@@ -36,28 +34,14 @@ export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/shell/zsh"
 export FZF_DEFAULT_OPTS="--layout=reverse --height 40%"
 export LESS=-R
 export LESSOPEN="| /usr/bin/highlight -O ansi %s 2>/dev/null"
+export LESS_TERMCAP_mb="$(printf '%b' '')"
+export LESS_TERMCAP_md="$(printf '%b' '')"
+export LESS_TERMCAP_me="$(printf '%b' '')"
+export LESS_TERMCAP_se="$(printf '%b' '')"
+export LESS_TERMCAP_so="$(printf '%b' '')"
+export LESS_TERMCAP_ue="$(printf '%b' '')"
+export LESS_TERMCAP_us="$(printf '%b' '')"
 export QT_QPA_PLATFORMTHEME="gtk2"	# Have QT use gtk2 theme.
 
-export LESS_TERMCAP_mb
-LESS_TERMCAP_mb="$(printf '%b' '')"
-
-export LESS_TERMCAP_md
-LESS_TERMCAP_md="$(printf '%b' '')"
-
-export LESS_TERMCAP_me
-LESS_TERMCAP_me="$(printf '%b' '')"
-
-export LESS_TERMCAP_se
-LESS_TERMCAP_se="$(printf '%b' '')"
-
-export LESS_TERMCAP_so
-LESS_TERMCAP_so="$(printf '%b' '')"
-
-export LESS_TERMCAP_ue
-LESS_TERMCAP_ue="$(printf '%b' '')"
-
-export LESS_TERMCAP_us
-LESS_TERMCAP_us="$(printf '%b' '')"
-
 # Multithreading
 export XZ_DEFAULTS="-T 0" 

configs/shell/zsh/.zshrc

@@ -55,7 +55,7 @@ alias \
 
 ZSH_CACHE_DIR=$HOME/.cache/oh-my-zsh
 if [[ ! -d $ZSH_CACHE_DIR ]]; then
-    mkdir "$ZSH_CACHE_DIR"
+  mkdir $ZSH_CACHE_DIR
 fi
 
-source "$ZSH"/oh-my-zsh.sh
+source $ZSH/oh-my-zsh.sh

setup

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 
@@ -8,17 +8,15 @@ echo "Choose your adventure:
 1. Shell/CLI stuff only
 2. Above plus basic GUI 
 3. Above plus extras like steam, messengers (bloat)
-
+"
-Enter number[1-3]: "
+read -p "Enter number[1-3]: " input
-
-read -r  input
 
 if ! [ "$input" -eq "$input" ] 2> /dev/null; then
 
     echo "Error: Not a number"
     exit 1
 
-elif [ "$input" -lt 1 ] || [ "$input" -gt 3 ]; then
+elif [ $input -lt 1 ] || [ $input -gt 3 ]; then
 
     echo "Error: Input out of range"
     exit 1
@@ -33,7 +31,7 @@ sudo echo ''
 OS=$NAME
 
 # Check for less and install if not found
-if ! type "less" > /dev/null 2>&1; then
+if ! type "less" &> /dev/null; then
     echo "less not found, installing..."
     sudo pacman -S --noconfirm less # <<< should handle other distros here
 fi
@@ -51,36 +49,27 @@ echo ':::::::-.      ...         ...    :::::::..   .::::::.
   MMMMP"`    "YMMMMMP"   "YMMMMMP" MMMM   "W"  "YMmMY" '
 echo "Doors are sturdier than windows.
 -------------------------------------------------------"
-printf "\nSetup for %s\n" "$OS"
+echo -e "\nSetup for $OS"
 
-case "$OS" in
+if [[ $OS == *Arch* ]]; then
-    *Arch*)
     cd
         echo "Enabling Pacman colors..."
         sudo sed '/Color/s/^#//' -i /etc/pacman.conf
 
-        printf  '\nVerifying base requirements...'
+        echo -e "\nVerifying base requirements..."
         sudo pacman -S --needed --noconfirm git base-devel
 
         if test -d .doors; then
-            printf  '\n%s/.doors found, checking for updates...' "$HOME"
+            echo -e "\n$HOME/.doors found, checking for updates..."
             cd .doors
             git pull
             cd
         else
-            printf  '\n%s/.doors not found, creating...' "$HOME"
+            echo -e "\n$HOME/.doors not found, creating..."
             git clone https://github.com/adoyle0/Doors.git .doors
         fi
 
-        "$HOME"/.doors/scripts/install_arch "$input"
+        $HOME/.doors/scripts/install_arch $input
-        ;;
-    *)
-    echo "$OS is not supported by this script at this time."
-    exit 1
-    ;;
-esac
-
-# Add "Arch ARM"
 
 # These are broken for now
 # elif [[ $OS == *buntu* ]]; then
@@ -95,29 +84,34 @@ esac
 #         git clone https://github.com/adoyle0/Doors.git .doors
 #         $HOME/.doors/scripts/install_min_fedora
 
+else
+    echo "$OS is not supported by this script at this time."
+    exit 1
+fi
+
 # Init and update awesome widgets submodule
-cd "$HOME"/.doors &&
+cd $HOME/.doors &&
 git submodule init && git submodule update
 
 # Copy and link files
-cd "$HOME"/.doors &&
+cd $HOME/.doors &&
-"$HOME"/.doors/scripts/copy_and_link "$input"
+$HOME/.doors/scripts/copy_and_link $input
 
 # Copy default wallpaper
-if ! test -d "$HOME"/Pictures; then
+if ! test -d $HOME/Pictures; then
-    mkdir "$HOME"/Pictures
+    mkdir $HOME/Pictures
-    if ! test -d "$HOME"/Pictures/Wallpapers; then
+    if ! test -d $HOME/Pictures/Wallpapers; then
-        mkdir "$HOME"/Pictures/Wallpapers
+        mkdir $HOME/Pictures/Wallpapers
     fi
 
-    if ! test -f "$HOME"/Pictures/Wallpapers/door2.jpg; then
+    if ! test -f $HOME/Pictures/Wallpapers/door2.jpg; then
-        curl -o "$HOME"/Pictures/Wallpapers/door2.jpg https://old.doordesk.net/door2.jpg
+        curl -o $HOME/Pictures/Wallpapers/door2.jpg https://old.doordesk.net/door2.jpg
-        "$HOME"/.local/bin/doorsbg
+        $HOME/.local/bin/doorsbg
     fi
 fi
 
 # Wrap up
-printf "\nDone!\nLog out and back in for changes to take effect."
+echo -e "\nDone!\nLog out and back in for changes to take effect."
 
 # Give less time to catch up and tell it we're done
 sleep 1 && killall -s SIGINT less