fix: nixvim removed/renamed options

Lehmanator · Mar 5, 2024 · 468dd42 · 468dd42
1 parent ddf5b1a
commit 468dd42
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 45 deletions.
diff --git a/profiles/nixvim/langs/python.nix b/profiles/nixvim/langs/python.nix
@@ -36,7 +36,7 @@
 
     none-ls.sources = {
       code_actions.statix.enable = true;
-      diagnostics.flake8.enable = true;
+      #diagnostics.flake8.enable = true;
       formatting.black.enable = true;
     };
   };

diff --git a/profiles/nixvim/plugins/emmet.nix b/profiles/nixvim/plugins/emmet.nix
@@ -4,12 +4,11 @@
   pkgs,
   ...
 }: {
-  plugins = {
-    emmet = {
-      enable = false;
-      leader = null;
-      mode = null; # i | n | v | a
-      settings = null;
+  plugins.emmet = {
+    enable = false;
+    settings = {
+      #leader_key = null;
+      #mode = null; # i | n | v | a
     };
   };
 }
diff --git a/profiles/nixvim/plugins/neogit.nix b/profiles/nixvim/plugins/neogit.nix
@@ -1,13 +1,15 @@
-{ inputs
-, ...
-}:
 {
-
+  inputs,
+  config,
+  ...
+}: {
   # TODO: Compare neogit vs. fugitive
   plugins.neogit = {
     enable = true;
-    autoRefresh = true;
-    integrations.diffview = true;
+    settings = {
+      autoRefresh = true;
+      integrations.diffview = config.plugins.diffview.enable;
+    };
 
     #commitPopup.kind = null;
     #disableBuiltinNotifications = null; disableCommitConfirmation = null; disableContextHighlighting = null;
@@ -16,5 +18,4 @@
     #mappings.status = null;
     #useMagitKeybindings = null;
   };
-
 }
diff --git a/profiles/nixvim/plugins/none-ls.nix b/profiles/nixvim/plugins/none-ls.nix
@@ -1,82 +1,77 @@
-{
-  lib,
-  pkgs,
-  config,
-  ...
-}: {
+{ lib, pkgs, config, ... }: {
   # --- null-ls ----------------------
   # Integrate external sources with native nvim LSP
   plugins.none-ls = {
     enable = true;
     enableLspFormat = true;
     #border = lib.mkDefault "rounded"; # none|single|double|rounded|solid|shadow
 
-    diagnosticConfig = {virtual_text = true;};
+    diagnosticConfig = { virtual_text = true; };
 
     # User-defined function(buffer_number) that controls whether to enable null-ls for buffer.
     #shouldAttach = "";
     updateInInsert = false;
 
     sources = {
       code_actions = {
-        eslint.enable = true;
-        eslint_d.enable = true;
+        #eslint.enable = true;
+        #eslint_d.enable = true;
         gitsigns.enable = true;
-        shellcheck.enable = true;
+        #shellcheck.enable = true;
         statix.enable = true;
       };
       diagnostics = {
         alex.enable = true;
         ansiblelint.enable = true;
         cppcheck.enable = true;
         deadnix.enable = false;
-        eslint.enable = true;
-        eslint_d.enable = true;
-        flake8.enable = true;
+        #eslint.enable = true;
+        #eslint_d.enable = true;
+        #flake8.enable = true;
         gitlint.enable = true;
         golangci_lint.enable = true;
         ktlint.enable = true;
-        luacheck.enable = true;
+        #luacheck.enable = true;
         markdownlint.enable = true;
         pylint.enable = true;
-        shellcheck.enable = true;
+        #shellcheck.enable = true;
         staticcheck.enable = true;
         statix.enable = true;
         write_good.enable = true;
         yamllint.enable = true;
       };
       formatting = {
         alejandra.enable = true;
-        beautysh.enable = true;
-        black.enable = true;
-        cbfmt.enable = true;
-        eslint.enable = true;
-        eslint_d.enable = true;
-        fnlfmt.enable = true;
-        fourmolu.enable = true;
+        #beautysh.enable = true;
+        #black.enable = true;
+        #cbfmt.enable = true;
+        ##eslint.enable = true;
+        ##eslint_d.enable = true;
+        #fnlfmt.enable = true;
+        ##fourmolu.enable = true;
         gofmt.enable = true;
         goimports.enable = true;
         golines.enable = true;
         isort.enable = true;
-        jq.enable = true;
+        ##jq.enable = true;
         ktlint.enable = true;
         markdownlint.enable = true;
         nixfmt.enable = true;
         nixpkgs_fmt.enable = true;
-        phpcbf.enable = true;
+        #phpcbf.enable = true;
         prettier = {
           enable = true;
           disableTsServerFormatter = true;
         };
-        rustfmt.enable = true;
+        ##rustfmt.enable = true;
         shfmt.enable = true;
-        #sqlfluff.enable=true; # Broken as of 1/15/23: failing dep=python3.11-diff-cover-8.0.1
+        ##sqlfluff.enable=true; # Broken as of 1/15/23: failing dep=python3.11-diff-cover-8.0.1
         stylua.enable = true;
-        taplo.enable = true;
-        trim_newlines.enable = true;
-        trim_whitespace.enable = true;
-        fantomas.enable = false;
-        fantomas.package = null;
+        ##taplo.enable = true;
+        ##trim_newlines.enable = true;
+        #trim_whitespace.enable = true;
+        #fantomas.enable = false;
+        #fantomas.package = null;
       };
     };
   };