Merge branch 'main' of codeberg.org:dnscio/nix-config

home/modules/nvim/config/lua/plugins/harpoon.lua

@@ -0,0 +1,36 @@
+return {
+  "ThePrimeagen/harpoon",
+  branch = "harpoon2",
+  dependencies = { "nvim-lua/plenary.nvim" },
+  config = function()
+    local harpoon = require("harpoon")
+
+    harpoon:setup()
+
+    -- Keybindings
+    vim.keymap.set("n", "<leader>hs", function()
+      harpoon.ui:toggle_quick_menu(harpoon:list())
+    end)
+    vim.keymap.set("n", "<leader>ha", function()
+      harpoon:list():add()
+    end)
+    vim.keymap.set("n", "<leader>hy", function()
+      harpoon:list():select(1)
+    end)
+    vim.keymap.set("n", "<leader>hu", function()
+      harpoon:list():select(2)
+    end)
+    vim.keymap.set("n", "<leader>hi", function()
+      harpoon:list():select(3)
+    end)
+    vim.keymap.set("n", "<leader>ho", function()
+      harpoon:list():select(4)
+    end)
+    vim.keymap.set("n", "<leader>hp", function()
+      harpoon:list():prev()
+    end)
+    vim.keymap.set("n", "<leader>hn", function()
+      harpoon:list():next()
+    end)
+  end,
+}

home/modules/nvim/config/lua/plugins/lualine.lua

@@ -7,13 +7,14 @@ return {
       component_separators = { left = "|", right = "|" },
       section_separators = { left = "", right = "" },
     },
+    winbar = {},
     sections = {
       lualine_a = { "mode" },
-      lualine_b = {},
+      lualine_b = { { "filename", path = 3, color = { gui = "italic" } } },
-      lualine_c = { "branch", "diff", "diagnostics" },
+      lualine_c = {},
-      lualine_x = { "filetype", "encoding" },
+      lualine_x = { "diagnostics", "diff" },
-      lualine_y = {},
+      lualine_y = { "branch" },
-      lualine_z = { "location" },
+      lualine_z = { "location", "encoding" },
     },
   },
 }

home/modules/nvim/config/lua/plugins/which-key.lua

@@ -9,6 +9,7 @@ return {
     { "<leader><leader>", "<cmd>FzfLua git_files<cr>", desc = "Find git file", mode = "n" },
     { "<leader>B", "<cmd>FzfLua buffers<cr>", desc = "Opens buffers", mode = "n" },
     { "<leader>b", group = "buffer", mode = "n" },
+    { "<leader>bb", "<cmd>FzfLua buffers<cr>", desc = "Switches buffers", mode = "n" },
     { "<leader>b,", "<Cmd>BufferMovePrevious<CR>", desc = "Move buffer back", mode = "n" },
     {
       "<leader>b.",
@@ -95,7 +96,7 @@ return {
     },
     {
       "<leader>oj",
-      "<cmd>:vsplit ~/orgnzr/inbox.org | wincmd l<cr>",
+      "<cmd>:vsplit ~/orgnzr/journal.org | wincmd l<cr>",
       desc = "Open journal to the side",
       mode = "n",
     },