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

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

@@ -1,29 +0,0 @@
-return {
-  "yetone/avante.nvim",
-  event = "VeryLazy",
-  lazy = false,
-  version = false, -- Set this to "*" to always pull the latest release version, or set it to false to update to the latest code changes.
-  opts = {
-    provider = "claude",
-  },
-  -- if you want to build from source then do `make BUILD_FROM_SOURCE=true`
-  build = "make",
-  -- build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false" -- for windows
-  dependencies = {
-    "stevearc/dressing.nvim",
-    "nvim-lua/plenary.nvim",
-    "MunifTanjim/nui.nvim",
-    --- The below dependencies are optional,
-    "nvim-telescope/telescope.nvim", -- for file_selector provider telescope
-    "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions
-    "nvim-tree/nvim-web-devicons",
-    {
-      -- Make sure to set this up properly if you have lazy=true
-      "MeanderingProgrammer/render-markdown.nvim",
-      opts = {
-        file_types = { "markdown", "Avante" },
-      },
-      ft = { "markdown", "Avante" },
-    },
-  },
-}

home/modules/nvim/config/lua/plugins/fzf-lua.lua

@@ -0,0 +1,5 @@
+return {
+  "ibhagwan/fzf-lua",
+  dependencies = { "nvim-tree/nvim-web-devicons" },
+  opts = {},
+}

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

@@ -0,0 +1,9 @@
+return {
+  "NeogitOrg/neogit",
+  dependencies = {
+    "nvim-lua/plenary.nvim",
+    "sindrets/diffview.nvim",
+    "ibhagwan/fzf-lua",
+  },
+  config = true,
+}

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

@@ -1,20 +0,0 @@
-return {
-  "nvim-telescope/telescope.nvim",
-  tag = "0.1.8",
-  dependencies = {
-    "nvim-lua/plenary.nvim",
-    {
-      "nvim-telescope/telescope-fzf-native.nvim",
-      build = "cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release && cmake --build build --config Release && cmake --install build --prefix build",
-    },
-  },
-  opts = {
-    pickers = {},
-    extensions = {
-      fzf = {},
-    },
-  },
-  init = function()
-    require("telescope").load_extension("fzf")
-  end,
-}

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

@@ -5,9 +5,9 @@ return {
     icons = { mappings = false },
   },
   keys = {
-    { "<leader>.", "<cmd>Telescope find_files<cr>", desc = "Find file in dir", mode = "n" },
+    { "<leader>.", "<cmd>FzfLua files<cr>", desc = "Find file in dir", mode = "n" },
-    { "<leader><leader>", "<cmd>Telescope git_files<cr>", desc = "Find git file", mode = "n" },
+    { "<leader><leader>", "<cmd>FzfLua git_files<cr>", desc = "Find git file", mode = "n" },
-    { "<leader>B", "<cmd>Telescope buffers<cr>", desc = "Opens buffers", mode = "n" },
+    { "<leader>B", "<cmd>FzfLua buffers<cr>", desc = "Opens buffers", mode = "n" },
     { "<leader>b", group = "buffer", mode = "n" },
     { "<leader>b,", "<Cmd>BufferMovePrevious<CR>", desc = "Move buffer back", mode = "n" },
     {
@@ -48,11 +48,11 @@ return {
       mode = "n",
     },
     { "<leader>c", group = "code", mode = "n" },
-    { "<leader>ca", ":lua vim.lsp.buf.code_action()<cr>", desc = "Code actions", mode = "n" },
+    { "<leader>ca", "<cmd>FzfLua lsp_code_actions", desc = "Code actions", mode = "n" },
-    { "<leader>cd", ":lua require'telescope.builtin'.diagnostics{}<cr>", desc = "Show diagnostics", mode = "n" },
+    { "<leader>cd", "<cmd>FzfLua lsp_diagnostics_document<cr>", desc = "Show diagnostics", mode = "n" },
     {
       "<leader>cf",
-      ":lua require'telescope.builtin'.builtin.lsp_references{}<cr>",
+      "<cmd>FzfLua lsp_references<cr>",
       desc = "Show references",
       mode = "n",
     },
@@ -69,7 +69,7 @@ return {
       desc = "Create a new file",
       mode = "n",
     },
-    { "<leader>fr", "<cmd>Telescope oldfiles<cr>", desc = "Open Recent File", mode = "n" },
+    { "<leader>fr", "<cmd>FzfLua oldfiles<cr>", desc = "Open Recent File", mode = "n" },
     {
       "<leader>fs",
       "<cmd>w<cr>",
@@ -99,23 +99,22 @@ return {
     },
     { "<leader>q", "<cmd>qa!<cr>", desc = "Leave neovim", mode = "n" },
     { "<leader>s", group = "search", mode = "n" },
-    { "<leader>sb", ":lua require'telescope.builtin'.buffers{}<cr>", desc = "Find buffer", mode = "n" },
+    { "<leader>ss", "<cmd>FzfLua live_grep_native<CR>", desc = "Live Grep", mode = "n" },
-    { "<leader>ss", "<cmd>Telescope live_grep<CR>", desc = "Live Grep", mode = "n" },
+    { "<leader>sp", "<cmd>FzfLua grep_project<CR>", desc = "Grep in project", mode = "n" },
     {
       "<leader>sw",
-      "<cmd>Telescope grep_string<cr>",
+      "<cmd>FzfLua grep_cword<cr>",
       desc = "Search current word",
       mode = "n",
     },
     { "<leader>t", group = "diagnostics (lsp)", mode = "n" },
     {
       "<leader>td",
-      "<cmd>Telescope diagnostics<cr>",
+      "<cmd>FzfLua lsp_diagnostics_document<cr>",
       desc = "Show LSP diagnostics",
       mode = "n",
     },
     { "<leader>ta", "<cmd>TodoQuickFix<cr>", desc = "Show all todo comments", mode = "n" },
-    { "<leader>tt", "<cmd>TodoTelescope<cr>", desc = "Show all todo comments (Telescope)", mode = "n" },
     { "<leader>w", group = "window", mode = "n" },
     {
       "<leader>w+",
@@ -180,5 +179,7 @@ return {
     },
     { "<leader>xr", "<cmd>source $MYVIMRC<cr>", desc = "Reload config", mode = "n" },
     { "<leader>z", "<cmd>ZenMode<cr>", desc = "Toggle ZenMode", mode = "n" },
+    { "<leader>do", "<cmd>DiffviewOpen<cr>", desc = "Open diff view", mode = "n" },
+    { "<leader>dh", "<cmd>DiffviewFileHistory<cr>", desc = "Open file history diff", mode = "n" },
   },
 }