diff --git a/init.lua b/init.lua index a031123..058cc41 100644 --- a/init.lua +++ b/init.lua @@ -3,7 +3,6 @@ require("options") require("config.lazy") require("mappings") require("autocmd") -local time = tonumber( os.date "%H" ) vim.filetype.add({ pattern = { @@ -12,13 +11,7 @@ vim.filetype.add({ } }) -if time >= 10 and time < 16 then - vim.o.background = "light" - vim.cmd[[colorscheme one_light]] -else - vim.o.background = "dark" - vim.cmd[[colorscheme gruvbox]] -end +vim.cmd[[colorscheme gruvbox]] local bg_color = vim.api.nvim_get_hl_by_name('Normal', true).background diff --git a/lua/autocmd.lua b/lua/autocmd.lua index e31fec8..c12fd05 100644 --- a/lua/autocmd.lua +++ b/lua/autocmd.lua @@ -49,3 +49,8 @@ autocmd("VimLeavePre", { vim.cmd([[call chansend(v:stderr, "\033]1337;SetUserVar=NVIM_ENTER=MA==\007")]]) end, }) + +vim.api.nvim_create_autocmd("VimLeave", { + pattern = "*", + command = "set guicursor=a:ver25" +}) diff --git a/lua/config/colorizer.lua b/lua/config/colorizer.lua new file mode 100644 index 0000000..0596e50 --- /dev/null +++ b/lua/config/colorizer.lua @@ -0,0 +1,9 @@ +require("colorizer").setup({ + user_default_options = { + mode = "virtualtext", + css = true, + tailwind = true, + sass = { enable = true, parsers = { "css" }}, + virtualtext_inline = 'before', + }, +}) diff --git a/lua/config/lspconfig.lua b/lua/config/lspconfig.lua index 772211e..d81e552 100644 --- a/lua/config/lspconfig.lua +++ b/lua/config/lspconfig.lua @@ -134,12 +134,3 @@ for _, server in ipairs(servers) do lspconfig[server].setup { } end - --- lspconfig.jdtls.setup { --- cmd = { "jdtls", "-Dfile.encoding=UTF-8" }, --- } - --- lspconfig.java_language_server.setup { --- filetypes = { "java" }, --- cmd = { "/usr/share/java/java-language-server/lang_server_linux.sh" }, --- } diff --git a/lua/config/tmux.lua b/lua/config/tmux.lua new file mode 100644 index 0000000..0fc667b --- /dev/null +++ b/lua/config/tmux.lua @@ -0,0 +1,13 @@ +require("tmux").setup({ + navigation = { + cycle_navigation = true, + enable_default_keybindings = false, + }, + resize = { + enable_default_keybindings = false, + }, + swap = { + cycle_navigation = true, + enable_default_keybindings = false, + } +}) diff --git a/lua/mappings.lua b/lua/mappings.lua index d4e55cf..91c56a2 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -58,3 +58,19 @@ map("n", "mr", "CellularAutomaton make_it_rain"); map("n", "", function() vim.cmd("so") end) + +-- Tmux binds +map("n", "", "lua require('tmux').move_left()") +map("n", "", "lua require('tmux').move_bottom()") +map("n", "", "lua require('tmux').move_top()") +map("n", "", "lua require('tmux').move_right()") + +map("n", "", "lua require('tmux').resize_left()") +map("n", "", "lua require('tmux').resize_bottom()") +map("n", "", "lua require('tmux').resize_top()") +map("n", "", "lua require('tmux').resize_right()") + +map("n", "", "lua require('tmux').swap_left()") +map("n", "", "lua require('tmux').swap_bottom()") +map("n", "", "lua require('tmux').swap_top()") +map("n", "", "lua require('tmux').swap_right()") diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index c90f187..e547581 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -199,4 +199,16 @@ return { require("config.harpoon") end, }, + { + "aserowy/tmux.nvim", + config = function() + require("config.tmux") + end, + }, + { + "catgoose/nvim-colorizer.lua", + config = function() + require("config.colorizer") + end, + }, }