Merge remote-tracking branch 'origin/nixos' into nixos

modules/programs/nvim/default.nix

@@ -22,6 +22,12 @@ let
     version = mkVersionInput inputs.nvim-treesitter-textsubjects;
     src = inputs.nvim-treesitter-textsubjects;
   };
+
+  smartcolumn-nvim = pkgs.vimUtils.buildVimPluginFrom2Nix {
+    pname = "smartcolumn-nvim";
+    version = mkVersionInput inputs.smartcolumn-nvim;
+    src = inputs.smartcolumn-nvim;
+  };
 in
 {
   options.my.programs.vim = {
@@ -83,6 +89,8 @@ in
         nvim-web-devicons # for dashboard-nvim
         orgmode
         plenary-nvim # for telescope, neogit
+        smartcolumn-nvim
+        telescope-fzf-native-nvim
         telescope-nvim
         vim-lion
         which-key-nvim

modules/programs/nvim/init.lua

@@ -75,6 +75,9 @@ wk.register({
     b = { "<cmd>Telescope buffers<cr>", "find buffer" },
   },
 }, { prefix = "<leader>" })
+-- To get fzf loaded and working with telescope, you need to call
+-- load_extension, somewhere after setup function:
+require("telescope").load_extension("fzf")
 
 require("neogit").setup({
   disable_commit_confirmation = true,
@@ -100,8 +103,8 @@ cmp.setup({
   formatting = {
     format = lspkind.cmp_format({
       mode = "symbol", -- show only symbol annotations
-      maxwidth = 50, -- prevent the popup from showing more than provided characters (e.g 50 will not show more than 50 characters)
-      ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead (must define maxwidth first)
+      maxwidth = 50, -- prevent the popup from showing more than provided characters
+      ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead
       symbol_map = {
         Copilot = "",
       },
@@ -118,7 +121,7 @@ cmp.setup({
     ["<C-f>"] = cmp.mapping.scroll_docs(4),
     ["<C-Space>"] = cmp.mapping.complete(),
     ["<C-e>"] = cmp.mapping.abort(),
-    ["<CR>"] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+    ["<CR>"] = cmp.mapping.confirm({ select = true }),
     ["<Tab>"] = cmp.mapping(function(fallback)
       if cmp.visible() then
         cmp.select_next_item()
@@ -447,3 +450,7 @@ require("nvim-tree").setup()
 wk.register({
   t = { "<cmd>NvimTreeFindFileToggle<cr>", "nvim tree" },
 }, { prefix = "<leader>t", silent = true })
+
+require("smartcolumn").setup({
+  colorcolumn = 120,
+})