Updated DotFiles

2024-11-28 10:18:46 -05:00 · 2023-01-16 17:52:07 +00:00 · 2023-01-16 17:52:07 +00:00 · aef9e91a57
commit aef9e91a57
parent 77b3971086
27 changed files with 269 additions and 137 deletions
--- a/btop/.config/btop/btop.conf
+++ b/btop/.config/btop/btop.conf
@ -1,4 +1,4 @@
-#? Config file for btop v. 1.2.12
+#? Config file for btop v. 1.2.13

 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
 #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
@ -16,7 +16,7 @@ force_tty = False

 #* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets.
 #* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box.
-#* Use withespace " " as separator between different presets.
+#* Use whitespace " " as separator between different presets.
 #* Example: "cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty"
 presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty"

@ -47,7 +47,7 @@ graph_symbol_net = "default"
 graph_symbol_proc = "default"

 #* Manually set which boxes to show. Available values are "cpu mem net proc", separate values with whitespace.
-shown_boxes = "net cpu mem proc"
+shown_boxes = "cpu mem net"

 #* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
 update_ms = 2000
--- a/ckb-next/.config/ckb-next/ckb-next.conf
+++ b/ckb-next/.config/ckb-next/ckb-next.conf
@ -197,7 +197,7 @@
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\Keys\y=#ffffff
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\Keys\z=#ffffff
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Lighting\UseRealNames=true
-0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Modified=585c8586
+0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Modified=df90c6c0
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Name=Rainbow
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Performance\AngleSnap=false
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\0\Performance\DPI\0=@Point(400 400)
@ -425,7 +425,7 @@
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Lighting\Keys\y=#ff0000
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Lighting\Keys\z=#ff0000
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Lighting\UseRealNames=true
-0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Modified=5afc4a5
+0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Modified=b2bd76c7
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Name=Breathing
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Performance\AngleSnap=false
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\1\Performance\DPI\0=@Point(400 400)
@ -675,7 +675,7 @@
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\Keys\y=#aa00ff
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\Keys\z=#aa00ff
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Lighting\UseRealNames=true
-0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Modified=156302a5
+0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Modified=6e6d8bc3
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Name=Trippy
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Performance\AngleSnap=false
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\2\Performance\DPI\0=@Point(400 400)
@ -733,7 +733,7 @@
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\CurrentMode={51EB6E3A-27A0-4AD6-A35C-6B67E0329A3D}
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\HwModified=7ffd
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\ModeCount=3
-0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\Modified=6c382f5a
+0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\Modified=33b04fba
 0E029022AF4C18835CBDCC7EF5001BC3\%7B5B1E2E81-ED4F-4F79-9EB5-F8ACA67D1BF0%7D\Name=Multi
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Binding\KeyMap=K68 GB
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Binding\UseRealNames=true
@ -929,7 +929,7 @@
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Lighting\Keys\y=#ffffff
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Lighting\Keys\z=#ffffff
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Lighting\UseRealNames=true
-0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Modified=ea77ab97
+0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Modified=8107766b
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Name=Rainbow
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Performance\AngleSnap=false
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\0\Performance\DPI\0=@Point(400 400)
@ -1157,7 +1157,7 @@
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Lighting\Keys\y=#ff0000
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Lighting\Keys\z=#ff0000
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Lighting\UseRealNames=true
-0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Modified=3c4363fb
+0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Modified=6d7231e5
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Name=Breathing
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Performance\AngleSnap=false
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\1\Performance\DPI\0=@Point(400 400)
@ -1407,7 +1407,7 @@
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Lighting\Keys\y=#aa00ff
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Lighting\Keys\z=#aa00ff
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Lighting\UseRealNames=true
-0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Modified=66ce12b7
+0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Modified=6878b687
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Name=Trippy
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Performance\AngleSnap=false
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\2\Performance\DPI\0=@Point(400 400)
@ -1465,7 +1465,7 @@
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\CurrentMode={11C11AE3-3195-4DFC-B8AC-2FEA703414E5}
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\HwModified=40b6f054
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\ModeCount=3
-0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\Modified=ae89ede4
+0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\Modified=c6e64f8c
 0E029022AF4C18835CBDCC7EF5001BC3\%7BBA7FC152-2D51-4C26-A7A6-A036CC93D924%7D\Name=Demo

 [Popups]
--- a/dconf/.config/dconf/user
+++ b/dconf/.config/dconf/user
--- a/fish/.config/fish/conf.d/00_profile.fish
+++ b/fish/.config/fish/conf.d/00_profile.fish
@ -4,11 +4,11 @@ setxkbmap -layout gb
 setxkbmap -option caps:super

 set -gx LC_ALL "en_GB.UTF-8"
