various changes

bashtop/bashtop.cfg

@@ -2,7 +2,7 @@
 
 #* Color theme, looks for a .theme file in "$HOME/.config/bashtop/themes" and "$HOME/.config/bashtop/user_themes"
 #* Should be prefixed with either "themes/" or "user_themes/" depending on location, "Default" for builtin default theme
-color_theme="themes/gruvbox"
+#* color_theme="themes/gruvbox"
 
 #* Update time in milliseconds, increases automatically if set below internal loops processing time, recommended 2000 ms or above for better sample times for graphs
 update_ms="2500"

kitty/kitty.conf

@@ -1,15 +1,26 @@
-include ./theme.conf 
+
+font_size 10
+
+font_family      Jetbrains Mono Nerd Font
+bold_font        auto
+italic_font      auto 
+bold_italic_font auto 
+
+
 
 # font_family PragmataPro Mono Liga
 # bold_font PragmataPro Mono Liga Bold 
 # italic_font PragmataPro Mono Liga Italic
 # bold_italic_font PragmataPro Mono Liga Bold Italic 
 
-
-font_family JetBrainsMono
-bold_font auto
-italic_font auto 
-bold_italic_font auto 
+# font_family Terminess Nerd Font Mono
+# bold_font auto
+# italic_font auto 
+# bold_italic_font auto 
+# font_family Jetbrains Mono
+# bold_font auto
+# italic_font auto 
+# bold_italic_font auto 
 
 
 # font_family Liberation Mono 
@@ -27,13 +38,13 @@ bold_italic_font auto
 # italic_font TerminusTTF-Italic
 
 
-font_size 10
+# adjust_line_height -1
 
 clipboard_control write-clipboard write-primary read-clipboard-ask read-primary-ask
 window_padding_width 3
 remember_window_size no
 copy_on_select yes
-background_opacity 0.95
+background_opacity 1
 bell_path /home/thomas/dotfiles/gruvbox-95/sounds/st-terminal-beep.wav
 # startup_session launch.conf
 
@@ -50,3 +61,9 @@ confirm_os_window_close 0
 # inactive_tab_background #000e07 
 # inactive_tab_font_style normal
 
+
+
+# BEGIN_KITTY_THEME
+# Solarized Dark
+include current-theme.conf
+# END_KITTY_THEME

nvim/init.lua

@@ -1,4 +1,6 @@
-require("config.colourscheme")
+-- require("config.colourscheme")
 require("config.options")
 require("config.keybindings")
 require("config.lazy")
+
+--require("tinted-colorscheme").setup("base24-alien-blood")

nvim/lazy-lock.json

@@ -1,47 +1,46 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
-  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "conform.nvim": { "branch": "master", "commit": "023f795dbcf32d4351b6a9ed2e613d471b5bb812" },
-  "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
-  "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
-  "git-blame.nvim": { "branch": "master", "commit": "2883a7460f611c2705b23f12d58d398d5ce6ec00" },
-  "gitsigns.nvim": { "branch": "main", "commit": "ac5aba6dce8c06ea22bea2c9016f51a2dbf90dc7" },
-  "gruvbox-material": { "branch": "master", "commit": "b16dcd787db5ba9302b54ebeac186784c2aed29a" },
+  "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" },
+  "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" },
+  "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" },
+  "conform.nvim": { "branch": "master", "commit": "5420c4b5ea0aeb99c09cfbd4fd0b70d257b44f25" },
+  "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
+  "git-blame.nvim": { "branch": "master", "commit": "54da04264ec5313d602aebea7c5dc90141696ad7" },
+  "gitsigns.nvim": { "branch": "main", "commit": "130beacf8a51f00aede9c31064c749136679a321" },
   "gv.vim": { "branch": "master", "commit": "b6bb6664e2c95aa584059f195eb3a9f3cb133994" },
