From 11b98d814694a2b4f5c11f4d1a65b21a80167130 Mon Sep 17 00:00:00 2001 From: derped Date: Sat, 5 Jul 2025 20:08:20 +0200 Subject: [PATCH] nvim: move to services we do not specify a pkgset --- machines/Lilim/options.nix | 27 ++++++++++--------- machines/Marid/options.nix | 26 +++++++++--------- machines/Ophanim/options.nix | 22 +++++++-------- {pkgsets => services}/nvim.nix | 0 {pkgsets => services}/nvim/blink.nix | 0 {pkgsets => services}/nvim/cmp.nix | 0 {pkgsets => services}/nvim/fugitive.nix | 0 {pkgsets => services}/nvim/gen.nix | 0 {pkgsets => services}/nvim/go.nix | 0 {pkgsets => services}/nvim/harpoon.nix | 0 {pkgsets => services}/nvim/hurl.nix | 0 {pkgsets => services}/nvim/image.nix | 0 {pkgsets => services}/nvim/kanagawa-nvim.nix | 0 {pkgsets => services}/nvim/lsp.nix | 0 {pkgsets => services}/nvim/lsp/bash.nix | 0 {pkgsets => services}/nvim/lsp/c.nix | 0 {pkgsets => services}/nvim/lsp/emmet.nix | 0 {pkgsets => services}/nvim/lsp/go.nix | 0 {pkgsets => services}/nvim/lsp/harper.nix | 0 {pkgsets => services}/nvim/lsp/html.nix | 0 {pkgsets => services}/nvim/lsp/ltex.nix | 0 {pkgsets => services}/nvim/lsp/lua.nix | 0 {pkgsets => services}/nvim/lsp/markdown.nix | 0 {pkgsets => services}/nvim/lsp/nix-nil.nix | 0 {pkgsets => services}/nvim/lsp/nix-nixd.nix | 0 {pkgsets => services}/nvim/lsp/php.nix | 0 {pkgsets => services}/nvim/lsp/python.nix | 0 {pkgsets => services}/nvim/lsp/rust.nix | 0 {pkgsets => services}/nvim/lsp/typescript.nix | 0 {pkgsets => services}/nvim/lsp/yaml.nix | 0 {pkgsets => services}/nvim/lualine.nix | 0 {pkgsets => services}/nvim/model.nix | 0 {pkgsets => services}/nvim/noice.nix | 0 {pkgsets => services}/nvim/nvim-highlight.nix | 0 {pkgsets => services}/nvim/oil-nvim.nix | 0 {pkgsets => services}/nvim/otter.nix | 0 .../nvim/render-markdown.nix | 0 {pkgsets => services}/nvim/sniprun.nix | 0 {pkgsets => services}/nvim/table-mode.nix | 0 {pkgsets => services}/nvim/telescope.nix | 0 {pkgsets => services}/nvim/tmux-navigate.nix | 0 {pkgsets => services}/nvim/treesitter.nix | 0 {pkgsets => services}/nvim/trim.nix | 0 {pkgsets => services}/nvim/undotree.nix | 0 {pkgsets => services}/nvim/which-key.nix | 0 45 files changed, 38 insertions(+), 37 deletions(-) rename {pkgsets => services}/nvim.nix (100%) rename {pkgsets => services}/nvim/blink.nix (100%) rename {pkgsets => services}/nvim/cmp.nix (100%) rename {pkgsets => services}/nvim/fugitive.nix (100%) rename {pkgsets => services}/nvim/gen.nix (100%) rename {pkgsets => services}/nvim/go.nix (100%) rename {pkgsets => services}/nvim/harpoon.nix (100%) rename {pkgsets => services}/nvim/hurl.nix (100%) rename {pkgsets => services}/nvim/image.nix (100%) rename {pkgsets => services}/nvim/kanagawa-nvim.nix (100%) rename {pkgsets => services}/nvim/lsp.nix (100%) rename {pkgsets => services}/nvim/lsp/bash.nix (100%) rename {pkgsets => services}/nvim/lsp/c.nix (100%) rename {pkgsets => services}/nvim/lsp/emmet.nix (100%) rename {pkgsets => services}/nvim/lsp/go.nix (100%) rename {pkgsets => services}/nvim/lsp/harper.nix (100%) rename {pkgsets => services}/nvim/lsp/html.nix (100%) rename {pkgsets => services}/nvim/lsp/ltex.nix (100%) rename {pkgsets => services}/nvim/lsp/lua.nix (100%) rename {pkgsets => services}/nvim/lsp/markdown.nix (100%) rename {pkgsets => services}/nvim/lsp/nix-nil.nix (100%) rename {pkgsets => services}/nvim/lsp/nix-nixd.nix (100%) rename {pkgsets => services}/nvim/lsp/php.nix (100%) rename {pkgsets => services}/nvim/lsp/python.nix (100%) rename {pkgsets => services}/nvim/lsp/rust.nix (100%) rename {pkgsets => services}/nvim/lsp/typescript.nix (100%) rename {pkgsets => services}/nvim/lsp/yaml.nix (100%) rename {pkgsets => services}/nvim/lualine.nix (100%) rename {pkgsets => services}/nvim/model.nix (100%) rename {pkgsets => services}/nvim/noice.nix (100%) rename {pkgsets => services}/nvim/nvim-highlight.nix (100%) rename {pkgsets => services}/nvim/oil-nvim.nix (100%) rename {pkgsets => services}/nvim/otter.nix (100%) rename {pkgsets => services}/nvim/render-markdown.nix (100%) rename {pkgsets => services}/nvim/sniprun.nix (100%) rename {pkgsets => services}/nvim/table-mode.nix (100%) rename {pkgsets => services}/nvim/telescope.nix (100%) rename {pkgsets => services}/nvim/tmux-navigate.nix (100%) rename {pkgsets => services}/nvim/treesitter.nix (100%) rename {pkgsets => services}/nvim/trim.nix (100%) rename {pkgsets => services}/nvim/undotree.nix (100%) rename {pkgsets => services}/nvim/which-key.nix (100%) diff --git a/machines/Lilim/options.nix b/machines/Lilim/options.nix index fca1ff2..93030dd 100644 --- 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" diff --git a/machines/Marid/options.nix b/machines/Marid/options.nix index 328509c..1e83b4b 100644 --- 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" diff --git a/machines/Ophanim/options.nix b/machines/Ophanim/options.nix index ea5f862..4f97612 100644 --- 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" diff --git a/pkgsets/nvim.nix b/services/nvim.nix similarity index 100% rename from pkgsets/nvim.nix rename to services/nvim.nix diff --git a/pkgsets/nvim/blink.nix b/services/nvim/blink.nix similarity index 100% rename from pkgsets/nvim/blink.nix rename to services/nvim/blink.nix diff --git a/pkgsets/nvim/cmp.nix b/services/nvim/cmp.nix similarity index 100% rename from pkgsets/nvim/cmp.nix rename to services/nvim/cmp.nix diff --git a/pkgsets/nvim/fugitive.nix b/services/nvim/fugitive.nix similarity index 100% rename from pkgsets/nvim/fugitive.nix rename to services/nvim/fugitive.nix diff --git a/pkgsets/nvim/gen.nix b/services/nvim/gen.nix similarity index 100% rename from pkgsets/nvim/gen.nix rename to services/nvim/gen.nix diff --git a/pkgsets/nvim/go.nix b/services/nvim/go.nix similarity index 100% rename from pkgsets/nvim/go.nix rename to services/nvim/go.nix diff --git a/pkgsets/nvim/harpoon.nix b/services/nvim/harpoon.nix similarity index 100% rename from pkgsets/nvim/harpoon.nix rename to services/nvim/harpoon.nix diff --git a/pkgsets/nvim/hurl.nix b/services/nvim/hurl.nix similarity index 100% rename from pkgsets/nvim/hurl.nix rename to services/nvim/hurl.nix diff --git a/pkgsets/nvim/image.nix b/services/nvim/image.nix similarity index 100% rename from pkgsets/nvim/image.nix rename to services/nvim/image.nix diff --git a/pkgsets/nvim/kanagawa-nvim.nix b/services/nvim/kanagawa-nvim.nix similarity index 100% rename from pkgsets/nvim/kanagawa-nvim.nix rename to services/nvim/kanagawa-nvim.nix diff --git a/pkgsets/nvim/lsp.nix b/services/nvim/lsp.nix similarity index 100% rename from pkgsets/nvim/lsp.nix rename to services/nvim/lsp.nix diff --git a/pkgsets/nvim/lsp/bash.nix b/services/nvim/lsp/bash.nix similarity index 100% rename from pkgsets/nvim/lsp/bash.nix rename to services/nvim/lsp/bash.nix diff --git a/pkgsets/nvim/lsp/c.nix b/services/nvim/lsp/c.nix similarity index 100% rename from pkgsets/nvim/lsp/c.nix rename to services/nvim/lsp/c.nix diff --git a/pkgsets/nvim/lsp/emmet.nix b/services/nvim/lsp/emmet.nix similarity index 100% rename from pkgsets/nvim/lsp/emmet.nix rename to services/nvim/lsp/emmet.nix diff --git a/pkgsets/nvim/lsp/go.nix b/services/nvim/lsp/go.nix similarity index 100% rename from pkgsets/nvim/lsp/go.nix rename to services/nvim/lsp/go.nix diff --git a/pkgsets/nvim/lsp/harper.nix b/services/nvim/lsp/harper.nix similarity index 100% rename from pkgsets/nvim/lsp/harper.nix rename to services/nvim/lsp/harper.nix diff --git a/pkgsets/nvim/lsp/html.nix b/services/nvim/lsp/html.nix similarity index 100% rename from pkgsets/nvim/lsp/html.nix rename to services/nvim/lsp/html.nix diff --git a/pkgsets/nvim/lsp/ltex.nix b/services/nvim/lsp/ltex.nix similarity index 100% rename from pkgsets/nvim/lsp/ltex.nix rename to services/nvim/lsp/ltex.nix diff --git a/pkgsets/nvim/lsp/lua.nix b/services/nvim/lsp/lua.nix similarity index 100% rename from pkgsets/nvim/lsp/lua.nix rename to services/nvim/lsp/lua.nix diff --git a/pkgsets/nvim/lsp/markdown.nix b/services/nvim/lsp/markdown.nix similarity index 100% rename from pkgsets/nvim/lsp/markdown.nix rename to services/nvim/lsp/markdown.nix diff --git a/pkgsets/nvim/lsp/nix-nil.nix b/services/nvim/lsp/nix-nil.nix similarity index 100% rename from pkgsets/nvim/lsp/nix-nil.nix rename to services/nvim/lsp/nix-nil.nix diff --git a/pkgsets/nvim/lsp/nix-nixd.nix b/services/nvim/lsp/nix-nixd.nix similarity index 100% rename from pkgsets/nvim/lsp/nix-nixd.nix rename to services/nvim/lsp/nix-nixd.nix diff --git a/pkgsets/nvim/lsp/php.nix b/services/nvim/lsp/php.nix similarity index 100% rename from pkgsets/nvim/lsp/php.nix rename to services/nvim/lsp/php.nix diff --git a/pkgsets/nvim/lsp/python.nix b/services/nvim/lsp/python.nix similarity index 100% rename from pkgsets/nvim/lsp/python.nix rename to services/nvim/lsp/python.nix diff --git a/pkgsets/nvim/lsp/rust.nix b/services/nvim/lsp/rust.nix similarity index 100% rename from pkgsets/nvim/lsp/rust.nix rename to services/nvim/lsp/rust.nix diff --git a/pkgsets/nvim/lsp/typescript.nix b/services/nvim/lsp/typescript.nix similarity index 100% rename from pkgsets/nvim/lsp/typescript.nix rename to services/nvim/lsp/typescript.nix diff --git a/pkgsets/nvim/lsp/yaml.nix b/services/nvim/lsp/yaml.nix similarity index 100% rename from pkgsets/nvim/lsp/yaml.nix rename to services/nvim/lsp/yaml.nix diff --git a/pkgsets/nvim/lualine.nix b/services/nvim/lualine.nix similarity index 100% rename from pkgsets/nvim/lualine.nix rename to services/nvim/lualine.nix diff --git a/pkgsets/nvim/model.nix b/services/nvim/model.nix similarity index 100% rename from pkgsets/nvim/model.nix rename to services/nvim/model.nix diff --git a/pkgsets/nvim/noice.nix b/services/nvim/noice.nix similarity index 100% rename from pkgsets/nvim/noice.nix rename to services/nvim/noice.nix diff --git a/pkgsets/nvim/nvim-highlight.nix b/services/nvim/nvim-highlight.nix similarity index 100% rename from pkgsets/nvim/nvim-highlight.nix rename to services/nvim/nvim-highlight.nix diff --git a/pkgsets/nvim/oil-nvim.nix b/services/nvim/oil-nvim.nix similarity index 100% rename from pkgsets/nvim/oil-nvim.nix rename to services/nvim/oil-nvim.nix diff --git a/pkgsets/nvim/otter.nix b/services/nvim/otter.nix similarity index 100% rename from pkgsets/nvim/otter.nix rename to services/nvim/otter.nix diff --git a/pkgsets/nvim/render-markdown.nix b/services/nvim/render-markdown.nix similarity index 100% rename from pkgsets/nvim/render-markdown.nix rename to services/nvim/render-markdown.nix diff --git a/pkgsets/nvim/sniprun.nix b/services/nvim/sniprun.nix similarity index 100% rename from pkgsets/nvim/sniprun.nix rename to services/nvim/sniprun.nix diff --git a/pkgsets/nvim/table-mode.nix b/services/nvim/table-mode.nix similarity index 100% rename from pkgsets/nvim/table-mode.nix rename to services/nvim/table-mode.nix diff --git a/pkgsets/nvim/telescope.nix b/services/nvim/telescope.nix similarity index 100% rename from pkgsets/nvim/telescope.nix rename to services/nvim/telescope.nix diff --git a/pkgsets/nvim/tmux-navigate.nix b/services/nvim/tmux-navigate.nix similarity index 100% rename from pkgsets/nvim/tmux-navigate.nix rename to services/nvim/tmux-navigate.nix diff --git a/pkgsets/nvim/treesitter.nix b/services/nvim/treesitter.nix similarity index 100% rename from pkgsets/nvim/treesitter.nix rename to services/nvim/treesitter.nix diff --git a/pkgsets/nvim/trim.nix b/services/nvim/trim.nix similarity index 100% rename from pkgsets/nvim/trim.nix rename to services/nvim/trim.nix diff --git a/pkgsets/nvim/undotree.nix b/services/nvim/undotree.nix similarity index 100% rename from pkgsets/nvim/undotree.nix rename to services/nvim/undotree.nix diff --git a/pkgsets/nvim/which-key.nix b/services/nvim/which-key.nix similarity index 100% rename from pkgsets/nvim/which-key.nix rename to services/nvim/which-key.nix