diff --git a/configurations/home-manager/leyla/packages/vscode/default.nix b/configurations/home-manager/leyla/packages/vscode/default.nix
index 228f634..f911104 100644
--- a/configurations/home-manager/leyla/packages/vscode/default.nix
+++ b/configurations/home-manager/leyla/packages/vscode/default.nix
@@ -8,10 +8,6 @@
   nix-development-enabled = osConfig.host.nix-development.enable;
   ai-tooling-enabled = osConfig.host.ai.enable;
 in {
-  imports = [
-    ./user-words.nix
-  ];
-
   config = lib.mkIf config.user.isDesktopUser {
     programs = {
       bash.shellAliases = {
@@ -30,6 +26,7 @@ in {
           userSettings = lib.mkMerge [
             {
               "workbench.colorTheme" = "Atom One Dark";
+              "cSpell.userWords" = import ./user-words.nix;
               "javascript.updateImportsOnFileMove.enabled" = "always";
               "editor.tabSize" = 2;
               "editor.insertSpaces" = false;
@@ -44,6 +41,9 @@ in {
                 "editor.formatOnType" = true;
               };
               "alejandra.program" = "alejandra";
+              "nixpkgs" = {
+                "expr" = "import <nixpkgs> {}";
+              };
             })
             (lib.mkIf ai-tooling-enabled {
               })
@@ -52,67 +52,58 @@ in {
           extensions = let
             extension-pkgs = pkgs.nix-vscode-extensions.forVSCodeVersion config.programs.vscode.package.version;
           in (
-            (
-              with extension-pkgs.open-vsx; (
-                [
-                  # vs code feel extensions
-                  ms-vscode.atom-keybindings
-                  akamud.vscode-theme-onedark
-                  streetsidesoftware.code-spell-checker
-                  streetsidesoftware.code-spell-checker-german
-                  streetsidesoftware.code-spell-checker-italian
-                  jeanp413.open-remote-ssh
+            with extension-pkgs.open-vsx;
+              [
+                # vs code feel extensions
+                ms-vscode.atom-keybindings
+                akamud.vscode-theme-onedark
+                streetsidesoftware.code-spell-checker
+                streetsidesoftware.code-spell-checker-german
+                streetsidesoftware.code-spell-checker-italian
+                jeanp413.open-remote-ssh
 
-                  # html extensions
-                  formulahendry.auto-rename-tag
-                  ms-vscode.live-server
+                # html extensions
+                formulahendry.auto-rename-tag
+                ms-vscode.live-server
 
-                  # js extensions
-                  dsznajder.es7-react-js-snippets
-                  dbaeumer.vscode-eslint
-                  standard.vscode-standard
-                  orta.vscode-jest
-                  stylelint.vscode-stylelint
-                  tauri-apps.tauri-vscode
+                # js extensions
+                dsznajder.es7-react-js-snippets
+                dbaeumer.vscode-eslint
+                standard.vscode-standard
+                orta.vscode-jest
+                stylelint.vscode-stylelint
+                tauri-apps.tauri-vscode
 
-                  # go extensions
-                  golang.go
+                # go extensions
+                golang.go
 
-                  # astro blog extensions
-                  astro-build.astro-vscode
-                  unifiedjs.vscode-mdx
+                # astro blog extensions
+                astro-build.astro-vscode
+                unifiedjs.vscode-mdx
 
-                  # misc extensions
-                  tamasfe.even-better-toml
-                ]
-                ++ (lib.lists.optionals nix-development-enabled [
-                  # nix extensions
-                  pinage404.nix-extension-pack
-                  jnoortheen.nix-ide
-                  kamadorueda.alejandra
-                ])
-              )
-            )
-            ++ (
-              with extension-pkgs.vscode-marketplace; (
-                [
-                  # js extensions
-                  karyfoundation.nearley
-                ]
-                ++ (lib.lists.optionals ai-tooling-enabled [
-                  ])
-              )
-            )
-            ++ (
-              with pkgs.codium-extensions; (
-                []
-                ++ (
-                  lib.lists.optionals ai-tooling-enabled [
-                    ai-code
+                # misc extensions
+                tamasfe.even-better-toml
+              ]
+              ++ (lib.lists.optionals nix-development-enabled [
+                # nix extensions
+                pinage404.nix-extension-pack
+                jnoortheen.nix-ide
+                kamadorueda.alejandra
+              ])
+              ++ (
+                with extension-pkgs.vscode-marketplace;
+                  [
+                    # js extensions
+                    karyfoundation.nearley
                   ]
-                )
+                  ++ (lib.lists.optionals ai-tooling-enabled [
+                    ])
+              )
+              ++ (
+                with pkgs.codium-extensions; [
+                  ai-code
+                ]
               )
-            )
           );
         };
       };
diff --git a/configurations/home-manager/leyla/packages/vscode/user-words.nix b/configurations/home-manager/leyla/packages/vscode/user-words.nix
index ca4b1d1..b581118 100644
--- a/configurations/home-manager/leyla/packages/vscode/user-words.nix
+++ b/configurations/home-manager/leyla/packages/vscode/user-words.nix
@@ -1,69 +1,6 @@
-{...}: {
-  config.programs.vscode.profiles.default.userSettings = {
-    "cSpell.userWords" = [
-      "leyla"
-      "ollama"
-      "webdav"
-      "pname"
-      "direnv"
-      "deepseek"
-      "qwen"
-      "syncthing"
-      "immich"
-      "sonos"
-      "makemkv"
-      "hass"
-      "qbittorent"
-      "prostudiomasters"
-      "tmpfiles"
-      "networkmanager"
-      "Networkd"
-      "networkmanager"
-      "dialout"
-      "adbusers"
-      "protonmail"
-      "authkey"
-      "netdevs"
-      "atomix"
-      "geary"
-      "gedit"
-      "hitori"
-      "iagno"
-      "alsa"
-      "timezoned"
-      "pipewire"
-      "pulseaudio"
-      "rtkit"
-      "disko"
-      "ashift"
-      "autotrim"
-      "canmount"
-      "mountpoint"
-      "xattr"
-      "acltype"
-      "relatime"
-      "keyformat"
-      "keylocation"
-      "vdevs"
-
-      # codium extensions
-      "akamud"
-      "onedark"
-      "jeanp"
-      "dsznajder"
-      "dbaeumer"
-      "orta"
-      "tauri"
-      "unifiedjs"
-      "tamasfe"
-      "pinage"
-      "jnoortheen"
-      "kamadorueda"
-      "karyfoundation"
-      "nearley"
-
-      # nix.optimise is spelled wrong
-      "optimise"
-    ];
-  };
-}
+[
+  "leyla"
+  "webdav"
+  "ollama"
+  "optimise"
+]
diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix
index 094becb..960e90b 100644
--- a/configurations/nixos/defiant/configuration.nix
+++ b/configurations/nixos/defiant/configuration.nix
@@ -201,7 +201,7 @@
       autoSnapshot.enable = true;
     };
 
-    # temp enable desktop environment for setup
+    # temp enable desktop enviroment for setup
     # Enable the X11 windowing system.
     xserver.enable = true;
 
diff --git a/modules/nixos-modules/desktop.nix b/modules/nixos-modules/desktop.nix
index e1882b3..900aacf 100644
--- a/modules/nixos-modules/desktop.nix
+++ b/modules/nixos-modules/desktop.nix
@@ -22,7 +22,7 @@
         gnome-characters # character set viewer
         gnome-music # music player
         gnome-photos # photo viewer
-        gnome-logs # log viewer
+        gnome-logs # log viwer
         gnome-maps # map viewer
         gnome-tour # welcome tour
         hitori # sudoku game
diff --git a/modules/nixos-modules/users.nix b/modules/nixos-modules/users.nix
index b135367..a774e44 100644
--- a/modules/nixos-modules/users.nix
+++ b/modules/nixos-modules/users.nix
@@ -17,6 +17,7 @@
     eve = 1002;
     jellyfin = 2000;
     forgejo = 2002;
+    adguardhome = 2003;
     hass = 2004;
     syncthing = 2007;
     ollama = 2008;
@@ -33,6 +34,7 @@
     jellyfin_media = 2001;
     jellyfin = 2000;
     forgejo = 2002;
+    adguardhome = 2003;
     hass = 2004;
     syncthing = 2007;
     ollama = 2008;
@@ -127,6 +129,12 @@ in {
             group = config.users.users.forgejo.name;
           };
 
+          adguardhome = {
+            uid = lib.mkForce uids.adguardhome;
+            isSystemUser = true;
+            group = config.users.users.adguardhome.name;
+          };
+
           hass = {
             uid = lib.mkForce uids.hass;
             isSystemUser = true;
@@ -219,6 +227,14 @@ in {
             ];
           };
 
+          adguardhome = {
+            gid = lib.mkForce gids.adguardhome;
+            members = [
+              users.adguardhome.name
+              # leyla
+            ];
+          };
+
           hass = {
             gid = lib.mkForce gids.hass;
             members = [