-  "hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
-  "image.nvim": { "branch": "master", "commit": "7f61c1940a8b072ca47a28928d2375dc1e11f464" },
-  "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
-  "lazygit.nvim": { "branch": "main", "commit": "56760339a81cd1540d5a72fd9d93010a2677b55d" },
-  "lspkind.nvim": { "branch": "master", "commit": "a700f1436d4a938b1a1a93c9962dc796afbaef4d" },
-  "lspsaga.nvim": { "branch": "main", "commit": "d027f8b9c7c55e26cf4030c8657a2fc8222ed762" },
-  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "cab00668464d2914d0752b86168b4a431cc93eb2" },
-  "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
-  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
+  "hererocks": { "branch": "master", "commit": "98f3ff2f5e9c1e7c03dc46eb1a61ea57a4146870" },
+  "image.nvim": { "branch": "master", "commit": "446a8a5cc7a3eae3185ee0c697732c32a5547a0b" },
+  "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
+  "lazygit.nvim": { "branch": "main", "commit": "a04ad0dbc725134edbee3a5eea29290976695357" },
+  "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" },
+  "lspsaga.nvim": { "branch": "main", "commit": "8efe00d6aed9db6449969f889170f1a7e43101a1" },
+  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "4cfe411526a7a99c18281135e8b4765ae6330d15" },
+  "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" },
+  "mini.diff": { "branch": "main", "commit": "6010e588e9ed14724880f244d7fa3df8f0be3f46" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" },
   "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
-  "neogit": { "branch": "master", "commit": "6d1bd94f7fca92a50a892f494920696b5defa8c8" },
-  "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" },
-  "nvim-autopairs": { "branch": "master", "commit": "ee297f215e95a60b01fde33275cc3c820eddeebe" },
-  "nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" },
+  "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
-  "nvim-lspconfig": { "branch": "master", "commit": "87c7c83ce62971e0bdb29bb32b8ad2b19c8f95d0" },
-  "nvim-treesitter": { "branch": "master", "commit": "20e10ca6914f65cf1410232433fb58de70ab6b39" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" },
-  "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" },
-  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
-  "rainbow-delimiters.nvim": { "branch": "master", "commit": "f22496dfdd46da4d571f5254c72eff65ff5a1c27" },
+  "nvim-lspconfig": { "branch": "master", "commit": "d696e36d5792daf828f8c8e8d4b9aa90c1a10c2a" },
+  "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" },
+  "nvim-web-devicons": { "branch": "master", "commit": "6788013bb9cb784e606ada44206b0e755e4323d7" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
   "rainbow_csv": { "branch": "master", "commit": "3dbbfd7d17536aebfb80f571255548495574c32b" },
-  "telescope-file-browser.nvim": { "branch": "master", "commit": "626998e5c1b71c130d8bc6cf7abb6709b98287bb" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
+  "solarized.nvim": { "branch": "main", "commit": "c0dfe1cbfabd93b546baf5f1408f5df7e02e2050" },
+  "telescope-file-browser.nvim": { "branch": "master", "commit": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" },
   "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" },
+  "tinted-nvim": { "branch": "main", "commit": "0347c54827694e85f4880233eefd71be3978e439" },
+  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
   "vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" },
-  "vim-css-color": { "branch": "master", "commit": "950e80352b325ff26d3b0faf95b29e301c200f7d" },
-  "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
+  "vim-css-color": { "branch": "master", "commit": "14fd934cdd9ca1ac0e53511094e612eb9bace373" },
+  "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
   "vim-smoothie": { "branch": "master", "commit": "df1e324e9f3395c630c1c523d0555a01d2eb1b7e" },
-  "zk-nvim": { "branch": "main", "commit": "aa9b346f2b0ab0c822bef917ee7f607d5c99f7bc" }
+  "vim-wakatime": { "branch": "master", "commit": "d7973b157a632d1edeff01818f18d67e584eeaff" },
+  "zk-nvim": { "branch": "main", "commit": "8df80d0dc2d66e53b08740361a600746a6e4edcf" }
 }

nvim/lua/config/colourscheme.lua

@@ -1,8 +1,8 @@
--- local global = vim.g
+local global = vim.g
 
