Merge pull request #82 from RustLover2910/main

Changed the old plugins naming structure to the new one

Author: redyf

config/completion/cmp.nix

@@ -8,8 +8,8 @@
     cmp-cmdline = {enable = false;}; # autocomplete for cmdline
     cmp = {
       enable = true;
-      autoEnableSources = true;
-      extraOptions = {
+      autoEnableSources = false;
+      settings = {
         experimental = {
           ghost_text = true;
         };

config/git/gitsigns.nix

@@ -1,8 +1,10 @@
 {
   plugins.gitsigns = {
     enable = true;
-    trouble = true;
-    currentLineBlame = false;
+    settings = {
+      trouble = true;
+      currentLineBlame = false;
+    };
   };
   keymaps = [
     {

config/sets.nix

@@ -5,7 +5,7 @@
   ...
 }: {
   config = {
-    options = {
+    opts = {
       # Enable relative line numbers
       number = true;
       relativenumber = true;

config/telescope/telescope.nix

@@ -1,13 +1,11 @@
 {
   plugins.telescope = {
     enable = true;
+
     extensions = {
       fzf-native = {
         enable = true;
       };
-      project-nvim = {
-        enable = true;
-      };
       ui-select = {
         settings = {
           specific_opts = {
@@ -20,14 +18,16 @@
       };
     };
     # If you'd prefer Telescope not to enter a normal-like mode when hitting escape (and instead exiting), you can map <Esc> to do so via:
-    defaults = {
-      mappings = {
-        i = {
-          "<esc>" = {
-            __raw = ''
-              function(...)
-                return require("telescope.actions").close(...)
-              end'';
+    settings = {
+      defaults = {
+        mappings = {
+          i = {
+            "<esc>" = {
+              __raw = ''
+                function(...)
+                  return require("telescope.actions").close(...)
+                end'';
+            };
           };
         };
       };

config/ui/indent-blankline.nix

@@ -2,28 +2,30 @@
   plugins = {
     indent-blankline = {
       enable = true;
-      indent = {
-        char = "│"; # "│" or "▎"
-      };
-      scope = {
-        enabled = true;
-        showStart = true;
-      };
-      exclude = {
-        buftypes = ["terminal" "nofile"];
-        filetypes = [
-          "help"
-          "alpha"
-          "dashboard"
-          "neo-tree"
-          "Trouble"
-          "trouble"
-          "lazy"
-          "mason"
-          "notify"
-          "toggleterm"
-          "lazyterm"
-        ];
+      settings = {
+        indent = {
+          char = "│"; # "│" or "▎"
+        };
+        scope = {
+          enabled = true;
+          show_start = true;
+        };
+        exclude = {
+          buftypes = ["terminal" "nofile"];
+          filetypes = [
+            "help"
+            "alpha"
+            "dashboard"
+            "neo-tree"
+            "Trouble"
+            "trouble"
+            "lazy"
+            "mason"
+            "notify"
+            "toggleterm"
+            "lazyterm"
+          ];
+        };
       };
     };
   };

config/utils/markdown-preview.nix

@@ -1,8 +1,10 @@
 {
   plugins.markdown-preview = {
     enable = true;
-    browser = "floorp";
-    theme = "dark";
+    settings = {
+      browser = "floorp";
+      theme = "dark";
+    };
   };
   keymaps = [
     {

config/utils/oil.nix

@@ -1,40 +1,43 @@
 {
   plugins.oil = {
     enable = true;
-    useDefaultKeymaps = true;
-    deleteToTrash = true;
-    viewOptions = {
-      showHidden = true;
-    };
-    float = {
-      padding = 2;
-      maxWidth = 0; # ''math.ceil(vim.o.lines * 0.8 - 4)'';
-      maxHeight = 0; # ''math.ceil(vim.o.columns * 0.8)'';
-      border = "rounded"; # 'single' | 'double' | 'shadow' | 'curved' | ... other options supported by win open
-      winOptions = {
-        winblend = 0;
+    settings = {
+      useDefaultKeymaps = true;
+      deleteToTrash = true;
+      viewOptions = {
+        showHidden = true;
+      };
+      preview = {
+        border = "rounded";
+      };
+
+      float = {
+        padding = 2;
+        maxWidth = 0; # ''math.ceil(vim.o.lines * 0.8 - 4)'';
+        maxHeight = 0; # ''math.ceil(vim.o.columns * 0.8)'';
+        border = "rounded"; # 'single' | 'double' | 'shadow' | 'curved' | ... other options supported by win open
+        winOptions = {
+          winblend = 0;
+        };
+      };
+      keymaps = {
+        "g?" = "actions.show_help";
+        "<CR>" = "actions.select";
+        "<C-\\>" = "actions.select_vsplit";
+        "<C-enter>" = "actions.select_split"; # this is used to navigate left
+        "<C-t>" = "actions.select_tab";
+        "<C-p>" = "actions.preview";
+        "<C-c>" = "actions.close";
+        "<C-r>" = "actions.refresh";
+        "-" = "actions.parent";
+        "_" = "actions.open_cwd";
+        "`" = "actions.cd";
+        "~" = "actions.tcd";
+        "gs" = "actions.change_sort";
+        "gx" = "actions.open_external";
+        "g." = "actions.toggle_hidden";
+        "q" = "actions.close";
       };
-    };
-    preview = {
-      border = "rounded";
-    };
-    keymaps = {
-      "g?" = "actions.show_help";
-      "<CR>" = "actions.select";
-      "<C-\\>" = "actions.select_vsplit";
-      "<C-enter>" = "actions.select_split"; # this is used to navigate left
-      "<C-t>" = "actions.select_tab";
-      "<C-p>" = "actions.preview";
-      "<C-c>" = "actions.close";
-      "<C-r>" = "actions.refresh";
-      "-" = "actions.parent";
-      "_" = "actions.open_cwd";
-      "`" = "actions.cd";
-      "~" = "actions.tcd";
-      "gs" = "actions.change_sort";
-      "gx" = "actions.open_external";
-      "g." = "actions.toggle_hidden";
-      "q" = "actions.close";
     };
   };
   keymaps = [

config/utils/project-nvim.nix

@@ -1,5 +1,6 @@
 {
   plugins.project-nvim = {
     enable = true;
+    enableTelescope = true;
   };
 }

config/utils/undotree.nix

@@ -7,8 +7,10 @@
 }: {
   plugins.undotree = {
     enable = true;
-    autoOpenDiff = true;
-    focusOnToggle = true;
+    settings = {
+      autoOpenDiff = true;
+      focusOnToggle = true;
+    };
   };
   keymaps = [
     {