diff --git a/.config/nvim/lua/custom/config/lualine.lua b/.config/nvim/lua/custom/config/lualine.lua
index ce581c4..53cd7fe 100644
--- a/.config/nvim/lua/custom/config/lualine.lua
+++ b/.config/nvim/lua/custom/config/lualine.lua
@@ -55,7 +55,7 @@ lualine.setup({
     sections = {
         lualine_a = { { 'mode', icon = '' } },
         lualine_b = {
-            require('auto-session.lib').current_session_name,
+            -- require('auto-session.lib').current_session_name,
             { 'branch', icon = '' },
             {
                 'diagnostics',
diff --git a/.config/nvim/lua/custom/plugins/mason.lua b/.config/nvim/lua/custom/plugins/mason.lua
index 8232b88..f137dda 100644
--- a/.config/nvim/lua/custom/plugins/mason.lua
+++ b/.config/nvim/lua/custom/plugins/mason.lua
@@ -1,38 +1,38 @@
 return {
-    {
-        'williamboman/mason.nvim',
-        lazy = false,
-        opts = {
-            ui = {
-                icons = {
-                    package_installed = '✓',
-                    package_pending = '➜',
-                    package_uninstalled = '✗',
-                },
-            },
-        },
-    },
-    {
-        'WhoIsSethDaniel/mason-tool-installer.nvim',
-        lazy = false,
-        opts = {
-            ensure_installed = {
-                -- 'stylua', -- lua formatting
-                -- 'clang-format', -- C/C++ formatter
-                -- 'codelldb', -- C/C++ debugger
-                -- 'cpplint', -- C/C++ linter
-                -- 'black', -- python formatter
-                -- 'isort', -- python formatter for imports
-                -- 'flake8', -- python linter
-                -- 'gofumpt', -- go formatter
-                -- -- 'golangci-lint', -- go linter
-                -- 'prettierd', -- multi-lang formatter
-                -- 'prettier', -- prettierd but slower, used as a fallback
-                -- 'jq', -- json formatter
-                -- 'jsonlint', -- json linter
-                -- 'shellcheck', -- bash linter
-                -- 'beautysh', -- shell formatter
-            },
-        },
-    },
+    -- {
+    --     'williamboman/mason.nvim',
+    --     lazy = false,
+    --     opts = {
+    --         ui = {
+    --             icons = {
+    --                 package_installed = '✓',
+    --                 package_pending = '➜',
+    --                 package_uninstalled = '✗',
+    --             },
+    --         },
+    --     },
+    -- },
+    -- {
+    --     'WhoIsSethDaniel/mason-tool-installer.nvim',
+    --     lazy = false,
+    --     opts = {
+    --         ensure_installed = {
+    --             -- 'stylua', -- lua formatting
+    --             -- 'clang-format', -- C/C++ formatter
+    --             -- 'codelldb', -- C/C++ debugger
+    --             -- 'cpplint', -- C/C++ linter
+    --             -- 'black', -- python formatter
+    --             -- 'isort', -- python formatter for imports
+    --             -- 'flake8', -- python linter
+    --             -- 'gofumpt', -- go formatter
+    --             -- -- 'golangci-lint', -- go linter
+    --             -- 'prettierd', -- multi-lang formatter
+    --             -- 'prettier', -- prettierd but slower, used as a fallback
+    --             -- 'jq', -- json formatter
+    --             -- 'jsonlint', -- json linter
+    --             -- 'shellcheck', -- bash linter
+    --             -- 'beautysh', -- shell formatter
+    --         },
+    --     },
+    -- },
 }
diff --git a/.config/nvim/lua/custom/plugins/nvim-java.lua b/.config/nvim/lua/custom/plugins/nvim-java.lua
index 4bd321d..9fd3790 100644
--- a/.config/nvim/lua/custom/plugins/nvim-java.lua
+++ b/.config/nvim/lua/custom/plugins/nvim-java.lua
@@ -1,5 +1,5 @@
 return {
-    'nvim-java/nvim-java',
-    lazy = false,
-    opts = {}
+    -- 'nvim-java/nvim-java',
+    -- lazy = false,
+    -- opts = {}
 }
diff --git a/.config/nvim/lua/custom/plugins/nvim-lint.lua b/.config/nvim/lua/custom/plugins/nvim-lint.lua
index beef255..b9b0316 100644
--- a/.config/nvim/lua/custom/plugins/nvim-lint.lua
+++ b/.config/nvim/lua/custom/plugins/nvim-lint.lua
@@ -1,41 +1,41 @@
 return {
-    'mfussenegger/nvim-lint',
-    lazy = false,
-    config = function()
-        local lint = require('lint')
-        lint.linters_by_ft = {
-            c = { 'clangtidy' },
-            cpp = { 'clangtidy' },
-            go = { 'golangcilint' },
-            python = { 'flake8' },
-            json = { 'jsonlint' },
-            bash = { 'shellcheck' },
-        }
-
-        vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave', 'TextChanged', 'TextChangedI' }, {
-            group = vim.api.nvim_create_augroup('nvim-lint', { clear = true }),
-            callback = function()
-                require('lint').try_lint()
-            end,
-        })
-
-        -- NOTE: most if not all of clangt-idy warnings are
-        -- also reported by clangd, so this function filters clang-tidy warnings
-        -- to avoid duplication of warnings
-        local clangtidy_parser = lint.linters.clangtidy.parser
-        lint.linters.clangtidy.parser = function(output, bufnr, linter_cwd)
-            local diagnostics = clangtidy_parser(output, bufnr, linter_cwd)
-            diagnostics = vim.tbl_filter(function(diagnostic)
-                if diagnostic.severity == vim.diagnostic.severity.WARN then
-                    return false
-                end
-                if diagnostic.severity == vim.diagnostic.severity.ERROR then
-                    return false
-                end
-
-                return true
-            end, diagnostics)
-            return diagnostics
-        end
-    end,
+    -- 'mfussenegger/nvim-lint',
+    -- lazy = false,
+    -- config = function()
+    --     local lint = require('lint')
+    --     lint.linters_by_ft = {
+    --         c = { 'clangtidy' },
+    --         cpp = { 'clangtidy' },
+    --         go = { 'golangcilint' },
+    --         python = { 'flake8' },
+    --         json = { 'jsonlint' },
+    --         bash = { 'shellcheck' },
+    --     }
+    --
+    --     vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWritePost', 'InsertLeave', 'TextChanged', 'TextChangedI' }, {
+    --         group = vim.api.nvim_create_augroup('nvim-lint', { clear = true }),
+    --         callback = function()
+    --             require('lint').try_lint()
+    --         end,
+    --     })
+    --
+    --     -- NOTE: most if not all of clangt-idy warnings are
+    --     -- also reported by clangd, so this function filters clang-tidy warnings
+    --     -- to avoid duplication of warnings
+    --     local clangtidy_parser = lint.linters.clangtidy.parser
+    --     lint.linters.clangtidy.parser = function(output, bufnr, linter_cwd)
+    --         local diagnostics = clangtidy_parser(output, bufnr, linter_cwd)
+    --         diagnostics = vim.tbl_filter(function(diagnostic)
+    --             if diagnostic.severity == vim.diagnostic.severity.WARN then
+    --                 return false
+    --             end
+    --             if diagnostic.severity == vim.diagnostic.severity.ERROR then
+    --                 return false
+    --             end
+    --
+    --             return true
+    --         end, diagnostics)
+    --         return diagnostics
+    --     end
+    -- end,
 }
diff --git a/.zshrc b/.zshrc
index c0c04a8..3b4b1ad 100644
--- a/.zshrc
+++ b/.zshrc
@@ -18,7 +18,6 @@ autoload -Uz _zinit
 zinit ice wait lucid && zinit light zsh-users/zsh-syntax-highlighting
 zinit ice wait lucid && zinit light zsh-users/zsh-completions
 zinit ice wait lucid && zinit light Aloxaf/fzf-tab
-zinit ice wait lucid && zinit snippet OMZP::command-not-found
 zinit ice wait lucid atload'_zsh_autosuggest_start && bindkey "^y" autosuggest-accept'
 zinit light zsh-users/zsh-autosuggestions
 
@@ -60,7 +59,14 @@ alias ls='eza'
 alias tree='eza --tree'
 alias c='clear'
 alias vim='nvim'
+
+# Git Aliases
 alias gs='git status'
+alias gp='git push'
+alias gP='git pull'
+alias gl='git log --oneline --decorate'
+alias gc='git commit'
+alias ga='git add'
 
 export EDITOR=nvim
 export PAGER='nvim -R'
diff --git a/nixos/hosts/default/home.nix b/nixos/hosts/default/home.nix
index cd361de..0895631 100644
--- a/nixos/hosts/default/home.nix
+++ b/nixos/hosts/default/home.nix
@@ -34,6 +34,8 @@
     bc
     keychain
     bat
+    sqlite
+    clang
 
     # # It is sometimes useful to fine-tune packages, for example, by applying
     # # overrides. You can do that directly here, just don't forget the