--- global.gruvbox_material_background = "medium"
--- global.gruvbox_material_enable_bold = 0
--- global.gruvbox_material_enable_italic = 0
+global.gruvbox_material_background = "hard"
+global.gruvbox_material_enable_bold = 1
+global.gruvbox_material_enable_italic = 1
 
 -- local function update_highlight_group(group, tbl)
 -- 	local old_hl = vim.api.nvim_get_hl_by_name(group, true)
@@ -13,3 +13,5 @@
 -- update_highlight_group("Function", { bold = false })
 -- update_highlight_group("Comment", { italic = false })
 -- update_highlight_group("String", { italic = false })
+
+-- vim.cmd.colorscheme("base16-ayu-dark")

nvim/lua/config/keybindings.lua

@@ -29,3 +29,8 @@ keymap.set("n", "<leader>sp", function()
 	vim.opt.spell = not vim.opt.spell:get()
 	vim.opt.spelllang = "en_gb"
 end, { desc = "Toggle spell check" })
+
+-- Toggle in-file Git diff
+keymap.set("n", "<leader>dif", function()
+	MiniDiff.toggle_overlay()
+end, { desc = "Toggle in-file Git diff" })

nvim/lua/config/lazy.lua

@@ -13,6 +13,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
 		os.exit(1)
 	end
 end
+
 vim.opt.rtp:prepend(lazypath)
 
 -- Make sure to setup `mapleader` and `maplocalleader` before

nvim/lua/config/options.lua

@@ -34,7 +34,7 @@ opt.backspace = "indent,eol,start"
 opt.conceallevel = 0
 opt.spelllang = "en_gb"
 opt.number = true
-opt.relativenumber = true
+opt.relativenumber = false
 vim.opt.spell = false
 
 -- vim.g.gruvbox_material_enable_bold = 1

nvim/lua/plugins/autotag.lua

@@ -0,0 +1,5 @@
+return {
+	"windwp/nvim-ts-autotag",
+	event = { "BufReadPre", "BufNewFile" },
+	opts = {},
+}

nvim/lua/plugins/devicons.lua

@@ -1 +1,2 @@
-return { "nvim-tree/nvim-web-devicons" }
+-- return { "nvim-tree/nvim-web-devicons" }
+return {}

nvim/lua/plugins/formatter.lua

@@ -1,36 +1,43 @@
 return {
-    "stevearc/conform.nvim",
-    event = { "BufReadPre", "BufNewFile" },
-    config = function()
-        local conform = require("conform")
+	"stevearc/conform.nvim",
+	event = { "BufReadPre", "BufNewFile" },
+	config = function()
+		local conform = require("conform")
 
-        conform.setup({
-            formatters_by_ft = {
-                javascript = { "prettier" },
-                typescript = { "prettier" },
-                javascriptreact = { "prettier" },
-                typescriptreact = { "prettier" },
-                css = { "prettier" },
-                html = { "prettier" },
-                json = { "prettier" },
-                yaml = { "prettier" },
-                markdown = { "prettier" },
-                lua = { "stylua" },
-                python = { "isort", "black" },
-            },
-            format_on_save = {
-                lsp_fallback = true,
-                async = false,
-                timeout_ms = 1000,
-            },
-        })
+		conform.setup({
+			formatters_by_ft = {
+				javascript = { "prettier" },
+				typescript = { "prettier" },
+				javascriptreact = { "prettier" },
+				typescriptreact = { "prettier" },
+				css = { "prettier" },
+				html = { "prettier" },
+				json = { "prettier" },
+				yaml = { "prettier" },
+				markdown = { "prettier" },
+				lua = { "stylua" },
+				python = { "isort", "black" },
+				c = { "clang_format" },
+			},
+			formatters = {
+				clang_format = {
+					args = { "--style=file" },
+				},
+			},
 
-        vim.keymap.set({ "n", "v" }, "<leader>f", function()
-            conform.format({
-                lsp_fallback = true,
-                async = false,
-                timeout_ms = 1000,
-            })
-        end, { desc = "Format file or range (in visual mode)" })
-    end,
+			format_on_save = {
+				lsp_fallback = true,
+				async = false,
+				timeout_ms = 1000,
+			},
+		})
+
+		vim.keymap.set({ "n", "v" }, "<leader>f", function()
+			conform.format({
+				lsp_fallback = true,
+				async = false,
+				timeout_ms = 1000,
+			})
+		end, { desc = "Format file or range (in visual mode)" })
+	end,
 }

