nvim: move to services we do not specify a pkgset

2025-07-05 20:08:20 +02:00 · 2025-07-05 20:08:20 +02:00 · 11b98d8146
commit 11b98d8146
parent 465a6b19d1
45 changed files with 38 additions and 37 deletions
--- a/machines/Lilim/options.nix
+++ b/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"
--- a/machines/Marid/options.nix
+++ b/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"
--- a/machines/Ophanim/options.nix
+++ b/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"
--- a/services/nvim.nix
+++ b/services/nvim.nix
--- a/services/nvim/blink.nix
+++ b/services/nvim/blink.nix
--- a/services/nvim/cmp.nix
+++ b/services/nvim/cmp.nix
--- a/services/nvim/fugitive.nix
+++ b/services/nvim/fugitive.nix
--- a/services/nvim/gen.nix
+++ b/services/nvim/gen.nix
--- a/services/nvim/go.nix
+++ b/services/nvim/go.nix
--- a/services/nvim/harpoon.nix
+++ b/services/nvim/harpoon.nix
--- a/services/nvim/hurl.nix
+++ b/services/nvim/hurl.nix
--- a/services/nvim/image.nix
+++ b/services/nvim/image.nix
--- a/services/nvim/kanagawa-nvim.nix
+++ b/services/nvim/kanagawa-nvim.nix
--- a/services/nvim/lsp.nix
+++ b/services/nvim/lsp.nix
--- a/services/nvim/lsp/bash.nix
+++ b/services/nvim/lsp/bash.nix
--- a/services/nvim/lsp/c.nix
+++ b/services/nvim/lsp/c.nix
--- a/services/nvim/lsp/emmet.nix
+++ b/services/nvim/lsp/emmet.nix
--- a/services/nvim/lsp/go.nix
+++ b/services/nvim/lsp/go.nix
--- a/services/nvim/lsp/harper.nix
+++ b/services/nvim/lsp/harper.nix
--- a/services/nvim/lsp/html.nix
+++ b/services/nvim/lsp/html.nix
--- a/services/nvim/lsp/ltex.nix
+++ b/services/nvim/lsp/ltex.nix
--- a/services/nvim/lsp/lua.nix
+++ b/services/nvim/lsp/lua.nix
--- a/services/nvim/lsp/markdown.nix
+++ b/services/nvim/lsp/markdown.nix
--- a/services/nvim/lsp/nix-nil.nix
+++ b/services/nvim/lsp/nix-nil.nix
--- a/services/nvim/lsp/nix-nixd.nix
+++ b/services/nvim/lsp/nix-nixd.nix
--- a/services/nvim/lsp/php.nix
+++ b/services/nvim/lsp/php.nix
--- a/services/nvim/lsp/python.nix
+++ b/services/nvim/lsp/python.nix
--- a/services/nvim/lsp/rust.nix
+++ b/services/nvim/lsp/rust.nix
--- a/services/nvim/lsp/typescript.nix
+++ b/services/nvim/lsp/typescript.nix
--- a/services/nvim/lsp/yaml.nix
+++ b/services/nvim/lsp/yaml.nix
--- a/services/nvim/lualine.nix
+++ b/services/nvim/lualine.nix
--- a/services/nvim/model.nix
+++ b/services/nvim/model.nix
--- a/services/nvim/noice.nix
+++ b/services/nvim/noice.nix
--- a/services/nvim/nvim-highlight.nix
+++ b/services/nvim/nvim-highlight.nix
--- a/services/nvim/oil-nvim.nix
+++ b/services/nvim/oil-nvim.nix
--- a/services/nvim/otter.nix
+++ b/services/nvim/otter.nix
--- a/services/nvim/render-markdown.nix
+++ b/services/nvim/render-markdown.nix
--- a/services/nvim/sniprun.nix
+++ b/services/nvim/sniprun.nix
--- a/services/nvim/table-mode.nix
+++ b/services/nvim/table-mode.nix
--- a/services/nvim/telescope.nix
+++ b/services/nvim/telescope.nix
--- a/services/nvim/tmux-navigate.nix
+++ b/services/nvim/tmux-navigate.nix
--- a/services/nvim/treesitter.nix
+++ b/services/nvim/treesitter.nix
--- a/services/nvim/trim.nix
+++ b/services/nvim/trim.nix
--- a/services/nvim/undotree.nix
+++ b/services/nvim/undotree.nix
--- a/services/nvim/which-key.nix
+++ b/services/nvim/which-key.nix