diff options
| -rw-r--r-- | kitty/.config/kitty/current-theme.conf | 2 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/astronvim/mappings.lua | 36 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/configs/notify.lua | 4 | ||||
| -rw-r--r-- | nvim/.config/nvim/lua/plugins/heirline.lua | 31 |
4 files changed, 40 insertions, 33 deletions
diff --git a/kitty/.config/kitty/current-theme.conf b/kitty/.config/kitty/current-theme.conf index 02e44b1..348ab67 100644 --- a/kitty/.config/kitty/current-theme.conf +++ b/kitty/.config/kitty/current-theme.conf @@ -10,7 +10,7 @@ # The basic colors foreground #CDD6F4 -background #000011 +background #101010 selection_foreground #1E1E2E selection_background #F5E0DC diff --git a/nvim/.config/nvim/lua/astronvim/mappings.lua b/nvim/.config/nvim/lua/astronvim/mappings.lua index 7301d7b..5494b34 100644 --- a/nvim/.config/nvim/lua/astronvim/mappings.lua +++ b/nvim/.config/nvim/lua/astronvim/mappings.lua @@ -49,7 +49,7 @@ maps.n["<leader>pl"] = { "<cmd>AstroChangelog<cr>", desc = "AstroNvim Changelog" maps.n["<leader>c"] = { function() require("astronvim.utils.buffer").close() end, desc = "Close buffer" } maps.n["<leader>C"] = { function() require("astronvim.utils.buffer").close(0, true) end, desc = "Force close buffer" } maps.n["]b"] = - { function() require("astronvim.utils.buffer").nav(vim.v.count > 0 and vim.v.count or 1) end, desc = "Next buffer" } +{ function() require("astronvim.utils.buffer").nav(vim.v.count > 0 and vim.v.count or 1) end, desc = "Next buffer" } maps.n["[b"] = { function() require("astronvim.utils.buffer").nav(-(vim.v.count > 0 and vim.v.count or 1)) end, desc = "Previous buffer", @@ -65,7 +65,7 @@ maps.n["<b"] = { maps.n["<leader>b"] = sections.b maps.n["<leader>bc"] = - { function() require("astronvim.utils.buffer").close_all(true) end, desc = "Close all buffers except current" } +{ function() require("astronvim.utils.buffer").close_all(true) end, desc = "Close all buffers except current" } maps.n["<leader>bC"] = { function() require("astronvim.utils.buffer").close_all() end, desc = "Close all buffers" } maps.n["<leader>bb"] = { function() @@ -82,20 +82,20 @@ maps.n["<leader>bd"] = { desc = "Delete buffer from tabline", } maps.n["<leader>bl"] = - { function() require("astronvim.utils.buffer").close_left() end, desc = "Close all buffers to the left" } +{ function() require("astronvim.utils.buffer").close_left() end, desc = "Close all buffers to the left" } maps.n["<leader>br"] = - { function() require("astronvim.utils.buffer").close_right() end, desc = "Close all buffers to the right" } +{ function() require("astronvim.utils.buffer").close_right() end, desc = "Close all buffers to the right" } maps.n["<leader>bs"] = sections.bs maps.n["<leader>bse"] = - { function() require("astronvim.utils.buffer").sort "extension" end, desc = "Sort by extension (buffers)" } +{ function() require("astronvim.utils.buffer").sort "extension" end, desc = "Sort by extension (buffers)" } maps.n["<leader>bsr"] = - { function() require("astronvim.utils.buffer").sort "unique_path" end, desc = "Sort by relative path (buffers)" } +{ function() require("astronvim.utils.buffer").sort "unique_path" end, desc = "Sort by relative path (buffers)" } maps.n["<leader>bsp"] = - { function() require("astronvim.utils.buffer").sort "full_path" end, desc = "Sort by full path (buffers)" } +{ function() require("astronvim.utils.buffer").sort "full_path" end, desc = "Sort by full path (buffers)" } maps.n["<leader>bsi"] = - { function() require("astronvim.utils.buffer").sort "bufnr" end, desc = "Sort by buffer number (buffers)" } +{ function() require("astronvim.utils.buffer").sort "bufnr" end, desc = "Sort by buffer number (buffers)" } maps.n["<leader>bsm"] = - { function() require("astronvim.utils.buffer").sort "modified" end, desc = "Sort by modification (buffers)" } +{ function() require("astronvim.utils.buffer").sort "modified" end, desc = "Sort by modification (buffers)" } maps.n["<leader>b\\"] = { function() require("astronvim.utils.status").heirline.buffer_picker(function(bufnr) @@ -140,7 +140,7 @@ if is_available "Comment.nvim" then desc = "Comment line", } maps.v["<leader>/"] = - { "<esc><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<cr>", desc = "Toggle comment line" } + { "<esc><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<cr>", desc = "Toggle comment line" } end -- GitSigns @@ -182,7 +182,7 @@ if is_available "neovim-session-manager" then maps.n["<leader>Sd"] = { "<cmd>SessionManager! delete_session<cr>", desc = "Delete session" } maps.n["<leader>Sf"] = { "<cmd>SessionManager! load_session<cr>", desc = "Search sessions" } maps.n["<leader>S."] = - { "<cmd>SessionManager! load_current_dir_session<cr>", desc = "Load current directory session" } + { "<cmd>SessionManager! load_current_dir_session<cr>", desc = "Load current directory session" } end if is_available "resession.nvim" then maps.n["<leader>S"] = sections.S @@ -243,11 +243,11 @@ if is_available "telescope.nvim" then function() local cwd = vim.fn.stdpath "config" .. "/.." local search_dirs = {} - for _, dir in ipairs(astronvim.supported_configs) do -- search all supported config locations - if dir == astronvim.install.home then dir = dir .. "/lua/user" end -- don't search the astronvim core files + for _, dir in ipairs(astronvim.supported_configs) do -- search all supported config locations + if dir == astronvim.install.home then dir = dir .. "/lua/user" end -- don't search the astronvim core files if vim.fn.isdirectory(dir) == 1 then table.insert(search_dirs, dir) end -- add directory to search if exists end - if vim.tbl_isempty(search_dirs) then -- if no config folders found, show warning + if vim.tbl_isempty(search_dirs) then -- if no config folders found, show warning utils.notify("No user configuration files found", vim.log.levels.WARN) else if #search_dirs == 1 then cwd = search_dirs[1] end -- if only one directory, focus cwd @@ -262,7 +262,7 @@ if is_available "telescope.nvim" then } maps.n["<leader>fb"] = { function() require("telescope.builtin").buffers() end, desc = "Find buffers" } maps.n["<leader>fc"] = - { function() require("telescope.builtin").grep_string() end, desc = "Find for word under cursor" } + { function() require("telescope.builtin").grep_string() end, desc = "Find for word under cursor" } maps.n["<leader>fC"] = { function() require("telescope.builtin").commands() end, desc = "Find commands" } maps.n["<leader>ff"] = { function() require("telescope.builtin").find_files() end, desc = "Find files" } maps.n["<leader>fF"] = { @@ -274,12 +274,12 @@ if is_available "telescope.nvim" then maps.n["<leader>fm"] = { function() require("telescope.builtin").man_pages() end, desc = "Find man" } if is_available "nvim-notify" then maps.n["<leader>fn"] = - { function() require("telescope").extensions.notify.notify() end, desc = "Find notifications" } + { function() require("telescope").extensions.notify.notify() end, desc = "Find notifications" } end maps.n["<leader>fo"] = { function() require("telescope.builtin").oldfiles() end, desc = "Find history" } maps.n["<leader>fr"] = { function() require("telescope.builtin").registers() end, desc = "Find registers" } maps.n["<leader>ft"] = - { function() require("telescope.builtin").colorscheme { enable_preview = true } end, desc = "Find themes" } + { function() require("telescope.builtin").colorscheme { enable_preview = true } end, desc = "Find themes" } maps.n["<leader>fw"] = { function() require("telescope.builtin").live_grep() end, desc = "Find words" } maps.n["<leader>fW"] = { function() @@ -337,7 +337,7 @@ if is_available "nvim-dap" then maps.v["<leader>d"] = sections.d -- modified function keys found with `showkey -a` in the terminal to get key code -- run `nvim -V3log +quit` and search through the "Terminal info" in the `log` file for the correct keyname - maps.n["<F5>"] = { function() require("dap").continue() end, desc = "Debugger: Start" } + maps.n["<F1>"] = { function() require("dap").continue() end, desc = "Debugger: Start" } maps.n["<F17>"] = { function() require("dap").terminate() end, desc = "Debugger: Stop" } -- Shift+F5 maps.n["<F21>"] = { function() diff --git a/nvim/.config/nvim/lua/plugins/configs/notify.lua b/nvim/.config/nvim/lua/plugins/configs/notify.lua index 84bf6c2..53bb559 100644 --- a/nvim/.config/nvim/lua/plugins/configs/notify.lua +++ b/nvim/.config/nvim/lua/plugins/configs/notify.lua @@ -1,5 +1,7 @@ return function(_, opts) local notify = require "notify" - notify.setup(opts) + notify.setup({ + background_colour = "#000000" + }) vim.notify = notify end diff --git a/nvim/.config/nvim/lua/plugins/heirline.lua b/nvim/.config/nvim/lua/plugins/heirline.lua index 5537d9b..57496df 100644 --- a/nvim/.config/nvim/lua/plugins/heirline.lua +++ b/nvim/.config/nvim/lua/plugins/heirline.lua @@ -12,7 +12,8 @@ return { }, args.buf) end, }, - statusline = { -- statusline + statusline = { + -- statusline hl = { fg = "fg", bg = "bg" }, status.component.mode(), status.component.git_branch(), @@ -27,7 +28,8 @@ return { status.component.nav(), status.component.mode { surround = { separator = "right" } }, }, - winbar = { -- winbar + winbar = { + -- winbar init = function(self) self.bufnr = vim.api.nvim_get_current_buf() end, fallthrough = false, { @@ -45,7 +47,8 @@ return { status.component.breadcrumbs { hl = status.hl.get_attributes("winbar", true) }, }, tabline = { -- bufferline - { -- file tree padding + { + -- file tree padding condition = function(self) self.winid = vim.api.nvim_tabpage_list_wins(0)[1] return status.condition.buffer_matches( @@ -56,15 +59,17 @@ return { provider = function(self) return string.rep(" ", vim.api.nvim_win_get_width(self.winid) + 1) end, hl = { bg = "tabline_bg" }, }, - status.heirline.make_buflist(status.component.tabline_file_info()), -- component for each buffer tab - status.component.fill { hl = { bg = "tabline_bg" } }, -- fill the rest of the tabline with background color - { -- tab list + status.heirline.make_buflist(status.component.tabline_file_info()), -- component for each buffer tab + status.component.fill { hl = { bg = "tabline_bg" } }, -- fill the rest of the tabline with background color + { + -- tab list condition = function() return #vim.api.nvim_list_tabpages() >= 2 end, -- only show tabs if there are more than one - status.heirline.make_tablist { -- component for each tab + status.heirline.make_tablist { -- component for each tab provider = status.provider.tabnr(), hl = function(self) return status.hl.get_attributes(status.heirline.tab_type(self, "tab"), true) end, }, - { -- close button for current tab + { + -- close button for current tab provider = status.provider.close_button { kind = "TabClose", padding = { left = 1, right = 1 } }, hl = status.hl.get_attributes("tab_close", true), on_click = { @@ -75,11 +80,11 @@ return { }, }, statuscolumn = vim.fn.has "nvim-0.9" == 1 and { - status.component.foldcolumn(), - status.component.fill(), - status.component.numbercolumn(), - status.component.signcolumn(), - } or nil, + status.component.foldcolumn(), + status.component.fill(), + status.component.numbercolumn(), + status.component.signcolumn(), + } or nil, } end, config = require "plugins.configs.heirline", |