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 91%
rename from pkgsets/nvim.nix
rename to services/nvim.nix
index 4cb3c75..df5d831 100644
--- a/pkgsets/nvim.nix
+++ b/services/nvim.nix
@@ -17,7 +17,7 @@ with lib;
       fullPath = true;
     });
 
-  programs.nvim-lazy = mkIf (elem "nvim" config.machine.pkgs) {
+  programs.nvim-lazy = mkIf (elem "nvim" config.machine.services) {
     enable = true;
     luaRcContent = # lua
       ''
diff --git a/pkgsets/nvim/blink.nix b/services/nvim/blink.nix
similarity index 96%
rename from pkgsets/nvim/blink.nix
rename to services/nvim/blink.nix
index 3d6ed65..5dca65b 100644
--- a/pkgsets/nvim/blink.nix
+++ b/services/nvim/blink.nix
@@ -1,6 +1,6 @@
 { config, lib, ... }:
 
-lib.mkIf (lib.elem "nvim::blink" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::blink" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       dir = vPlug: vPlug.friendly-snippets;
diff --git a/pkgsets/nvim/cmp.nix b/services/nvim/cmp.nix
similarity index 91%
rename from pkgsets/nvim/cmp.nix
rename to services/nvim/cmp.nix
index 003fc45..9715f83 100644
--- a/pkgsets/nvim/cmp.nix
+++ b/services/nvim/cmp.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::cmp" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::cmp" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     # Autocompletion
     {
@@ -21,7 +21,7 @@ lib.mkIf (lib.elem "nvim::cmp" config.machine.pkgs) {
             local cmp = require('cmp')
 
             cmp.setup({
-              ${lib.optionalString (lib.elem "nvim::lsp" config.machine.pkgs) # lua
+              ${lib.optionalString (lib.elem "nvim::lsp" config.machine.services) # lua
                 ''sources = { { name = 'nvim_lsp' }, },''
               }
               mapping = cmp.mapping.preset.insert({
diff --git a/pkgsets/nvim/fugitive.nix b/services/nvim/fugitive.nix
similarity index 93%
rename from pkgsets/nvim/fugitive.nix
rename to services/nvim/fugitive.nix
index 87834ed..08f602f 100644
--- a/pkgsets/nvim/fugitive.nix
+++ b/services/nvim/fugitive.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::fugitive" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::fugitive" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       lazy = true;
diff --git a/pkgsets/nvim/gen.nix b/services/nvim/gen.nix
similarity index 80%
rename from pkgsets/nvim/gen.nix
rename to services/nvim/gen.nix
index be8e8f0..209af7c 100644
--- a/pkgsets/nvim/gen.nix
+++ b/services/nvim/gen.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::gen" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::gen" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       lazy = true;
diff --git a/pkgsets/nvim/go.nix b/services/nvim/go.nix
similarity index 99%
rename from pkgsets/nvim/go.nix
rename to services/nvim/go.nix
index 81b99f6..015bbca 100644
--- a/pkgsets/nvim/go.nix
+++ b/services/nvim/go.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::go" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::go" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       lazy = true;
diff --git a/pkgsets/nvim/harpoon.nix b/services/nvim/harpoon.nix
similarity index 97%
rename from pkgsets/nvim/harpoon.nix
rename to services/nvim/harpoon.nix
index 291a6a8..51e4bd6 100644
--- a/pkgsets/nvim/harpoon.nix
+++ b/services/nvim/harpoon.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::harpoon" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::harpoon" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       dir = vPlug: vPlug.harpoon2;
diff --git a/pkgsets/nvim/hurl.nix b/services/nvim/hurl.nix
similarity index 97%
rename from pkgsets/nvim/hurl.nix
rename to services/nvim/hurl.nix
index 6c48caa..ac86d78 100644
--- a/pkgsets/nvim/hurl.nix
+++ b/services/nvim/hurl.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::hurl" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::hurl" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       lazy = true;
diff --git a/pkgsets/nvim/image.nix b/services/nvim/image.nix
similarity index 85%
rename from pkgsets/nvim/image.nix
rename to services/nvim/image.nix
index f67fd5a..acbc8ea 100644
--- a/pkgsets/nvim/image.nix
+++ b/services/nvim/image.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::image" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::image" config.machine.services) {
   programs.nvim-lazy = {
     lazyPlugins = [
       {
diff --git a/pkgsets/nvim/kanagawa-nvim.nix b/services/nvim/kanagawa-nvim.nix
similarity index 84%
rename from pkgsets/nvim/kanagawa-nvim.nix
rename to services/nvim/kanagawa-nvim.nix
index be7ac39..60a2935 100644
--- a/pkgsets/nvim/kanagawa-nvim.nix
+++ b/services/nvim/kanagawa-nvim.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::kanagawa-nvim" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::kanagawa-nvim" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       dir = vPlug: vPlug.kanagawa-nvim;
diff --git a/pkgsets/nvim/lsp.nix b/services/nvim/lsp.nix
similarity index 98%
rename from pkgsets/nvim/lsp.nix
rename to services/nvim/lsp.nix
index 7475fc1..f890fd3 100644
--- a/pkgsets/nvim/lsp.nix
+++ b/services/nvim/lsp.nix
@@ -6,7 +6,7 @@
   ...
 }@inputs:
 
-lib.mkIf (lib.elem "nvim::lsp" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::lsp" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     # Yaml schema store for yamlls
     {
@@ -119,7 +119,7 @@ lib.mkIf (lib.elem "nvim::lsp" config.machine.pkgs) {
 
             local lspconfig = require('lspconfig')
             for server, config in pairs(opts.servers) do
-              ${lib.optionalString (lib.elem "nvim::blink" config.machine.pkgs) # lua
+              ${lib.optionalString (lib.elem "nvim::blink" config.machine.services) # lua
                 ''
                   -- passing config.capabilities to blink.cmp merges with the capabilities in your
                   -- `opts[server].capabilities, if you've defined it
diff --git a/pkgsets/nvim/lsp/bash.nix b/services/nvim/lsp/bash.nix
similarity index 69%
rename from pkgsets/nvim/lsp/bash.nix
rename to services/nvim/lsp/bash.nix
index 992be37..0dea418 100644
--- a/pkgsets/nvim/lsp/bash.nix
+++ b/services/nvim/lsp/bash.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::bash" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::bash" config.machine.services) {
   bashls = {
     cmd = [
       "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server"
diff --git a/pkgsets/nvim/lsp/c.nix b/services/nvim/lsp/c.nix
similarity index 80%
rename from pkgsets/nvim/lsp/c.nix
rename to services/nvim/lsp/c.nix
index 066a9ea..fba62e6 100644
--- a/pkgsets/nvim/lsp/c.nix
+++ b/services/nvim/lsp/c.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::c" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::c" config.machine.services) {
   ccls = {
     cmd = [ "${pkgs.ccls}/bin/ccls" ];
     init_options = {
diff --git a/pkgsets/nvim/lsp/emmet.nix b/services/nvim/lsp/emmet.nix
similarity index 69%
rename from pkgsets/nvim/lsp/emmet.nix
rename to services/nvim/lsp/emmet.nix
index 9de1459..37edf38 100644
--- a/pkgsets/nvim/lsp/emmet.nix
+++ b/services/nvim/lsp/emmet.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::emmet" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::emmet" config.machine.services) {
   emmet_language_server = {
     cmd = [
       "${pkgs.emmet-language-server}/bin/emmet-language-server"
diff --git a/pkgsets/nvim/lsp/go.nix b/services/nvim/lsp/go.nix
similarity index 57%
rename from pkgsets/nvim/lsp/go.nix
rename to services/nvim/lsp/go.nix
index 6c44552..199aef5 100644
--- a/pkgsets/nvim/lsp/go.nix
+++ b/services/nvim/lsp/go.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::go" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::go" config.machine.services) {
   gopls = {
     cmd = [ "${pkgs.gopls}/bin/gopls" ];
   };
diff --git a/pkgsets/nvim/lsp/harper.nix b/services/nvim/lsp/harper.nix
similarity index 63%
rename from pkgsets/nvim/lsp/harper.nix
rename to services/nvim/lsp/harper.nix
index a867ae3..522f219 100644
--- a/pkgsets/nvim/lsp/harper.nix
+++ b/services/nvim/lsp/harper.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::harper" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::harper" config.machine.services) {
   harper_ls = {
     cmd = [
       "${pkgs.harper}/bin/harper-ls"
diff --git a/pkgsets/nvim/lsp/html.nix b/services/nvim/lsp/html.nix
similarity index 83%
rename from pkgsets/nvim/lsp/html.nix
rename to services/nvim/lsp/html.nix
index 7270f87..4d538e5 100644
--- a/pkgsets/nvim/lsp/html.nix
+++ b/services/nvim/lsp/html.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::html" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::html" config.machine.services) {
   # local html_capabilities = vim.lsp.protocol.make_client_capabilities()
   # html_capabilities.textDocument.completion.completionItem.snippetSupport = true
   html = {
diff --git a/pkgsets/nvim/lsp/ltex.nix b/services/nvim/lsp/ltex.nix
similarity index 85%
rename from pkgsets/nvim/lsp/ltex.nix
rename to services/nvim/lsp/ltex.nix
index 11d37dc..90f3122 100644
--- a/pkgsets/nvim/lsp/ltex.nix
+++ b/services/nvim/lsp/ltex.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::ltex" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::ltex" config.machine.services) {
   ltex = {
     cmd = [ "${pkgs.ltex-ls}/bin/ltex-ls" ];
     settings = {
diff --git a/pkgsets/nvim/lsp/lua.nix b/services/nvim/lsp/lua.nix
similarity index 83%
rename from pkgsets/nvim/lsp/lua.nix
rename to services/nvim/lsp/lua.nix
index c77df9a..84d4dfa 100644
--- a/pkgsets/nvim/lsp/lua.nix
+++ b/services/nvim/lsp/lua.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::lua" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::lua" config.machine.services) {
   lua_ls = {
     cmd = [ "${pkgs.lua-language-server}/bin/lua-language-server" ];
     settings = {
diff --git a/pkgsets/nvim/lsp/markdown.nix b/services/nvim/lsp/markdown.nix
similarity index 93%
rename from pkgsets/nvim/lsp/markdown.nix
rename to services/nvim/lsp/markdown.nix
index f22a959..7b852b6 100644
--- a/pkgsets/nvim/lsp/markdown.nix
+++ b/services/nvim/lsp/markdown.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::markdown" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::markdown" config.machine.services) {
   marksman = {
     cmd = [
       "${pkgs.marksman}/bin/marksman"
diff --git a/pkgsets/nvim/lsp/nix-nil.nix b/services/nvim/lsp/nix-nil.nix
similarity index 97%
rename from pkgsets/nvim/lsp/nix-nil.nix
rename to services/nvim/lsp/nix-nil.nix
index 44e16c4..3e1adcd 100644
--- a/pkgsets/nvim/lsp/nix-nil.nix
+++ b/services/nvim/lsp/nix-nil.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::nix-nil" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::nix-nil" config.machine.services) {
   nil_ls = {
     cmd = [ "${pkgs.nil}/bin/nil" ];
     settings = {
diff --git a/pkgsets/nvim/lsp/nix-nixd.nix b/services/nvim/lsp/nix-nixd.nix
similarity index 99%
rename from pkgsets/nvim/lsp/nix-nixd.nix
rename to services/nvim/lsp/nix-nixd.nix
index 66662fa..005fbe7 100644
--- a/pkgsets/nvim/lsp/nix-nixd.nix
+++ b/services/nvim/lsp/nix-nixd.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::nix-nixd" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::nix-nixd" config.machine.services) {
   nixd = {
     cmd = [ "${pkgs.nixd}/bin/nixd" ];
     settings = {
diff --git a/pkgsets/nvim/lsp/php.nix b/services/nvim/lsp/php.nix
similarity index 84%
rename from pkgsets/nvim/lsp/php.nix
rename to services/nvim/lsp/php.nix
index 9ccf9f4..7a43b83 100644
--- a/pkgsets/nvim/lsp/php.nix
+++ b/services/nvim/lsp/php.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::php" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::php" config.machine.services) {
   phpactor = {
     cmd = [
       "${pkgs.phpactor}/bin/phpactor"
diff --git a/pkgsets/nvim/lsp/python.nix b/services/nvim/lsp/python.nix
similarity index 92%
rename from pkgsets/nvim/lsp/python.nix
rename to services/nvim/lsp/python.nix
index 621525d..56a2133 100644
--- a/pkgsets/nvim/lsp/python.nix
+++ b/services/nvim/lsp/python.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::python" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::python" config.machine.services) {
   pyright = {
     cmd = [
       "${pkgs.pyright}/bin/pyright-langserver"
diff --git a/pkgsets/nvim/lsp/rust.nix b/services/nvim/lsp/rust.nix
similarity index 69%
rename from pkgsets/nvim/lsp/rust.nix
rename to services/nvim/lsp/rust.nix
index 80dfffa..30a9b01 100644
--- a/pkgsets/nvim/lsp/rust.nix
+++ b/services/nvim/lsp/rust.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::rust" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::rust" config.machine.services) {
   rust_analyzer = {
     cmd = [
       "${pkgs.rustup}/bin/rustup"
diff --git a/pkgsets/nvim/lsp/typescript.nix b/services/nvim/lsp/typescript.nix
similarity index 94%
rename from pkgsets/nvim/lsp/typescript.nix
rename to services/nvim/lsp/typescript.nix
index f8835ff..a495c29 100644
--- a/pkgsets/nvim/lsp/typescript.nix
+++ b/services/nvim/lsp/typescript.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::typescript" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::typescript" config.machine.services) {
   ts_ls = {
     cmd = [
       "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server"
diff --git a/pkgsets/nvim/lsp/yaml.nix b/services/nvim/lsp/yaml.nix
similarity index 87%
rename from pkgsets/nvim/lsp/yaml.nix
rename to services/nvim/lsp/yaml.nix
index bc7f713..fbb20de 100644
--- a/pkgsets/nvim/lsp/yaml.nix
+++ b/services/nvim/lsp/yaml.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.optionalAttrs (lib.elem "nvim::lsp::yaml" config.machine.pkgs) {
+lib.optionalAttrs (lib.elem "nvim::lsp::yaml" config.machine.services) {
   yamlls = {
     cmd = [
       "${pkgs.yaml-language-server}/bin/yaml-language-server"
diff --git a/pkgsets/nvim/lualine.nix b/services/nvim/lualine.nix
similarity index 92%
rename from pkgsets/nvim/lualine.nix
rename to services/nvim/lualine.nix
index 74a3d45..3ec2a0c 100644
--- a/pkgsets/nvim/lualine.nix
+++ b/services/nvim/lualine.nix
@@ -4,11 +4,11 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::lualine" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::lualine" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       dir = vPlug: vPlug.lualine-nvim;
-      dependencies = (vPlug: with vPlug; [ nvim-web-devicons ]);
+      dependencies = vPlug: [ vPlug.nvim-web-devicons ];
       opts = {
         options = {
           icons_enabled = true;
diff --git a/pkgsets/nvim/model.nix b/services/nvim/model.nix
similarity index 96%
rename from pkgsets/nvim/model.nix
rename to services/nvim/model.nix
index 75aae0e..ced7290 100644
--- a/pkgsets/nvim/model.nix
+++ b/services/nvim/model.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::model" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::model" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       short = "gsuuon/model.nvim";
diff --git a/pkgsets/nvim/noice.nix b/services/nvim/noice.nix
similarity index 96%
rename from pkgsets/nvim/noice.nix
rename to services/nvim/noice.nix
index 7fe7426..d23b495 100644
--- a/pkgsets/nvim/noice.nix
+++ b/services/nvim/noice.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::noice" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::noice" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       dir = vPlug: vPlug.noice-nvim;
diff --git a/pkgsets/nvim/nvim-highlight.nix b/services/nvim/nvim-highlight.nix
similarity index 84%
rename from pkgsets/nvim/nvim-highlight.nix
rename to services/nvim/nvim-highlight.nix
index a1bbc2a..8796394 100644
--- a/pkgsets/nvim/nvim-highlight.nix
+++ b/services/nvim/nvim-highlight.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::nvim-highlight" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::nvim-highlight" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       lazy = true;
diff --git a/pkgsets/nvim/oil-nvim.nix b/services/nvim/oil-nvim.nix
similarity index 78%
rename from pkgsets/nvim/oil-nvim.nix
rename to services/nvim/oil-nvim.nix
index 69ec69f..4e97789 100644
--- a/pkgsets/nvim/oil-nvim.nix
+++ b/services/nvim/oil-nvim.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::oil-nvim" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::oil-nvim" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       lazy = false;
diff --git a/pkgsets/nvim/otter.nix b/services/nvim/otter.nix
similarity index 74%
rename from pkgsets/nvim/otter.nix
rename to services/nvim/otter.nix
index 1ab4832..1bb268d 100644
--- a/pkgsets/nvim/otter.nix
+++ b/services/nvim/otter.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::otter" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::otter" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       lazy = true;
diff --git a/pkgsets/nvim/render-markdown.nix b/services/nvim/render-markdown.nix
similarity index 76%
rename from pkgsets/nvim/render-markdown.nix
rename to services/nvim/render-markdown.nix
index 78d182c..3b51244 100644
--- a/pkgsets/nvim/render-markdown.nix
+++ b/services/nvim/render-markdown.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::render-markdown" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::render-markdown" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       dir = vPlug: vPlug.render-markdown-nvim;
@@ -18,7 +18,7 @@ lib.mkIf (lib.elem "nvim::render-markdown" config.machine.pkgs) {
       opts = {
         completions = {
           blink = {
-            enabled = (lib.elem "nvim::blink" config.machine.pkgs);
+            enabled = (lib.elem "nvim::blink" config.machine.services);
           };
         };
         latex = {
diff --git a/pkgsets/nvim/sniprun.nix b/services/nvim/sniprun.nix
similarity index 94%
rename from pkgsets/nvim/sniprun.nix
rename to services/nvim/sniprun.nix
index 5530fbd..293a4d5 100644
--- a/pkgsets/nvim/sniprun.nix
+++ b/services/nvim/sniprun.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::sniprun" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::sniprun" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       lazy = true;
diff --git a/pkgsets/nvim/table-mode.nix b/services/nvim/table-mode.nix
similarity index 85%
rename from pkgsets/nvim/table-mode.nix
rename to services/nvim/table-mode.nix
index 47f7059..5d100f0 100644
--- a/pkgsets/nvim/table-mode.nix
+++ b/services/nvim/table-mode.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::table-mode" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::table-mode" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       lazy = true;
diff --git a/pkgsets/nvim/telescope.nix b/services/nvim/telescope.nix
similarity index 88%
rename from pkgsets/nvim/telescope.nix
rename to services/nvim/telescope.nix
index 06f2ee0..573b376 100644
--- a/pkgsets/nvim/telescope.nix
+++ b/services/nvim/telescope.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::telescope" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::telescope" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       lazy = true;
@@ -13,8 +13,6 @@ lib.mkIf (lib.elem "nvim::telescope" config.machine.pkgs) {
       dependencies = (
         vPlug: with vPlug; [
           plenary-nvim
-          "ghassan0/telescope-glyph.nvim"
-          "xiyaowong/telescope-emoji.nvim"
         ]
       );
       keys = [
diff --git a/pkgsets/nvim/tmux-navigate.nix b/services/nvim/tmux-navigate.nix
similarity index 92%
rename from pkgsets/nvim/tmux-navigate.nix
rename to services/nvim/tmux-navigate.nix
index 4fca782..7f47d46 100644
--- a/pkgsets/nvim/tmux-navigate.nix
+++ b/services/nvim/tmux-navigate.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::tmux-navigate" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::tmux-navigate" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       dir = vPlug: vPlug.vim-tmux-navigator;
diff --git a/pkgsets/nvim/treesitter.nix b/services/nvim/treesitter.nix
similarity index 94%
rename from pkgsets/nvim/treesitter.nix
rename to services/nvim/treesitter.nix
index aa5f047..9ddfbb6 100644
--- a/pkgsets/nvim/treesitter.nix
+++ b/services/nvim/treesitter.nix
@@ -5,7 +5,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::treesitter" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::treesitter" config.machine.services) {
   programs.nvim-lazy.lazyPlugins =
     let
       treesitter = pkgs.vimPlugins.nvim-treesitter.withAllGrammars;
diff --git a/pkgsets/nvim/trim.nix b/services/nvim/trim.nix
similarity index 76%
rename from pkgsets/nvim/trim.nix
rename to services/nvim/trim.nix
index 9c7b693..01f0df2 100644
--- a/pkgsets/nvim/trim.nix
+++ b/services/nvim/trim.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::trim" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::trim" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       lazy = true;
diff --git a/pkgsets/nvim/undotree.nix b/services/nvim/undotree.nix
similarity index 83%
rename from pkgsets/nvim/undotree.nix
rename to services/nvim/undotree.nix
index f04a1ab..7447474 100644
--- a/pkgsets/nvim/undotree.nix
+++ b/services/nvim/undotree.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::undotree" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::undotree" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       lazy = true;
diff --git a/pkgsets/nvim/which-key.nix b/services/nvim/which-key.nix
similarity index 91%
rename from pkgsets/nvim/which-key.nix
rename to services/nvim/which-key.nix
index 19a042f..ac180d3 100644
--- a/pkgsets/nvim/which-key.nix
+++ b/services/nvim/which-key.nix
@@ -4,7 +4,7 @@
   ...
 }:
 
-lib.mkIf (lib.elem "nvim::which-key" config.machine.pkgs) {
+lib.mkIf (lib.elem "nvim::which-key" config.machine.services) {
   programs.nvim-lazy.lazyPlugins = [
     {
       dir = vPlug: vPlug.which-key-nvim;