-set -gx PAGER "more"
-set -gx AUR_PAGER "more"
-set -gx EDITOR "vim"
+set -gx PAGER more
+set -gx AUR_PAGER more
+set -gx EDITOR vim
 #QT and GTK Variables
-set -gx QT_QPA_PLATFORMTHEME "qt5ct"
+set -gx QT_QPA_PLATFORMTHEME qt5ct
 set -gx QT_AUTO_SCREEN_SCALE_FACTOR 0
 set -gx TDESKTOP_USE_GTK_FILE_DIALOG 1

--- a/fish/.config/fish/conf.d/02_paths.fish
+++ b/fish/.config/fish/conf.d/02_paths.fish
@ -6,6 +6,13 @@ if test -d "$HOME/.config/composer/vendor/bin"
    set PATH "$HOME/.config/composer/vendor/bin:$PATH"
 end

+# Adds `~/.local/share/gem/ruby/3.0.0/bin` to $PATH
+# set PATH so it includes user's private bin if it exists
+if test -d "$HOME/.local/share/gem/ruby/3.0.0/bin"
+    set GEM_HOME "$HOME/.local/share/gem/ruby/3.0.0"
+    set PATH "$HOME/.local/share/gem/ruby/3.0.0/bin:$PATH"
+end
+
 # Adds `~/.cargo/bin` to $PATH
 # set PATH so it includes user's private bin if it exists
 if test -d "$HOME/.cargo/bin"
--- a/fish/.config/fish/functions/99_git.fish
+++ b/fish/.config/fish/functions/99_git.fish
@ -83,6 +83,16 @@ function greset
    git reset -- $argv
 end

+function gbackup
+    git reset --soft HEAD~1
+end
+
+function gcleanup
+    git fetch --prune --prune-tags origin
+    git remote prune origin
+    git pull
+end
+
 function gshow
    git show $argv
 end
--- a/fish/.config/fish/plugins/__fish_command_not_found.fish
+++ b/fish/.config/fish/plugins/__fish_command_not_found.fish
@ -12,16 +12,16 @@ function fish_command_not_found
        # Pacman only prints the path, so we still need to print the error.
        pacman -F $paths

-        while true
-            read -l -P "Would you like to install $pkgs[1]? [Y/n] " confirm
+        # while true
+        #     read -l -P "Would you like to install $pkgs[1]? [Y/n] " confirm

-            switch $confirm
-                case Y y
-                    pacman -S $pkgs[1]
-                    return
-                case N n
-                    return
-            end
-        end
+        #     switch $confirm
+        #         case Y y
+        #             pacman -S $pkgs[1]
+        #             return
+        #         case N n
+        #             return
+        #     end
+        # end
    end
 end
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@ -139,7 +139,7 @@ $super_b+m \

 ## Category: Menus;
 # Description: Start Music Menu;
-$super_b+F6 \
+$super_b+F4 \
    $exe music

 ## Category: Menus;
@ -149,7 +149,7 @@ $super_b+p \

 ## Category: Menus;
 # Description: Start Youtube Menu;
-$super_b+s \
+$super_b+F5 \
    $exe youtube_subs

 # }}} Menus
@ -409,7 +409,7 @@ font pango:Noto Mono Regular 13
 assign [class="(?i)Alacritty|Kitty"]                                            → $ws1

 # Workspace $ws2
-assign [class="(?i)Emacs|Jetbrains"]                                            → $ws2
+assign [class="(?i)Emacs"]                                                      → $ws2
 assign [class="(?i)Code|Nvim"]                                               	→ $ws2

 # Workspace $ws3
@ -442,6 +442,7 @@ assign [class="(?i)Virt*|LazyGit"]
 assign [class="(?i)Dconf-editor|Piper*"]                                        → $ws0
 assign [class="(?i)Actions|Btop"]                                               → $ws0
 assign [class="(?i)PkgBrowser"]                                                 → $ws0
+assign [class="(?i)Jetbrains"]                                                  → $ws0

 # }}} Assign Applications

@ -642,9 +643,8 @@ for_window [class="(?i)PassMenu"] floating enable, resize set 350 700, move posi
 for_window [class="(?i)MusicMenu"] floating enable, resize set 550 500, move position center
 for_window [class="(?i)YoutubeMenu"] floating enable, resize set 700 750, move position center

-for_window [title="Copying"] floating enable
-for_window [title="Deleting"] floating enable
-for_window [title="Moving"] floating enable
+for_window [title="(?i)Copying|Deleting|Moving"] floating enable, move position center
+for_window [window_role="(?i)Organizer|Floating"] floating enable, resize set 640 480, move position center

 # fullscreen enabled from some programs - find with xprop

