From 63f6aa75be2da364e5c883d50be56754bcd5103f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Wed, 9 Oct 2024 03:05:03 +0200
Subject: [PATCH 1/2] [chore] flake.lock: update inputs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/6e6b3dd395c3b1eb9be9f2d096383a8d05add030' (2024-10-04)
  → 'github:NixOS/nixpkgs/1bfbbbe5bbf888d675397c66bfdb275d0b99361c' (2024-10-07)
• Updated input 'nixvim':
    'github:nix-community/nixvim/6594472fd275f6dcf5a9fba4a83d2f7fa2cf2b8a' (2024-10-05)
  → 'github:nix-community/nixvim/eda14029813906b1ef355823de237d86fea59908' (2024-10-08)
• Updated input 'unstable':
    'github:NixOS/nixpkgs/bc947f541ae55e999ffdb4013441347d83b00feb' (2024-10-04)
  → 'github:NixOS/nixpkgs/c31898adf5a8ed202ce5bea9f347b1c6871f32d1' (2024-10-06)
---
 flake.lock       | 18 +++++++++---------
 nvim/plugins.nix |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2de6960..caa449d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -260,11 +260,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1728067476,
-        "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=",
+        "lastModified": 1728328465,
+        "narHash": "sha256-a0a0M1TmXMK34y3M0cugsmpJ4FJPT/xsblhpiiX1CXo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030",
+        "rev": "1bfbbbe5bbf888d675397c66bfdb275d0b99361c",
         "type": "github"
       },
       "original": {
@@ -292,11 +292,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1728145679,
-        "narHash": "sha256-qd1nr2b+WUiyzJva650LBX/3hDBru0ZSVxKHSm1BE0w=",
+        "lastModified": 1728428263,
+        "narHash": "sha256-TG/ojDMLuLJI4nEo0waZawgAq4r30n7xJ8klEKpFcd0=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "6594472fd275f6dcf5a9fba4a83d2f7fa2cf2b8a",
+        "rev": "eda14029813906b1ef355823de237d86fea59908",
         "type": "github"
       },
       "original": {
@@ -388,11 +388,11 @@
     },
     "unstable": {
       "locked": {
-        "lastModified": 1728018373,
-        "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
+        "lastModified": 1728241625,
+        "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
+        "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
         "type": "github"
       },
       "original": {
diff --git a/nvim/plugins.nix b/nvim/plugins.nix
index 9db807f..fa887c2 100644
--- a/nvim/plugins.nix
+++ b/nvim/plugins.nix
@@ -184,7 +184,7 @@ in
         jsonls.enable = true;
         marksman.enable = true;
         nixd.enable = true;
-        nil-ls = {
+        nil_ls = {
           enable = true;
           settings.nix.flake = {
             autoArchive = true;
@@ -196,8 +196,8 @@ in
         ruff.enable = true;
         taplo.enable = true;
         # texlab.enable = true; # Not writing TeX rn
-        typos-lsp.enable = true;
-        typst-lsp.enable = true;
+        typos_lsp.enable = true;
+        # typst_lsp.enable = true; # Not using it either
       };
     };
     lspkind = {
-- 
2.47.0


From 9f59290f50b31ec613084217119084afe4ecd2f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?=
 <jalil.salame@gmail.com>
Date: Wed, 9 Oct 2024 09:03:22 +0200
Subject: [PATCH 2/2] fix(nvim): clean up some old configuration stuff

- Remove `typos` from `plugins.lints` (we already use `typos_lsp`)
- Comment out unused lsp servers. They are big and we don't want to
  increase the closure/package size too much.
---
 nvim/plugins.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/nvim/plugins.nix b/nvim/plugins.nix
index fa887c2..4a85f8e 100644
--- a/nvim/plugins.nix
+++ b/nvim/plugins.nix
@@ -163,12 +163,7 @@ in
     lint = {
       enable = true;
       lintersByFt = {
-        rust = [ "typos" ];
-        latex = [
-          "chktex"
-          "typos"
-        ];
-        markdown = [ "typos" ];
+        latex = [ "chktex" ];
         nix = [ "statix" ];
         sh = [ "dash" ];
         zsh = [ "zsh" ];
@@ -177,10 +172,12 @@ in
     lsp = {
       enable = true;
       servers = {
-        bashls.enable = true;
-        bashls.package = pkgs.unstable.bash-language-server;
+        bashls = {
+          enable = true;
+          package = pkgs.unstable.bash-language-server;
+        };
         # clangd.enable = true; # Adds ~2GiB
-        html.enable = true;
+        # html.enable = true; # Not writing html
         jsonls.enable = true;
         marksman.enable = true;
         nixd.enable = true;
@@ -192,7 +189,6 @@ in
           };
         };
         pyright.enable = true;
-        # ruff-lsp.enable = true;
         ruff.enable = true;
         taplo.enable = true;
         # texlab.enable = true; # Not writing TeX rn
-- 
2.47.0