From 303fbd5595dd1a016ccbb1d101f9160d5931be0b Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sat, 6 Apr 2024 16:11:52 +0200
Subject: [PATCH] feat: remove manpager replacement for normal machines to
 improve evaluation speed

---
 users/modules/default.nix                         | 1 -
 users/myuser/dev/default.nix                      | 1 +
 users/{modules/config => myuser/dev}/manpager.nix | 2 +-
 users/myuser/neovim/globals.nix                   | 2 +-
 users/myuser/neovim/misc.nix                      | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename users/{modules/config => myuser/dev}/manpager.nix (98%)

diff --git a/users/modules/default.nix b/users/modules/default.nix
index 398b6ec..324ab24 100644
--- a/users/modules/default.nix
+++ b/users/modules/default.nix
@@ -5,7 +5,6 @@
 
     ./config/htop.nix
     ./config/impermanence.nix
-    ./config/manpager.nix
     ./config/neovim.nix
     ./config/shell
     ./config/utils.nix
diff --git a/users/myuser/dev/default.nix b/users/myuser/dev/default.nix
index 4f5507d..95e579c 100644
--- a/users/myuser/dev/default.nix
+++ b/users/myuser/dev/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ./direnv.nix
     ./gdb.nix
+    ./manpager.nix
   ];
 
   home = {
diff --git a/users/modules/config/manpager.nix b/users/myuser/dev/manpager.nix
similarity index 98%
rename from users/modules/config/manpager.nix
rename to users/myuser/dev/manpager.nix
index 1a77ddb..eab5e0f 100644
--- a/users/modules/config/manpager.nix
+++ b/users/myuser/dev/manpager.nix
@@ -7,7 +7,7 @@
     prg = lib.getExe (pkgs.nixvim.makeNixvim {
       package = pkgs.neovim-clean;
 
-      options = {
+      opts = {
         buftype = "nowrite";
         backup = false;
         modeline = false;
diff --git a/users/myuser/neovim/globals.nix b/users/myuser/neovim/globals.nix
index ba591e3..b941c1d 100644
--- a/users/myuser/neovim/globals.nix
+++ b/users/myuser/neovim/globals.nix
@@ -1,5 +1,5 @@
 {
-  programs.nixvim.options = {
+  programs.nixvim.opts = {
     # -------------------------------------------------------------------------------------------------
     # General
     # -------------------------------------------------------------------------------------------------
diff --git a/users/myuser/neovim/misc.nix b/users/myuser/neovim/misc.nix
index 3c747ee..06495bc 100644
--- a/users/myuser/neovim/misc.nix
+++ b/users/myuser/neovim/misc.nix
@@ -19,7 +19,7 @@
       };
 
       # Commenting
-      comment-nvim.enable = true;
+      comment.enable = true;
       # Extend vim's "%" key
       vim-matchup.enable = true;