--- a/i3/.config/i3/config.d/005_autoload_programs_on_login.conf
+++ b/i3/.config/i3/config.d/005_autoload_programs_on_login.conf
@ -2,3 +2,4 @@ $exe $TerminalEmulator
 $exe $FileManager
 $exe $TextEditor
 $exe $WebBrowserF
+$exe 'studio'
--- a/localbin/.local/bin/autostart
+++ b/localbin/.local/bin/autostart
@ -12,7 +12,7 @@
 #Created:
 #   Mon 22 November 2021, 03:15:54 PM [GMT+1]
 #Modified:
-#   Thu 17 November 2022, 03:44:58 PM [GMT]
+#   Mon 16 January 2023, 05:16:24 PM [GMT]
 #
 #Description:
 #   <Todo>
@ -187,27 +187,29 @@ fi
 ## Auto Lock ##
 ###############

-if command -v xidlehook &>/dev/null; then
+if command -v xautolock &>/dev/null; then
    # shellcheck disable=SC2155
-    export PRIMARY_DISPLAY="$(xrandr | awk '/ primary/{print $1}')"
-    if ! pgrep -x "xidlehook" >/dev/null; then
+    if ! pgrep -x "xautolock" >/dev/null; then
        (
            sleep 2s
-            xidlehook \
-                --not-when-fullscreen \
-                --not-when-audio \
-                --timer 300 \
-                "xrandr --output $PRIMARY_DISPLAY --brightness .1" \
-                "xrandr --output $PRIMARY_DISPLAY --brightness 1" \
-                --timer 30 \
-                "xrandr --output $PRIMARY_DISPLAY --brightness 1; multimonitorlock -l -- --time-str=%I:%M:%S %p" \
-                "" \
-                --timer 3600 \
-                "systemctl suspend" \
-                ""
+            xautolock \
+                -time 15 -locker "multimonitorlock -l -- --time-str=%I:%M:%S %p" \
+                -detectsleep
        ) &
    else
-        echo "xidlehook already Running"
+        echo "xautolock already Running"
+    fi
+fi
+
+if command -v xss-lock &>/dev/null; then
+    # shellcheck disable=SC2155
+    if ! pgrep -x "xss-lock" >/dev/null; then
+        (
+            sleep 2s
+            xss-lock -- multimonitorlock -l -- --time-str="%I:%M:%S %p"
+        ) &
+    else
+        echo "xautolock already Running"
    fi
 fi

--- a/nemo/.config/nemo-compare.conf
+++ b/nemo/.config/nemo-compare.conf
@ -5,8 +5,8 @@ diff_engine_path_multi =
 defined_comparators = meld

 [Settings]
-diff_engine_path = 
-diff_engine_path_3way = 
-diff_engine_path_multi = 
-defined_comparators = 
+diff_engine_path = meld
+diff_engine_path_3way = meld
+diff_engine_path_multi = meld
+defined_comparators = meld

--- a/nemo/.config/nemo/desktop-metadata
+++ b/nemo/.config/nemo/desktop-metadata
@ -0,0 +1,4 @@
+[desktop-monitor-0]
+nemo-icon-view-keep-aligned=true
+nemo-icon-view-auto-layout=true
+nemo-icon-view-layout-timestamp=1673798224
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@ -22,3 +22,13 @@ require "user.whichkey"
 require "user.autocommands"
 require "user.header"
 require "user.trim"
+
+
+if is_bootstrap then
+    print '=================================='
+    print '    Plugins are being installed'
+    print '    Wait until Packer completes,'
+    print '       then restart nvim'
+    print '=================================='
+    return
+end
--- a/nvim/.config/nvim/lua/user/commands.lua
+++ b/nvim/.config/nvim/lua/user/commands.lua
@ -1 +1,4 @@
-vim.api.nvim_create_user_command("EditConfiguration", function() require("core.functions").edit_config() end, {})
+vim.api.nvim_create_user_command("EditConfiguration",
+function()
+    require("core.functions").edit_config()
+end, {})
--- a/nvim/.config/nvim/lua/user/lsp/configs.lua
+++ b/nvim/.config/nvim/lua/user/lsp/configs.lua
@ -1,24 +1,54 @@
-local status_ok, lsp_installer = pcall(require, "nvim-lsp-installer")
+local status_ok, lsp_installer = pcall(require, "mason-lspconfig")
 if not status_ok then
 	return
 end

-local lspconfig = require("lspconfig")
+-- Setup mason so it can manage external tooling
+require('mason').setup()

-local servers = { "jsonls", "sumneko_lua" }
+-- Enable the following language servers
+-- Feel free to add/remove any LSPs that you want here. They will automatically be installed
+local servers = { 'clangd', 'rust_analyzer', 'pyright', 'tsserver', 'sumneko_lua', 'gopls' }

