stuff and things

alacritty/.alacritty.toml

@@ -1,6 +1,6 @@
 [font]
-size = 12
+size = 14
-normal = { family = "ComicCodeLigatures Nerd Font Light" }
+normal = { family = "CommitMono Nerd Font" }
 
 [window]
 option_as_alt = "OnlyLeft"

config/.config/nvim/init.lua

@@ -1,5 +1,6 @@
 vim.cmd("source " .. vim.env.HOME .. "/.vimrc")
 
+vim.g.maplocalleader = ","
 local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
 	vim.fn.system({
@@ -22,7 +23,7 @@ require("config.zip")
 
 require("lazy").setup({
 	-- this entry tells lazy.nvim to load the list of of *.lua files from plugins/
-   import = "plugins" ,
+	import = "plugins",
 	-- Dev configuration
 	dev = {
 		-- Directory where you store your local plugin projects

config/.config/nvim/lazy-lock.json

@@ -1,3 +1,3 @@
 {
-  "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }
+  "lazy.nvim": { "branch": "main", "commit": "e5e9bf48211a13d9ee6c1077c88327c49c1ab4a0" }
 }

vim/.vim/lua/plugins/base.lua

@@ -1,27 +1,16 @@
 local use_google = require("utils").use_google
 
 return {
+	{
+		"adelarsq/image_preview.nvim",
+		event = "VeryLazy",
+		config = function()
+			require("image_preview").setup()
+		end,
+	},
 	"sindrets/diffview.nvim",
 	--{ "mizlan/iswap.nvim", event = "VeryLazy" },
 	{ "folke/todo-comments.nvim", dependencies = { "nvim-lua/plenary.nvim" } },
-  {
-    "folke/flash.nvim",
-    event = "VeryLazy",
-    ---@type Flash.Config
-    opts = {
-      jump = {
-        nohlsearch = true,
-      },
-    },
-    -- stylua: ignore
-    keys = {
-      { "s",     mode = { "n", "x", "o" }, function() require("flash").jump() end,              desc = "Flash" },
-      { "S",     mode = { "n", "x", "o" }, function() require("flash").treesitter() end,        desc = "Flash Treesitter" },
-      { "r",     mode = "o",               function() require("flash").remote() end,            desc = "Remote Flash" },
-      { "R",     mode = { "o", "x" },      function() require("flash").treesitter_search() end, desc = "Treesitter Search" },
-      { "<c-s>", mode = { "c" },           function() require("flash").toggle() end,            desc = "Toggle Flash Search" },
-    },
-  },
 	{
 		"MagicDuck/grug-far.nvim",
 		config = function()

vim/.vim/lua/plugins/conform.lua

@@ -77,11 +77,10 @@ return {
 				["_"] = { "trim_whitespace" },
 			},
 			formatters = {
-				ronfmt = {
+				-- ronfmt = {
-					command = "ronfmt",
+				-- 	command = "ronfmt",
-					args = { "$FILENAME" },
+				-- 	args = { "-d", "$FILENAME" },
-					stdin = false,
+				-- },
-				},
 				gdformat = {
 					prepend_args = { "-l", "100" },
 				},

vim/.vim/lua/plugins/diagnostics.lua

@@ -1,4 +1,5 @@
 -- disable underline
+local use_google = require("utils").use_google
 vim.diagnostic.handlers.underline.show = function() end
 
 local signs = {
@@ -35,34 +36,36 @@ return {
 			{ "]g", ":lua vim.diagnostic.goto_next()<CR>" },
 		},
 	},
-	-- {
+	{
-	-- 	"rachartier/tiny-inline-diagnostic.nvim",
+		"rachartier/tiny-inline-diagnostic.nvim",
-	-- 	event = "LspAttach",
+		event = "LspAttach",
-	-- 	priority = 1000, -- needs to be loaded in first
+		priority = 1000, -- needs to be loaded in first
-	-- 	config = function()
+		cond = not use_google(),
-	-- 		vim.diagnostic.config({ virtual_text = false })
+		config = function()
-	--
+			vim.diagnostic.config({ virtual_text = false })
-	-- 		require("tiny-inline-diagnostic").setup({
+
-	-- 			preset = "classic", -- Can be: "modern", "classic", "minimal", "powerline", ghost", "simple", "nonerdfont", "amongus"
+			require("tiny-inline-diagnostic").setup({
-	--
+				preset = "classic", -- Can be: "modern", "classic", "minimal", "powerline", ghost", "simple", "nonerdfont", "amongus"
-	-- 			-- Show the source of the diagnostic.
+
-	-- 			show_source = false,
+				-- Show the source of the diagnostic.
-	--
+				show_source = false,
-	-- 			-- Use your defined signs in the diagnostic config table.
+
-	-- 			use_icons_from_diagnostic = true,
+				-- Use your defined signs in the diagnostic config table.
-	--
+				use_icons_from_diagnostic = true,
-	-- 			-- Enable diagnostic message on all lines.
+
-	-- 			multilines = true,
+				-- Enable diagnostic message on all lines.
-	--
+				multilines = true,
-	-- 			-- Show all diagnostics on the cursor line.
+
-	-- 			show_all_diags_on_cursorline = false,
+				-- Show all diagnostics on the cursor line.
-	-- 		})
+				show_all_diags_on_cursorline = false,
-	-- 	end,
+			})
-	-- },
+		end,
+	},
 	{
 		"ErichDonGubler/lsp_lines.nvim",
 		event = { "LspAttach" },
 		name = "lsp_lines.nvim",
+		cond = use_google(),
 		config = function()
 			require("lsp_lines").setup()
 

vim/.vim/lua/plugins/leap.lua

@@ -1,6 +0,0 @@
-return {
-	"ggandor/leap.nvim",
-	config = function()
-		require("leap").add_default_mappings()
-	end,
-}

vim/.vim/lua/plugins/lsp.lua

@@ -35,22 +35,6 @@ return {
 		end,
 		dependencies = { "rafamadriz/friendly-snippets" },
 	},
-  {
-    "hinell/lsp-timeout.nvim",
-    event = { "LspAttach" },
-    dependencies = { "neovim/nvim-lspconfig" },
-    -- cond = not use_google(),
-    config = function()
-      vim.g.lspTimeoutConfig = {
-        filetypes = {
-          ignore = { -- filetypes to ignore; empty by default
-            "gdscript",
-            "rust",
-          }, -- for these filetypes
-        },
-      }
-    end,
-  },
 	{
 		"ray-x/go.nvim",
 		dependencies = { -- optional packages
@@ -127,15 +111,31 @@ return {
 
 			lsp_configs.ciderlsp = {
 				default_config = {
-          cmd = { '/google/bin/releases/cider/ciderlsp/ciderlsp', '--tooltag=nvim-lsp', '--noforward_sync_responses' },
+					cmd = {
-          filetypes = { "c", "cpp", "java", "kotlin", "objc", "proto", "textproto", "go", "python", "bzl", "typescript" },
+						"/google/bin/releases/cider/ciderlsp/ciderlsp",
-          offset_encoding = 'utf-8',
+						"--tooltag=nvim-lsp",
-          root_dir = nvim_lspconfig.util.root_pattern('.citc'),
+						"--noforward_sync_responses",
+					},
+					filetypes = {
+						"c",
+						"cpp",
+						"java",
+						"kotlin",
+						"objc",
+						"proto",
+						"textproto",
+						"go",
+						"python",
+						"bzl",
+						"typescript",
+					},
+					offset_encoding = "utf-8",
+					root_dir = nvim_lspconfig.util.root_pattern(".citc"),
 					settings = {},
-        }
+				},
 			}
 
-      nvim_lspconfig.ciderlsp.setup {}
+			nvim_lspconfig.ciderlsp.setup({})
 			-- Godot
 			lspconfig.gdscript.setup({
 				-- flags = {

vim/.vim/lua/plugins/rust.lua

@@ -1,11 +1,10 @@
 return {
+	{ "ron-rs/ron.vim" },
 	{
 		"mrcjkb/rustaceanvim",
 		version = "^5", -- Recommended
 		lazy = false, -- This plugin is already lazy
-		keys = {
+		keys = {},
-			-- { "" },
-		},
 	},
 	{
 		"saecki/crates.nvim",