diff --git a/after/plugin/colors.lua b/after/plugin/colors.lua index 34cc10f..a7937f6 100644 --- a/after/plugin/colors.lua +++ b/after/plugin/colors.lua @@ -1,18 +1,54 @@ -function ColorMyPencils(color) - color = color or "rose-pine" - vim.cmd.colorscheme(color) - - vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) - vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) - -end - function LineNumberColors() - vim.api.nvim_set_hl(0, 'LineNrAbove', { fg='#51B3EC', bold=true}) + vim.api.nvim_set_hl(0, 'LineNrAbove', { fg='#51B3EC', bold=true }) vim.api.nvim_set_hl(0, 'LineNr', { fg='white', bold=true }) - vim.api.nvim_set_hl(0, 'LineNrBelow', { fg='#FB508F', bold=true}) + vim.api.nvim_set_hl(0, 'LineNrBelow', { fg='#FB508F', bold=true }) vim.o.signcolumn = "auto" + vim.o.numberwidth = 1 end --- ColorMyPencils() -LineNumberColors() +--local function set_terminal_mode_statuscolumn() +-- vim.wo.relativenumber = true +-- vim.wo.number = true +-- vim.wo.statuscolumn = [[%=%{&number ? (v:relnum == 0 ? '~' : printf('%1d', v:relnum)) : ''}]] +--end +-- +---- Function to reset status column back to default +--local function reset_normal_mode_statuscolumn() +-- vim.wo.relativenumber = true +-- vim.wo.number = true +-- --vim.wo.statuscolumn = [[%=%{v:relnum ? printf('%1d', v:relnum) : printf('%1d', v:lnum)}]] +-- --vim.wo.statuscolumn = [[%=%{&number ? (v:relnum == 0 ? printf('%1d', v:lnum) : printf('%1d', v:relnum)) : ''}]] +-- vim.wo.statuscolumn = [[%=%{printf('1%d', v:relnum)}]] +--end +-- +--vim.api.nvim_create_augroup('TerminalModeStatusColumn', { clear = true }) +-- +--vim.api.nvim_create_autocmd('TermEnter', { +-- group = 'TerminalModeStatusColumn', +-- pattern = '*', +-- callback = function() +-- LineNumberColors() +-- set_terminal_mode_statuscolumn() +-- end +--}) +-- +--vim.api.nvim_create_autocmd('TermLeave', { +-- group = 'TerminalModeStatusColumn', +-- pattern = '*', +-- callback = function() +-- LineNumberColors() +-- reset_normal_mode_statuscolumn() +-- end +--}) +-- +--vim.api.nvim_create_autocmd('CursorMoved', { +-- group = 'TerminalModeStatusColumn', +-- pattern = '*', +-- callback = function() +-- if vim.bo.buftype == 'terminal' then +-- set_terminal_mode_statuscolumn() +-- end +-- end, +--}) + +--LineNumberColors() diff --git a/after/plugin/various.lua b/after/plugin/various.lua deleted file mode 100644 index c216277..0000000 --- a/after/plugin/various.lua +++ /dev/null @@ -1 +0,0 @@ -vim.opt.clipboard = "unnamed,unnamedplus" diff --git a/lazy-lock.json b/lazy-lock.json index 04d439d..d97a93e 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -24,5 +24,6 @@ "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, "vim-fugitive": { "branch": "master", "commit": "ce882460cf3db12e99f8bf579cbf99e331f6dd4f" }, "vim-vinegar": { "branch": "master", "commit": "bb1bcddf43cfebe05eb565a84ab069b357d0b3d6" }, + "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" }, "wrapping.nvim": { "branch": "master", "commit": "d1ac69c0db82ff0c7540088a0f91d74ad7378c3d" } } \ No newline at end of file diff --git a/lua/juliuswaldmann/init.lua b/lua/juliuswaldmann/init.lua index 1934082..9f24330 100644 --- a/lua/juliuswaldmann/init.lua +++ b/lua/juliuswaldmann/init.lua @@ -1,3 +1,4 @@ require("juliuswaldmann.remap") require("juliuswaldmann.set") require("juliuswaldmann.lazynvim") +require("juliuswaldmann.statuscolumn") diff --git a/lua/juliuswaldmann/lazynvim.lua b/lua/juliuswaldmann/lazynvim.lua index 771884d..963a0d5 100644 --- a/lua/juliuswaldmann/lazynvim.lua +++ b/lua/juliuswaldmann/lazynvim.lua @@ -132,6 +132,13 @@ return lazy.setup({ require("wrapping").setup() end }, + { + "gelguy/wilder.nvim", + config = function () + local wilder = require('wilder') + wilder.setup({modes = {':', '/', '?'}}) + end, + }, -- Uncomment these lines if you want to use the plugins -- use 'nvim-tree/nvim-tree.lua' -- use 'nvim-tree/nvim-web-devicons' diff --git a/lua/juliuswaldmann/set.lua b/lua/juliuswaldmann/set.lua index ef41b27..c625a09 100644 --- a/lua/juliuswaldmann/set.lua +++ b/lua/juliuswaldmann/set.lua @@ -23,14 +23,13 @@ vim.opt.incsearch = true vim.opt.termguicolors = true vim.opt.scrolloff = 8 -vim.opt.signcolumn = "auto" vim.opt.isfname:append("@-@") vim.opt.updatetime = 50 vim.opt.colorcolumn = "80" -vim.opt.clipboard = "unnamedplus" +vim.opt.clipboard = "unnamed,unnamedplus" vim.opt.foldmethod = "expr" vim.opt.foldexpr = "nvim_treesitter#foldexpr()" diff --git a/lua/juliuswaldmann/statuscolumn.lua b/lua/juliuswaldmann/statuscolumn.lua new file mode 100644 index 0000000..67c6e27 --- /dev/null +++ b/lua/juliuswaldmann/statuscolumn.lua @@ -0,0 +1,38 @@ +vim.api.nvim_set_hl(0, 'LineNrAbove', { fg='#51B3EC', bold=true }) +vim.api.nvim_set_hl(0, 'LineNr', { fg='white', bold=true }) +vim.api.nvim_set_hl(0, 'LineNrBelow', { fg='#FB508F', bold=true }) + +vim.o.signcolumn = "auto" +vim.o.numberwidth = 1 + +local function is_terminal_window() + local buftype = vim.api.nvim_buf_get_option(0, "buftype") + return buftype == "terminal" +end + +local function is_in_file_explorer_mode() + local filetype = vim.bo.filetype + return filetype == 'netrw' +end + +LineNumbers = function () + if vim.v.relnum == 0 then + if is_terminal_window() then + return "~" + end + -- if not terminal mode + return vim.v.lnum .. " " + end + + return "%=" .. vim.v.relnum + +end + +MyStatusColumn = function() + if not is_in_file_explorer_mode() then + return LineNumbers() .. " " --margin after line numbers + end + return "" +end + +vim.o.statuscolumn = "%!v:lua.MyStatusColumn()";