nvim/lua/plugins/gruvbox.lua

@@ -1,17 +1,9 @@
-return {
-	"sainnhe/gruvbox-material",
-	lazy = false,
-	priority = 1000,
-	config = function()
-		-- Optionally configure and load the colorscheme
-		-- directly inside the plugin declaration.
-
-		-- vim.g.gruvbox_material_disable_italic_comment = true
-		vim.g.gruvbox_material_enable_bold = false
-		vim.g.gruvbox_material_enable_italic = false
-		vim.cmd.colorscheme("gruvbox-material")
-	end,
-}
+-- return {
+-- 	"xiantang/darcula-dark.nvim",
+-- 	config = function()
+-- 		vim.cmd("colorscheme darcula-dark")
+-- 	end,
+-- }
 
 -- return {
 -- 	"https://github.com/ellisonleao/gruvbox.nvim",
@@ -19,17 +11,17 @@ return {
 -- 	priority = 1000,
 -- 	config = function()
 -- 		require("gruvbox").setup({
--- 			invert_tabline = true,
--- 			invert_selection = true,
+-- 			invert_tabline = false,
+-- 			invert_selection = false,
 -- 			terminal_colors = true, -- add neovim terminal colors
 -- 			undercurl = true,
 -- 			underline = true,
--- 			bold = true,
+-- 			bold = false,
 -- 			italic = {
--- 				comments = true,
--- 				emphasis = false,
--- 				strings = true,
--- 				operators = true,
+-- 				comments = false,
+-- 				emphasis = true,
+-- 				strings = false,
+-- 				operators = false,
 -- 				folds = false,
 -- 			},
 -- 		})
@@ -37,6 +29,36 @@ return {
 -- 	end,
 -- }
 
+--return {
+--	"maxmx03/solarized.nvim",
+--	lazy = false,
+--	priority = 1000,
+--	---@type solarized.config
+--	opts = {},
+--	config = function(_, opts)
+--		vim.o.termguicolors = true
+--		vim.o.background = "dark"
+--		require("solarized").setup(opts)
+--		vim.cmd.colorscheme("solarized")
+--	end,
+--}
+
+return {
+	"Tsuzat/NeoSolarized.nvim",
+	lazy = false, -- make sure we load this during startup if it is your main colorscheme
+	priority = 1000, -- make sure to load this before all the other start plugins
+	config = function()
+		require("NeoSolarized").setup({
+			transparent = false,
+			enable_italics = false,
+			styles = {
+				string = { italic = false },
+			},
+		})
+		vim.cmd([[ colorscheme NeoSolarized ]])
+	end,
+}
+
 -- return {
 -- 	"f4z3r/gruvbox-material.nvim",
 -- 	name = "gruvbox-material",
@@ -44,3 +66,26 @@ return {
 -- 	priority = 1000,
 -- 	opts = {},
 -- }
+
+-- return {
+-- 	"gmr458/vscode_modern_theme.nvim",
+-- 	lazy = false,
+-- 	priority = 1000,
+-- 	config = function()
+-- 		require("vscode_modern").setup({
+-- 			cursorline = true,
+-- 			transparent_background = false,
+-- 			nvim_tree_darker = true,
+-- 		})
+-- 		vim.cmd.colorscheme("vscode_modern")
+-- 	end,
+-- }
+
+-- return {
+-- 	"olimorris/onedarkpro.nvim",
+-- 	priority = 1000, -- Ensure it loads first
+-- 	config = function()
+-- 		vim.cmd("colorscheme onedark")
+-- 	end,
+-- }
+--

nvim/lua/plugins/lspconfig.lua

@@ -6,10 +6,7 @@ return {
 		{ "folke/neodev.nvim", opts = {} },
 	},
 	config = function()
-		local nvim_lsp = require("lspconfig")
-		local mason_lspconfig = require("mason-lspconfig")
 		local on_attach = function(client, bufnr)
-			-- format on save
 			if client.server_capabilities.documentFormattingProvider then
 				vim.api.nvim_create_autocmd("BufWritePre", {
 					group = vim.api.nvim_create_augroup("Format", { clear = true }),
@@ -22,55 +19,72 @@ return {
 		end
 
 		local capabilities = require("cmp_nvim_lsp").default_capabilities()
-		mason_lspconfig.setup_handlers({
-			function(server)
-				nvim_lsp[server].setup({
-					capabilities = capabilities,
-				})
-			end,
-			["ts_ls"] = function()
-				nvim_lsp["ts_ls"].setup({
-					on_attach = on_attach,
-					capabilities = capabilities,
-				})
-			end,
-			["cssls"] = function()
-				nvim_lsp["cssls"].setup({
-					on_attach = on_attach,
-					capabilities = capabilities,
-				})
-			end,
-			["html"] = function()
-				nvim_lsp["html"].setup({
-					on_attach = on_attach,
-					capabilities = capabilities,
-				})
-			end,
-			["jsonls"] = function()
-				nvim_lsp["jsonls"].setup({
-					on_attach = on_attach,
-					capabilities = capabilities,
-				})
-			end,
-			["eslint"] = function()
-				nvim_lsp["eslint"].setup({
-					on_attach = on_attach,
-					capabilities = capabilities,
-				})
-			end,
-			["pyright"] = function()
-				nvim_lsp["pyright"].setup({
-					on_attach = on_attach,
-					capabilities = capabilities,
-				})
-			end,
 
-			["marksman"] = function()
-				nvim_lsp["marksman"].setup({
-					on_attach = on_attach,
-					capabilities = capabilities,
-				})
-			end,
-		})
+		local servers = {
+			"ts_ls",
+			"bashls",
+			"cssls",
+			"eslint",
+			"html",
+			"jsonls",
+			"ruff",
+			"pyright",
+			"lua_ls",
+			"yamlls",
+			"marksman",
+			"clangd",
+		}
+
+		for _, server in ipairs(servers) do
+			vim.lsp.config(server, {
+				capabilities = capabilities,
+				on_attach = on_attach,
+			})
+			vim.lsp.enable(server)
+		end
 	end,
 }
+
+-- return {
+-- 	"neovim/nvim-lspconfig",
+-- 	event = { "BufReadPre", "BufNewFile" },
+-- 	dependencies = {
+-- 		"hrsh7th/cmp-nvim-lsp",
+-- 		{ "folke/neodev.nvim", opts = {} },
+-- 	},
+-- 	config = function()
+-- 		local on_attach = function(client, bufnr)
+-- 			if client.server_capabilities.documentFormattingProvider then
+-- 				vim.api.nvim_create_autocmd("BufWritePre", {
+-- 					group = vim.api.nvim_create_augroup("Format", { clear = true }),
+-- 					buffer = bufnr,
+-- 					callback = function()
+-- 						vim.lsp.buf.format()
+-- 					end,
+-- 				})
+-- 			end
+-- 		end
+
+-- 		local capabilities = require("cmp_nvim_lsp").default_capabilities()
+
+-- 		local servers = {
+-- 			"ts_ls",
+-- 			"bashls",
+-- 			"cssls",
+-- 			"eslint",
+-- 			"html",
+-- 			"jsonls",
+-- 			"pyright",
+-- 			"lua_ls",
+-- 			"yamlls",
+-- 			"marksman",
+-- 		}
+
+-- 		for _, server in ipairs(servers) do
+-- 			require("lspconfig")[server].setup({
+-- 				on_attach = on_attach,
+-- 				capabilities = capabilities,
+-- 			})
+-- 		end
+-- 	end,
+-- }

nvim/lua/plugins/lspsaga.lua

@@ -2,7 +2,7 @@ return {
 	"nvimdev/lspsaga.nvim",
 	dependencies = {
 		"nvim-treesitter/nvim-treesitter", -- optional
-		"nvim-tree/nvim-web-devicons", -- optional
+		--		"nvim-tree/nvim-web-devicons", -- optional
 	},
 	keys = {
 

nvim/lua/plugins/lualine.lua

@@ -1,11 +1,11 @@
 return {
 	"nvim-lualine/lualine.nvim",
 	lazy = false,
-	dependencies = { "nvim-tree/nvim-web-devicons" },
+	--	dependencies = { "nvim-tree/nvim-web-devicons" },
 	opts = {
 		options = {
-			theme = "gruvbox-material",
-			icons_enabled = true,
+			theme = "solarized",
+			icons_enabled = false,
 			component_separators = { left = "|", right = "|" },
 			section_separators = { left = " ", right = " " },
 		},

nvim/lua/plugins/mason.lua

@@ -2,38 +2,9 @@ return {
 	"williamboman/mason.nvim",
 	dependencies = {
 		"williamboman/mason-lspconfig.nvim",
-		"WhoIsSethDaniel/mason-tool-installer.nvim",
 	},
 	config = function()
 		require("mason").setup()
-		require("mason-lspconfig").setup({
-			automatic_installation = true,
-			ensure_installed = {
-				"ts_ls",
-				"bashls",
-				"cssls",
-				"eslint",
-				"html",
-				"jsonls",
-				"pyright",
-				"lua_ls",
-				"jsonls",
-				"yamlls",
-				"marksman",
-			},
-		})
-
-		require("mason-tool-installer").setup({
-			ensure_installed = {
-				"prettier",
-				"stylua",
-				"isort",
-				"black",
-				"pylint",
-				"eslint_d",
-				"marksman",
-				"shfmt",
-			},
-		})
+		require("mason-lspconfig").setup()
 	end,
 }

nvim/lua/plugins/minidiff.lua

@@ -0,0 +1,8 @@
+return {
+	"nvim-mini/mini.diff",
+	opts = {
+		view = {
+			style = "sign",
+		},
+	},
+}

nvim/lua/plugins/rainbow-delimiters.lua

@@ -1 +1,6 @@
-return { "HiPhish/rainbow-delimiters.nvim" }
+return {}
+-- return {
+-- 	"HiPhish/rainbow-delimiters.nvim",
+-- 	event = { "BufReadPre", "BufNewFile" },
+-- }
+-- return { "HiPhish/rainbow-delimiters.nvim" }

nvim/lua/plugins/telescope.lua

@@ -17,8 +17,10 @@ return {
 				},
 			},
 			file_ignore_patterns = {
+				"build/",
 				"neuron/",
 				"img",
+				".cache/",
 				"node_modules",
 				".git",
 			},

nvim/lua/plugins/tinted-nvim.lua

@@ -0,0 +1,3 @@
+return {
+	"tinted-theming/tinted-nvim",
+}

nvim/lua/plugins/treesitter.lua

@@ -2,9 +2,9 @@ return {
 	"nvim-treesitter/nvim-treesitter",
 	event = { "BufReadPre", "BufNewFile" },
 	build = ":TSUpdate",
-	dependencies = {
-		"windwp/nvim-ts-autotag",
-	},
+	-- dependencies = {
+	-- 	"windwp/nvim-ts-autotag",
+	-- },
 	config = function()
 		local treesitter = require("nvim-treesitter.configs")
 		treesitter.setup({
@@ -13,9 +13,9 @@ return {
 				additional_vim_regex_highlighting = false,
 			},
 			indent = { enable = true },
-			autotag = {
-				enable = true,
-			},
+			-- autotag = {
+			-- 	enable = true,
+			-- },
 			ensure_installed = {
 				"json",
 				"javascript",
@@ -44,16 +44,16 @@ return {
 					node_decremental = "<bs>",
 				},
 			},
-			rainbow = {
-				enable = true,
-				disable = { "html" },
-				extended_mode = false,
-				max_file_lines = nil,
-			},
-			context_commentstring = {
-				enable = true,
-				enable_autocmd = false,
-			},
+			-- rainbow = {
+			-- 	enable = true,
+			-- 	disable = { "html" },
+			-- 	extended_mode = false,
+			-- 	max_file_lines = nil,
+			-- },
+			-- context_commentstring = {
+			-- 	enable = true,
+			-- 	enable_autocmd = false,
+			-- },
 		})
 	end,
 }

nvim/lua/plugins/ts-context-commentstring.lua

@@ -0,0 +1,15 @@
+return {
+	"JoosepAlviste/nvim-ts-context-commentstring",
+	event = { "BufReadPre", "BufNewFile" },
+	config = function()
+		require("ts_context_commentstring").setup({
+			enable_autocmd = false,
+		})
+
+		local get_option = vim.filetype.get_option
+		vim.filetype.get_option = function(filetype, option)
+			return option == "commentstring" and require("ts_context_commentstring.internal").calculate_commentstring()
+				or get_option(filetype, option)
+		end
+	end,
+}

nvim/lua/plugins/vim-wakatime.lua

@@ -0,0 +1 @@
+return { "wakatime/vim-wakatime" }

zsh/thomas.zsh-theme

@@ -19,10 +19,12 @@
 # PROMPT='%{$fg_bold[green]%}%n@%m%{$reset_color%} %{$fg_bold[magenta]%}%2~$(git_prompt_info)%{$reset_color%}%(.)
 # %{$fg[green]%}$%{$reset_color%} '
 
-PROMPT='%{$fg_bold[green]%}%n@%m%{$reset_color%} %{$fg_bold[blue]%}%2~%{$reset_color%}$(git_prompt_info)%(.)
-%{$fg[green]%}$%{$reset_color%} '
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[magenta]%} "
-ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+#PROMPT='%{$reset_color%}%{$fg_bold[blue]%}%2~%{$reset_color%}$(git_prompt_info)%(.)
+# %{$fg[green]%}$%{$reset_color%} '
+# ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[magenta]%} "
+# ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
 
 #ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[blue]%} "
 #ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}"
+
+PS1="%B%{$fg[green]%}%n@%m:%{$fg[blue]%}%~ %{$reset_color%}%b"

zsh/zshrc

@@ -1,5 +1,3 @@
-
-
 export ZSH="/home/thomas/.oh-my-zsh"
 alias vim="nvim"
 alias cat="bat"
@@ -17,8 +15,8 @@ alias ga="git add"
 alias gc="git commit"
 alias syncmus="/home/thomas/repos/utilities/music_sync/update_music_library.sh"
 alias dc="docker compose"
-
-
+alias neofetch="fastfetch"
+alias dis-refresh='rm -rf ~/.local/share/kscreen/ && pkill kscreen'
 # alias xhd="cd /run/media/thomas"
 # alias cs-update="/home/thomas/repos/eolas/_scripts/auto_save.sh"
 # alias cs-query="/home/thomas/repos/eolas/_scripts/query.sh"
@@ -27,7 +25,9 @@ alias dc="docker compose"
 
 # ZSH_THEME="thomas"
 
-ZSH_THEME="thomas"
+#ZSH_THEME="thomas"
+
+ZSH_THEME="robbyrussell"
 plugins=(git npm fzf-tab zsh-autosuggestions zsh-syntax-highlighting)
 
 # Search against /home/thomas/repos/computer_science
@@ -39,6 +39,9 @@ source ~/.env
 export EDITOR='nvim'
 source $ZSH/oh-my-zsh.sh
 
+
+alias ls="eza"
+
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
@@ -48,12 +51,11 @@ export NVM_DIR="$HOME/.nvm"
 #eval "$(pyenv init --path)"
 
 
-export PATH="$HOME/.local/bin:$PATH"
-
+#export PATH="$HOME/.local/bin:$PATH"
+export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$PATH"
 # export OPENAI_API_KEY=${OPENAI_API_KEY}
 #
 
-if [ -e /home/thomas/.nix-profile/etc/profile.d/nix.sh ]; then . /home/thomas/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
 
 ## [Completion]
 ## Completion scripts setup. Remove the following line to uninstall