nvim: move to services we do not specify a pkgset

machines/Lilim/options.nix

@@ -32,8 +32,21 @@
       "latex"
       "mail_utils"
       "nodejs"
+      "python3"
+      "xpkgs"
+    ];
+    services = [
+      "btrbk"
+      "btrfs"
+      "cups"
+      "desktop"
+      "desktop::sway"
+      "impermanence"
+      "lanzaboote"
+      "mariaDB"
+      "mullvad"
       "nvim"
-      "nvim::cmp"
+      "nvim::blink"
       "nvim::fugitive"
       "nvim::go"
       "nvim::harpoon"
@@ -60,18 +73,6 @@
       "nvim::trim"
       "nvim::undotree"
       "nvim::which-key"
-      "python3"
-      "xpkgs"
-    ];
-    services = [
-      "btrbk"
-      "btrfs"
-      "cups"
-      "desktop"
-      "desktop::sway"
-      "impermanence"
-      "mariaDB"
-      "mullvad"
       "pipewire"
       "podman"
       "tmux"

machines/Marid/options.nix

@@ -24,6 +24,19 @@
       "base"
       "extra"
       "mail_utils"
+      "cpp"
+    ];
+    services = [
+      "btrbk"
+      "btrfs"
+      "tmux"
+      "pipewire"
+      "docker"
+      "podman"
+      "ollama"
+      "virt-manager"
+      "virtualbox"
+      "cups"
       "nvim"
       "nvim::cmp"
       "nvim::fugitive"
@@ -53,19 +66,6 @@
       "nvim::trim"
       "nvim::undotree"
       "nvim::which-key"
-      "cpp"
-    ];
-    services = [
-      "btrbk"
-      "btrfs"
-      "tmux"
-      "pipewire"
-      "docker"
-      "podman"
-      "ollama"
-      "virt-manager"
-      "virtualbox"
-      "cups"
       "desktop"
       "desktop::sway"
       # "mariaDB"

machines/Ophanim/options.nix

@@ -41,6 +41,17 @@ in
     pkgs = [
       "base"
       "server"
+    ];
+    services = [
+      "acme"
+      "btrbk"
+      "btrfs"
+      "fail2ban"
+      "forgejo"
+      "impermanence"
+      "mailserver"
+      "mariaDB"
+      "nginx"
       "nvim"
       "nvim::cmp"
       "nvim::fugitive"
@@ -57,17 +68,6 @@ in
       "nvim::treesitter"
       "nvim::trim"
       "nvim::undotree"
-    ];
-    services = [
-      "acme"
-      "btrbk"
-      "btrfs"
-      "fail2ban"
-      "forgejo"
-      "impermanence"
-      "mailserver"
-      "mariaDB"
-      "nginx"
       "openssh"
       "radicale"
       "tmux"