neovim/dev.nix

@@ -4,17 +4,15 @@ let
   inherit (lib.mod) ctrl;
   inherit (lib.nix2lua) pipe1 require call call0 nf var;
 
-  mkLineLimiterOpts = limit: {
-    colorcolumn = toString (limit + 1);
-    textwidth = limit;
-  };
-
   mkLineLimiterGroup = { limit, pattern }:
     lib.nameValuePair
       "line-limiter-${toString limit}"
       {
         inherit pattern;
-        opt = mkLineLimiterOpts limit;
+        opt = {
+          colorcolumn = toString limit;
+          textwidth = limit - 1;
+        };
       };
 in
 {
@@ -25,17 +23,11 @@ in
 
   vim.opt = {
     list = true;
-    formatoptions = "tcroqwanljp";
   };
 
-  buffer.filetype = {
-    python-options = {
-      pattern = [ "python" ];
-      opt = { formatoptions = "croqwaljp"; } // mkLineLimiterOpts 90;
-    };
-  } // lib.listToAttrs [
+  buffer.filetype = lib.listToAttrs [
     (mkLineLimiterGroup {
-      limit = 100;
+      limit = 101;
       pattern = [
         "nix"
         "javascript,javascriptreact"
@@ -45,8 +37,9 @@ in
       ];
     })
     (mkLineLimiterGroup {
-      limit = 80;
+      limit = 81;
       pattern = [
+        "python"
         "json"
         "yaml"
         "markdown"
@@ -66,12 +59,6 @@ in
   # Enable fast navigation between windows
   vim.keymap.set = map (k: { mode = "n"; lhs = ctrl k; rhs = "${ctrl "w"}${k}"; }) [ "h" "l" "j" "k" ];
 
-  plugin.nlsp-settings-nvim = {
-    enable = true;
-    name = "nlspsettings";
-    setupSettings = { };
-  };
-
   plugins.style.nvim-treesitter.extraGrammars = {
     tree-sitter-d2 = rec {
       language = "d2";