2 files changed, 42 insertions, 75 deletions

diff --git a/hosts/adam/configuration.nix b/hosts/adam/configuration.nix
index 27aa010..4c8ea21 100644
--- a/hosts/adam/configuration.nix
+++ b/hosts/adam/configuration.nix
@@ -1,7 +1,6 @@
 {
   pkgs,
   username,
-  inputs,
   ...
 }:
 
@@ -10,8 +9,6 @@
     ./hardware-configuration.nix
   ];
 
-  home-manager.extraSpecialArgs = { inherit inputs; };
-
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
     kernelParams = [
@@ -66,32 +63,25 @@
 
   programs.dconf.enable = true;
 
-  home-manager.users.${username} = {
-    home.username = username;
-    home.homeDirectory = "/home/${username}";
-    imports = [
-      ../../modules/users
-      inputs.nixcord.homeModules.nixcord
-      inputs.spicetify-nix.homeManagerModules.spicetify
-    ];
-
-    programs.home-manager.enable = true;
-    home.packages = with pkgs; [
-      imv
-      mpv
-      firefox
+  nx = {
+    desktop.kde.enable = true;
 
-      zoxide
-    ];
+    user.${username} = {
+      stateVersion = "25.11";
+      packages = with pkgs; [
+        imv
+        mpv
+        firefox
+        zoxide
+      ];
+      shellAliases = {
+        open = "xdg-open";
+      };
 
-    programs.zsh.shellAliases = {
-      open = "xdg-open";
-    };
+      nx = {
+        terminal.defaultShell = "zsh";
 
-    nx = {
-      #browsers.firefox.enable = true;
-      editors = {
-        neovim = {
+        editors.neovim = {
           enable = true;
           langs = {
             python = true;
@@ -100,27 +90,19 @@
             latex = true;
           };
         };
+        git.enable = true;
+        cli.opencode.enable = true;
+        media = {
+          spicetify.enable = true;
+          nixcord.enable = true;
+        };
+        productivity = {
+          nextcloud-client.enable = true;
+          obsidian.enable = true;
+          latex.enable = true;
+          anki.enable = true;
+        };
       };
-      git.enable = true;
-      cli = {
-        opencode.enable = true;
-      };
-      media = {
-        spicetify.enable = true;
-        nixcord.enable = true;
-      };
-      productivity = {
-        obsidian.enable = true;
-        latex.enable = true;
-      };
-    };
-
-    home.stateVersion = "25.11";
-  };
-
-  nx = {
-    desktop = {
-      kde.enable = true;
     };
   };
 
diff --git a/hosts/lilith/configuration.nix b/hosts/lilith/configuration.nix
index f3962d8..2a35c74 100644
--- a/hosts/lilith/configuration.nix
+++ b/hosts/lilith/configuration.nix
@@ -2,27 +2,15 @@
   pkgs,
   host,
   username,
-  inputs,
   ...
 }:
 
 {
-  users.users.${username}.home = "/Users/${username}";
-
   networking.hostName = host;
 
-  home-manager.users.${username} = {
-    home.username = username;
-    home.homeDirectory = "/Users/${username}";
-    programs.home-manager.enable = true;
-
-    imports = [
-      ../../modules/users
-      inputs.nixcord.homeModules.nixcord
-      inputs.spicetify-nix.homeManagerModules.spicetify
-    ];
-
-    home.packages = with pkgs; [
+  nx.user.${username} = {
+    stateVersion = "25.11";
+    packages = with pkgs; [
       htop
       ffmpeg
       wget
@@ -37,27 +25,24 @@
 
       nerd-fonts.symbols-only
     ];
-    home.stateVersion = "25.11";
-    home.sessionVariables = {
+    sessionVariables = {
       PATH = "/opt/homebrew/opt/openjdk@21/bin:$PATH";
     };
 
     nx = {
-      editors = {
-        neovim = {
-          enable = true;
-          langs = {
-            python = true;
-            go = true;
-            java = true;
-            latex = true;
-          };
+      terminal.defaultShell = "zsh";
+
+      editors.neovim = {
+        enable = true;
+        langs = {
+          python = true;
+          go = true;
+          java = true;
+          latex = true;
         };
       };
       git.enable = true;
-      cli = {
-        opencode.enable = true;
-      };
+      cli.opencode.enable = true;
       media = {
         spicetify.enable = true;
         nixcord.enable = true;