bump inputs

config/plugins/cmp/cmp.nix

@@ -20,7 +20,7 @@
       mapping = {
         "<C-Tab>" = "cmp.mapping(cmp.mapping.select_next_item(), {'i', 's'})";
         "<C-e>" = "cmp.mapping.select_next_item()";
-        "<C-o>" = "cmp.mapping.select_prev_item()";
+        "<C-n>" = "cmp.mapping.select_prev_item()";
         "<C-esc>" = "cmp.mapping.abort()";
         "<C-b>" = "cmp.mapping.scroll_docs(-4)";
         "<C-f>" = "cmp.mapping.scroll_docs(4)";

config/plugins/lsp/conform.nix

@@ -2,20 +2,23 @@
   plugins.conform-nvim = {
     enable = true;
 
-    # Run the formatter on file save.
-    formatOnSave = {
-      lspFallback = true;
-      timeoutMs = 500;
-    };
-    # Receive notificaton when a formatter errors.
-    notifyOnError = true;
+    settings = {
+      # Run the formatter on file save.
+      format_on_save = {
+        lspFallback = true;
+        timeoutMs = 500;
+      };
 
-    # Map of filetype to formatters.
-    formattersByFt = {
-      c = ["clang-format"];
-      haskell = ["stylish-haskell"];
-      lua = ["stylua"];
-      nix = ["alejandra"];
+      # Map of filetype to formatters.
+      formattersByFt = {
+        c = ["clang-format"];
+        haskell = ["stylish-haskell"];
+        lua = ["stylua"];
+        nix = ["alejandra"];
+      };
+
+      # Receive notificaton when a formatter errors.
+      notifyOnError = true;
     };
   };
 

config/plugins/lsp/lsp.nix

@@ -9,19 +9,20 @@
         enable = true;
       };
       # Clojure
-      clojure-lsp = {
+      clojure_lsp = {
         enable = true;
       };
       # Haskell
       hls = {
         enable = true;
+        installGhc = true;
       };
       # Lua
-      lua-ls = {
+      lua_ls = {
         enable = true;
       };
       # Nix
-      nil-ls = {
+      nil_ls = {
         enable = true;
       };
       # YAML

config/plugins/snippets/luasnip.nix

@@ -1,7 +1,7 @@
 {...}: {
   plugins.luasnip = {
     enable = true;
-    extraConfig = {
+    settings = {
       enable_autosnippets = true;
       store_selection_keys = "<Tab>";
     };

config/plugins/ui/lualine.nix

@@ -1,67 +1,66 @@
 {...}: {
   plugins.lualine = {
     enable = true;
-    globalstatus = true;
-    theme = "gruvbox-material";
 
-    # Load our extensions
-    extensions = [
-      "neo-tree"
-    ];
+    settings = {
+      options = {
+        globalstatus = true;
+        theme = "gruvbox-material";
 
-    # Icons for our separators
-    componentSeparators = {
-      left = "";
-      right = "";
-    };
-    sectionSeparators = {
-      left = "";
-      right = "";
-    };
+        # Icons for our separators
+        componentSeparators = {
+          left = "";
+          right = "";
+        };
 
-    # Display components in tabline
-    tabline = {
-      lualine_a = [{name = "buffers";}];
-      lualine_x = [{name = "hostname";}];
-      lualine_z = [{name = "encoding";}];
-    };
+        sectionSeparators = {
+          left = "";
+          right = "";
+        };
+      };
 
-    # Lualine has sections as shown below
-    # +-------------------------------------------------+
-    # | A | B | C                             X | Y | Z |
-    # +-------------------------------------------------+
-    sections = {
-      # Section A
-      lualine_a = [{name = "mode";}];
+      # Display components in tabline
+      tabline = {
+        lualine_a = [{__unkeyed-1 = "buffers";}];
+        lualine_x = [{__unkeyed-1 = "hostname";}];
+        lualine_z = [{__unkeyed-1 = "encoding";}];
+      };
 
-      # Section B
-      lualine_b = [
-        # Git branch
-        {
-          name = "branch";
-          icon = "";
-        }
+      # Lualine has sections as shown below
+      # +-------------------------------------------------+
+      # | A | B | C                             X | Y | Z |
+      # +-------------------------------------------------+
+      sections = {
+        # Section A
+        lualine_a = [{__unkeyed-1 = "mode";}];
 
-        # Git diff status
-        {
-          name = "diff";
-          extraConfig.symbols = {
-            added = "+";
-            modified = "~";
-            removed = "-";
-          };
-        }
-      ];
+        # Section B
+        lualine_b = [
+          # Git branch
+          {
+            __unkeyed-1 = "branch";
+            icon = "";
+          }
 
-      # Section C
-      lualine_c = [{name = "filename";}];
+          # Git diff status
+          {
+            __unkeyed-1 = "diff";
+            symbols = {
+              added = "+";
+              modified = "~";
+              removed = "-";
+            };
+          }
+        ];
 
-      # Section X
-      lualine_x = [
-        # Diagnostic count from nvim_lsp
-        {
-          name = "diagnostics";
-          extraConfig = {
+        # Section C
+        lualine_c = [{__unkeyed-1 = "filename";}];
+
+        # Section X
+        lualine_x = [
+          # Diagnostic count from nvim_lsp
+          {
+            __unkeyed-1 = "diagnostics";
             sources = ["nvim_lsp"];
             symbols = {
               error = "error:";
@@ -69,15 +68,20 @@
               info = "info:";
               hint = "hint:";
             };
-          };
-        }
+          }
+        ];
+
+        # Section Y
+        lualine_y = [{__unkeyed-1 = "progress";}];
+
+        # Section Z
+        lualine_z = [{__unkeyed-1 = "location";}];
+      };
+
+      # Load our extensions
+      extensions = [
+        "neo-tree"
       ];
-
-      # Section Y
-      lualine_y = [{name = "progress";}];
-
-      # Section Z
-      lualine_z = [{name = "location";}];
     };
   };
 }