-lsp_installer.setup({
-	ensure_installed = servers,
-})
+-- Ensure the servers above are installed
+require('mason-lspconfig').setup {
+  ensure_installed = servers,
+}

-for _, server in pairs(servers) do
-	local opts = {
-		on_attach = require("user.lsp.handlers").on_attach,
-		capabilities = require("user.lsp.handlers").capabilities,
-	}
-	local has_custom_opts, server_custom_opts = pcall(require, "user.lsp.settings." .. server)
-	if has_custom_opts then
-		opts = vim.tbl_deep_extend("force", opts, server_custom_opts)
-	end
-	lspconfig[server].setup(opts)
+-- nvim-cmp supports additional completion capabilities
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
+
+for _, lsp in ipairs(servers) do
+  require('lspconfig')[lsp].setup {
+    on_attach = on_attach,
+    capabilities = capabilities,
+  }
 end
+
+require('fidget').setup()
+
+local runtime_path = vim.split(package.path, ';')
+table.insert(runtime_path, 'lua/?.lua')
+table.insert(runtime_path, 'lua/?/init.lua')
+
+require('lspconfig').sumneko_lua.setup {
+  on_attach = on_attach,
+  capabilities = capabilities,
+  settings = {
+    Lua = {
+      runtime = {
+        -- Tell the language server which version of Lua you're using (most likely LuaJIT)
+        version = 'LuaJIT',
+        -- Setup your lua path
+        path = runtime_path,
+      },
+      diagnostics = {
+        globals = { 'vim' },
+      },
+      workspace = { library = vim.api.nvim_get_runtime_file('', true) },
+      -- Do not send telemetry data containing a randomized but unique identifier
+      telemetry = { enable = false },
+    },
+  },
+}
--- a/nvim/.config/nvim/lua/user/nvim-tree.lua
+++ b/nvim/.config/nvim/lua/user/nvim-tree.lua
@ -55,7 +55,6 @@ nvim_tree.setup({
 	},
 	view = {
 		width = 40,
-		height = 30,
 		side = "left",
 		mappings = {
 			list = {
--- a/nvim/.config/nvim/lua/user/plugins.lua
+++ b/nvim/.config/nvim/lua/user/plugins.lua
@ -1,18 +1,12 @@
 local fn = vim.fn

-- Automatically install packer
-local install_path = fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
-if fn.empty(fn.glob(install_path)) > 0 then
-	PACKER_BOOTSTRAP = fn.system({
-		"git",
-		"clone",
-		"--depth",
-		"1",
-		"https://github.com/wbthomason/packer.nvim",
-		install_path,
-	})
-	print("Installing packer close and reopen Neovim...")
-	vim.cmd([[packadd packer.nvim]])
+-- Install packer
+local install_path = vim.fn.stdpath 'data' .. '/site/pack/packer/start/packer.nvim'
+local is_bootstrap = false
+if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
+  is_bootstrap = true
+  vim.fn.execute('!git clone https://github.com/wbthomason/packer.nvim ' .. install_path)
+  vim.cmd [[packadd packer.nvim]]
 end

 -- Autocommand that reloads neovim whenever you save the plugins.lua file
@ -45,7 +39,6 @@ return packer.startup(function(use)
 	-- My plugins here

 	use({ "wbthomason/packer.nvim" }) -- Have packer manage itself
-	use({ "nvim-lua/plenary.nvim" }) -- Useful lua functions used by lots of plugins
 	use({ "windwp/nvim-autopairs" }) -- Autopairs, integrates with both cmp and treesitter
 	use({ "numToStr/Comment.nvim" })
 	use({ "JoosepAlviste/nvim-ts-context-commentstring" })
@ -65,38 +58,66 @@ return packer.startup(function(use)
 	use({ "folke/tokyonight.nvim" })
 	use({ "Minimal-Mistakes/minimalmistakes-nvim" })

-	-- cmp plugins
-	use({ "hrsh7th/nvim-cmp" }) -- The completion plugin
-	use({ "hrsh7th/cmp-buffer" }) -- buffer completions
-	use({ "hrsh7th/cmp-cmdline" }) -- cmdline completions
-	use({ "hrsh7th/cmp-path" }) -- path completions
-	use({ "saadparwaiz1/cmp_luasnip" }) -- snippet completions
-	use({ "hrsh7th/cmp-nvim-lsp" })
-	use({ "hrsh7th/cmp-nvim-lua" })
-
-	-- snippets
-	use({ "L3MON4D3/LuaSnip" }) -- snippet engine
-	use({ "rafamadriz/friendly-snippets" }) -- a bunch of snippets to use
+	-- CMP plugins
+	use { -- Autocompletion
+    'hrsh7th/nvim-cmp',
+    requires = {
+        'hrsh7th/cmp-buffer', -- buffer completions
+        'hrsh7th/cmp-cmdline', -- cmdline completions
+        'hrsh7th/cmp-path', -- path completions
+        'hrsh7th/cmp-nvim-lsp',
+        'hrsh7th/cmp-nvim-lua',
+        'L3MON4D3/LuaSnip', -- snippet engine
+        'rafamadriz/friendly-snippets', -- a bunch of snippets to use
+        'saadparwaiz1/cmp_luasnip'
+    },
+  }

 	-- LSP
-	use({ "neovim/nvim-lspconfig" }) -- enable LSP
-	use({ "williamboman/nvim-lsp-installer" }) -- simple to use language server installer
+	use({ -- LSP Configuration & Plugins
+        "neovim/nvim-lspconfig",
+        requires = {
+        -- Automatically install LSPs to stdpath for neovim
+        'williamboman/mason.nvim',
+        'williamboman/mason-lspconfig.nvim',
+
+        -- Useful status updates for LSP
+        'j-hui/fidget.nvim',
+        },
+    }) -- enable LSP
 	use({ "jose-elias-alvarez/null-ls.nvim" }) -- for formatters and linters

-	-- Telescope
-	use({ "nvim-telescope/telescope.nvim" })
+	-- Telescope Fuzzy Finder (files, lsp, etc)
+	use({ "nvim-telescope/telescope.nvim",
+        requires = {
+        'nvim-lua/plenary.nvim' }
+    })
+
+    -- Fuzzy Finder Algorithm which requires local dependencies to be built. Only load if `make` is available
+    use { 'nvim-telescope/telescope-fzf-native.nvim', run = 'make', cond = vim.fn.executable 'make' == 1 }

 	-- Treesitter
-	use({ "nvim-treesitter/nvim-treesitter" })
+	use { -- Highlight, edit, and navigate code
+        'nvim-treesitter/nvim-treesitter',
+        run = function()
+        pcall(require('nvim-treesitter.install').update { with_sync = true })
+        end,
+    }
+
+    use { -- Additional text objects via treesitter
+        'nvim-treesitter/nvim-treesitter-textobjects',
+        after = 'nvim-treesitter',
+    }

 	-- Git
+    use({ "tpope/vim-fugitive" })
+    use({ "tpope/vim-rhubarb" })
 	use({ "lewis6991/gitsigns.nvim" })

 	-- Custom
 	use({ "wesleimp/stylua.nvim" })
 	use({ "cappyzawa/trim.nvim" })
 	use({ "ap/vim-css-color" })
-	use({ "tpope/vim-fugitive" })
 	use({ "airblade/vim-gitgutter" })
 	use({ "ctrlpvim/ctrlp.vim" })
 	use({ "lyuts/vim-rtags" })
@ -106,10 +127,13 @@ return packer.startup(function(use)
 	use({ "The-Repo-Club/Vim_Keys" })
 	use({ "Thyrum/vim-stabs" })
 	use({ "mbbill/undotree" })
+    use({ "tpope/vim-sleuth" }) -- Detect tabstop and shiftwidth automatically

-	-- Automatically set up your configuration after cloning packer.nvim
-	-- Put this at the end after all plugins
-	if PACKER_BOOTSTRAP then
-		require("packer").sync()
-	end
+    -- When we are bootstrapping a configuration, it doesn't
+    -- make sense to execute the rest of the init.lua.
+
+    -- You'll need to restart nvim, and then it will work.
+    if is_bootstrap then
+        require("packer").sync()
+    end
 end)
--- a/nvim/.config/nvim/plugin/packer_compiled.lua
+++ b/nvim/.config/nvim/plugin/packer_compiled.lua
@ -134,6 +134,11 @@ _G.packer_plugins = {
    path = "/home/repo/.local/share/nvim/site/pack/packer/start/ctrlp.vim",
    url = "https://github.com/ctrlpvim/ctrlp.vim"
  },
+  ["fidget.nvim"] = {
+    loaded = true,
+    path = "/home/repo/.local/share/nvim/site/pack/packer/start/fidget.nvim",
+    url = "https://github.com/j-hui/fidget.nvim"
+  },
  ["friendly-snippets"] = {
    loaded = true,
    path = "/home/repo/.local/share/nvim/site/pack/packer/start/friendly-snippets",
@ -169,6 +174,16 @@ _G.packer_plugins = {
    path = "/home/repo/.local/share/nvim/site/pack/packer/start/lualine.nvim",
    url = "https://github.com/nvim-lualine/lualine.nvim"
  },
+  ["mason-lspconfig.nvim"] = {
+    loaded = true,
+    path = "/home/repo/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
+    url = "https://github.com/williamboman/mason-lspconfig.nvim"
+  },
+  ["mason.nvim"] = {
+    loaded = true,
+    path = "/home/repo/.local/share/nvim/site/pack/packer/start/mason.nvim",
+    url = "https://github.com/williamboman/mason.nvim"
+  },
  ["minimalmistakes-nvim"] = {
    loaded = true,
    path = "/home/repo/.local/share/nvim/site/pack/packer/start/minimalmistakes-nvim",
@ -189,11 +204,6 @@ _G.packer_plugins = {
    path = "/home/repo/.local/share/nvim/site/pack/packer/start/nvim-cmp",
    url = "https://github.com/hrsh7th/nvim-cmp"
  },
-  ["nvim-lsp-installer"] = {
-    loaded = true,
-    path = "/home/repo/.local/share/nvim/site/pack/packer/start/nvim-lsp-installer",
-    url = "https://github.com/williamboman/nvim-lsp-installer"
-  },
  ["nvim-lspconfig"] = {
    loaded = true,
    path = "/home/repo/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
@ -209,6 +219,13 @@ _G.packer_plugins = {
    path = "/home/repo/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
    url = "https://github.com/nvim-treesitter/nvim-treesitter"
  },
+  ["nvim-treesitter-textobjects"] = {
+    load_after = {},
+    loaded = true,
+    needs_bufread = false,
+    path = "/home/repo/.local/share/nvim/site/pack/packer/opt/nvim-treesitter-textobjects",
+    url = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects"
+  },
  ["nvim-ts-context-commentstring"] = {
    loaded = true,
    path = "/home/repo/.local/share/nvim/site/pack/packer/start/nvim-ts-context-commentstring",
@ -239,6 +256,14 @@ _G.packer_plugins = {
    path = "/home/repo/.local/share/nvim/site/pack/packer/start/stylua.nvim",
    url = "https://github.com/wesleimp/stylua.nvim"
  },
+  ["telescope-fzf-native.nvim"] = {
+    cond = { true },
+    loaded = false,
+    needs_bufread = false,
+    only_cond = true,
+    path = "/home/repo/.local/share/nvim/site/pack/packer/opt/telescope-fzf-native.nvim",
+    url = "https://github.com/nvim-telescope/telescope-fzf-native.nvim"
+  },
  ["telescope.nvim"] = {
    loaded = true,
    path = "/home/repo/.local/share/nvim/site/pack/packer/start/telescope.nvim",
@ -284,11 +309,21 @@ _G.packer_plugins = {
    path = "/home/repo/.local/share/nvim/site/pack/packer/start/vim-gitgutter",
    url = "https://github.com/airblade/vim-gitgutter"
  },
+  ["vim-rhubarb"] = {
+    loaded = true,
+    path = "/home/repo/.local/share/nvim/site/pack/packer/start/vim-rhubarb",
+    url = "https://github.com/tpope/vim-rhubarb"
+  },
  ["vim-rtags"] = {
    loaded = true,
    path = "/home/repo/.local/share/nvim/site/pack/packer/start/vim-rtags",
    url = "https://github.com/lyuts/vim-rtags"
  },
+  ["vim-sleuth"] = {
+    loaded = true,
+    path = "/home/repo/.local/share/nvim/site/pack/packer/start/vim-sleuth",
+    url = "https://github.com/tpope/vim-sleuth"
+  },
  ["vim-stabs"] = {
    loaded = true,
    path = "/home/repo/.local/share/nvim/site/pack/packer/start/vim-stabs",
@ -307,6 +342,15 @@ _G.packer_plugins = {
 }

 time([[Defining packer_plugins]], false)
+-- Conditional loads
+time([[Conditional loading of telescope-fzf-native.nvim]], true)
+  require("packer.load")({"telescope-fzf-native.nvim"}, {}, _G.packer_plugins)
+time([[Conditional loading of telescope-fzf-native.nvim]], false)
+-- Load plugins in order defined by `after`
+time([[Sequenced loading]], true)
+vim.cmd [[ packadd nvim-treesitter ]]
+vim.cmd [[ packadd nvim-treesitter-textobjects ]]
+time([[Sequenced loading]], false)

 _G._packer.inside_compile = false
 if _G._packer.needs_bufread == true then
--- a/package-list/.config/package-list
+++ b/package-list/.config/package-list
@ -1,6 +1,7 @@
 aic94xx-firmware
 ansiweather
 anymeal
+ast-firmware
 aura
 auracle
 aurutils
@ -83,7 +84,6 @@ upd72020x-fw
 w3m-imgcat
 wd719x-firmware
 win-shot
-xidlehook
 xmenu
 xroot
 xtitle
--- a/pkgbrowser/.config/pkgbrowser/pkgbrowser.conf
+++ b/pkgbrowser/.config/pkgbrowser/pkgbrowser.conf
@ -12,6 +12,6 @@ strings=pkgbrowser, ly, zap, i3-gaps, microsoft edge, python3, python, pamac, on

 [window]
 central-splitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\x1\0\0\0\x1>\0\xff\xff\xff\xff\x1\0\0\0\x1\0)
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\vB\0\0\0 \0\0\xe\xf9\0\0\x4\x17\0\0\vC\0\0\0!\0\0\xe\xf8\0\0\x4\x16\0\0\0\x1\0\0\0\0\a\x80\0\0\vC\0\0\0!\0\0\xe\xf8\0\0\x4\x16)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\vB\0\0\0!\0\0\xe\xf8\0\0\x4\x16\0\0\vC\0\0\0\"\0\0\xe\xf7\0\0\x4\x15\0\0\0\x1\0\0\0\0\a\x80\0\0\vC\0\0\0\"\0\0\xe\xf7\0\0\x4\x15)
 left-splitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xc0\0\0\x1\f\0\xff\xff\xff\xff\x1\0\0\0\x2\0)
 right-splitter=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0\xc0\0\0\0\xee\0\xff\xff\xff\xff\x1\0\0\0\x2\0)
--- a/polybar/.config/polybar/monitor_0/config_bottom.ini
+++ b/polybar/.config/polybar/monitor_0/config_bottom.ini
@ -141,7 +141,7 @@ font-1 = "Wuncon Siji:antialias=true:size=12;2"
 font-2 = "Hack Nerd Font Mono:antialias=true:size=12;2"
 font-3 = "MaterialIcons:antialias=true:size=12;2"
 font-4 = "xos4 Terminus:antialias=true:size=12;2"
-font-5 = "Noto Sans CJK JP:antialias=true:size=12;2"
+font-5 = "Noto Sans CJK JP:antialias=true:size=7;2"
 font-6 = "FiraCode Nerd Font Mono:antialias=true:size=18;2"

 ; Modules are added to one of the available blocks
--- a/polybar/.config/polybar/monitor_0/config_top.ini
+++ b/polybar/.config/polybar/monitor_0/config_top.ini
@ -141,7 +141,7 @@ font-1 = "Wuncon Siji:antialias=true:size=12;2"
 font-2 = "Hack Nerd Font Mono:antialias=true:size=12;2"
 font-3 = "MaterialIcons:antialias=true:size=12;2"
 font-4 = "xos4 Terminus:antialias=true:size=12;2"
-font-5 = "Noto Sans CJK JP:antialias=true:size=12;2"
+font-5 = "Noto Sans CJK JP:antialias=true:size=7;2"
 font-6 = "FiraCode Nerd Font Mono:antialias=true:size=18;2"

 ; Modules are added to one of the available blocks
--- a/polybar/.config/polybar/monitor_1/config_bottom.ini
+++ b/polybar/.config/polybar/monitor_1/config_bottom.ini
@ -141,7 +141,7 @@ font-1 = "Wuncon Siji:antialias=true:size=12;2"
 font-2 = "Hack Nerd Font Mono:antialias=true:size=12;2"
 font-3 = "MaterialIcons:antialias=true:size=12;2"
 font-4 = "xos4 Terminus:antialias=true:size=12;2"
-font-5 = "Noto Sans CJK JP:antialias=true:size=12;2"
+font-5 = "Noto Sans CJK JP:antialias=true:size=7;2"
 font-6 = "FiraCode Nerd Font Mono:antialias=true:size=18;2"

 ; Modules are added to one of the available blocks
--- a/polybar/.config/polybar/monitor_1/config_top.ini
+++ b/polybar/.config/polybar/monitor_1/config_top.ini
@ -141,7 +141,7 @@ font-1 = "Wuncon Siji:antialias=true:size=12;2"
 font-2 = "Hack Nerd Font Mono:antialias=true:size=12;2"
 font-3 = "MaterialIcons:antialias=true:size=12;2"
 font-4 = "xos4 Terminus:antialias=true:size=12;2"
-font-5 = "Noto Sans CJK JP:antialias=true:size=12;2"
+font-5 = "Noto Sans CJK JP:antialias=true:size=7;2"
 font-6 = "FiraCode Nerd Font Mono:antialias=true:size=18;2"

 ; Modules are added to one of the available blocks
--- a/rofi/.local/bin/rofi/music
+++ b/rofi/.local/bin/rofi/music
@ -3,7 +3,7 @@
 # Auto updated?
 #   Yes
 #File :
-#   repomenue_music
+#   music
 #Author:
 #   The-Repo-Club [wayne6324@gmail.com]
 #Github:
@ -12,15 +12,16 @@
 # Created:
 #   Wed 10 March 2021, 12:34:47 PM [GMT]
 # Modified:
-#   Wed 07 December 2022, 11:01:08 PM [GMT]
+#   Mon 16 January 2023, 05:51:30 PM [GMT]
 #
 # Description:
 #   <Todo>
 #
 # shellcheck disable=all

-MUSICPLAYER="ffplay -nodisp"
-PLAYING_MSG="           Currently Playing :: "
+MUSICPLAYER="mplayer"
+CURRENT_SONG=$(lsof -c "$MUSICPLAYER" | grep -F ".mp3" | awk -F"/" '{ print $NF; }' | cut -d'.' -f1)
+PLAYING_MSG="Currently Playing :: ${CURRENT_SONG}"

 for Song in "$HOME/Music/"*; do
    if [ -f "$Song" ]; then
@ -43,6 +44,7 @@ if [[ $ret -eq 0 ]]; then
    case $CHOICE in
        *.mp3 | *.flac | *.wav | *.ogg)
            folder=$HOME/Music
+            pkill "$MUSICPLAYER"
            $MUSICPLAYER "$folder/$CHOICE" &
            ;;
        *)
@ -51,11 +53,6 @@ if [[ $ret -eq 0 ]]; then
    esac
 elif [[ $ret -gt 1 ]]; then
    if [[ $ret -eq 10 ]]; then
-        echo "Option selected (stdout): $CHOICE"
-        echo "Return code: $ret"
-    elif [[ $ret -eq 11 ]]; then
-        echo "Option selected (stdout): $CHOICE"
-        echo "Return code: $ret"
+        pkill "$MUSICPLAYER"
    fi
-    exit $ret
 fi
--- a/rofi/.local/bin/rofi/powermenu
+++ b/rofi/.local/bin/rofi/powermenu
@ -12,7 +12,7 @@
 #Created:
 #   Wed 07 December 2022, 11:01:52 PM [GMT]
 #Modified:
-#   Wed 07 December 2022, 11:02:38 PM [GMT]
+#   Mon 16 January 2023, 05:21:19 PM [GMT]
 #
 #Description:
 # This script defines just a mode for rofi instead of being a self-contained
@ -62,7 +62,7 @@ icons[shutdown]="\uf011"
 icons[cancel]="\u00d7"

 declare -A actions
-actions[lockscreen]="multimonitorlock -l -- --time-str=\"%I:%M:%S %p\""
+actions[lockscreen]="loginctl lock-session"
 actions[logout]="pkill -KILL -u ${USER}"
 actions[suspend]="systemctl suspend"
 actions[hibernate]="systemctl hibernate"
@ -243,7 +243,7 @@ if [ -z "${selection+x}" ]
 then
    getuptime
    echo -e "\0prompt\x1fPower Menu"
-    echo -en "\0message\x1f\tUptime :: ${state^}\n"
+    echo -en "\0message\x1fUptime :: ${state^}\n"
    for entry in "${show[@]}"
    do
        echo -e "${messages[$entry]}\0icon\x1f${icons[$entry]}"
--- a/rofi/.local/bin/rofi/wifimanager
+++ b/rofi/.local/bin/rofi/wifimanager
@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #-*-coding:utf-8 -*-
 #Auto updated?
 #   Yes
@ -12,7 +12,7 @@
 #Created:
 #   Wed 07 December 2022, 11:01:26 PM [GMT]
 #Modified:
-#   Wed 07 December 2022, 11:01:44 PM [GMT]
+#   Mon 16 January 2023, 05:33:28 PM [GMT]
 #
 #Description:
 #   <Todo>
@ -46,6 +46,7 @@ function network_options() {
 		if [ -z "$connection" ]; then
 			echo "-=|> Connect to a Network"
            echo "-=|> Connect to a Hidden Network"
+            connection="N/A"
 		elif [ ! -z "$connection" ]; then
 			echo "-=|> Connect to a Network"
            echo "-=|> Connect to a Hidden Network"
@ -62,7 +63,7 @@ function main_scrn() { # Main window to be displayed on start
 	network_status
    network_options
    echo -en "\x00prompt\x1fWifi\n"
-    echo -en "\0message\x1f\tWIFI Status :: ${state^}\t\tConnected to :: ${connection}\n"
+    echo -en "\0message\x1fWIFI Status :: ${state^}\t\tConnected to :: ${connection}\n"
 	echo -en "-=|> Delete existing connections\n"
 	echo -en "-=|> Refresh\n"
 }