diff --git a/init.lua b/init.lua index a35063e..36ed009 100644 --- a/init.lua +++ b/init.lua @@ -181,13 +181,13 @@ require('telescope').setup { }, pickers = { find_files = { - theme = "cursor", + theme = "ivy", } }, extensions = { file_browser = { initial_mode = "normal", - theme = "dropdown", + theme = "ivy", hijack_netrw = true }, }, @@ -357,7 +357,7 @@ local servers = { configuration = { runtimes = { name = "JavaSE-17", - path = "/opt/openjdk-bin-17", + path = "/usr/lib/jvm/java-17-openjdk", default = true, } } @@ -400,11 +400,7 @@ mason_lspconfig.setup_handlers { } -- this is for my personal config, i cant bother seeing every TJ's default and changing it to my own require("jabuxas") - -vim.opt.tabstop = 4 -vim.opt.softtabstop = 4 -vim.opt.shiftwidth = 4 +vim.opt.tabstop = 2 +vim.opt.softtabstop = 2 +vim.opt.shiftwidth = 2 vim.opt.expandtab = true - --- The line beneath this is called `modeline`. See `:help modeline` --- vim: ts=4 sts=4 sw=4 et diff --git a/lua/custom/plugins/colorscheme.lua b/lua/custom/plugins/colorscheme.lua index 90fda35..84cefec 100644 --- a/lua/custom/plugins/colorscheme.lua +++ b/lua/custom/plugins/colorscheme.lua @@ -78,6 +78,26 @@ elseif fileContent == "melange" then end, } +elseif fileContent == "solarized" then + colorscheme = { + 'maxmx03/solarized.nvim', + lazy = false, + priority = 1000, + config = function() + vim.o.background = 'dark' -- or 'light' + + require('solarized').setup({ + enables = { + cmp = true, + }, + pallete = "solarized", + theme = "neo", + transparent = true, + }) + + vim.cmd.colorscheme 'solarized' + end, + } else colorscheme = { "bluz71/vim-moonfly-colors", diff --git a/lua/custom/plugins/floating-input.lua b/lua/custom/plugins/floating-input.lua deleted file mode 100644 index af4fabe..0000000 --- a/lua/custom/plugins/floating-input.lua +++ /dev/null @@ -1,4 +0,0 @@ -return { - "liangxianzhe/floating-input.nvim", - opts = {} -} diff --git a/lua/custom/plugins/none-ls.lua b/lua/custom/plugins/none-ls.lua index 9565c62..763dae4 100644 --- a/lua/custom/plugins/none-ls.lua +++ b/lua/custom/plugins/none-ls.lua @@ -11,6 +11,7 @@ return { require("null-ls").builtins.formatting.goimports_reviser, require("null-ls").builtins.formatting.golines, require("null-ls").builtins.diagnostics.golangci_lint, + require("null-ls").builtins.formatting.google_java_format, } } end diff --git a/lua/jabuxas/set.lua b/lua/jabuxas/set.lua index 159d656..8b7dc90 100644 --- a/lua/jabuxas/set.lua +++ b/lua/jabuxas/set.lua @@ -5,9 +5,9 @@ vim.opt.nu = true vim.opt.relativenumber = true vim.opt.clipboard:append({ "unnamedplus" }) -vim.opt.tabstop = 4 -vim.opt.softtabstop = 4 -vim.opt.shiftwidth = 4 +vim.opt.tabstop = 2 +vim.opt.softtabstop = 2 +vim.opt.shiftwidth = 2 vim.opt.expandtab = true vim.opt.smartindent = true