refactor(modules): separate nixos/home-manager modules, use standard option conventions

1 files changed, 34 insertions, 17 deletions

diff --git a/hosts/lilith/configuration.nix b/hosts/lilith/configuration.nix
index a3c138f..f3962d8 100644
--- a/hosts/lilith/configuration.nix
+++ b/hosts/lilith/configuration.nix
@@ -2,14 +2,11 @@
   pkgs,
   host,
   username,
+  inputs,
   ...
 }:
 
 {
-  imports = [
-    ../../modules/programs
-  ];
-
   users.users.${username}.home = "/Users/${username}";
 
   networking.hostName = host;
@@ -19,6 +16,12 @@
     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; [
       htop
       ffmpeg
@@ -30,7 +33,7 @@
       rectangle
       slack
       podman
-			jetbrains.idea-community
+      jetbrains.idea-community
 
       nerd-fonts.symbols-only
     ];
@@ -38,6 +41,32 @@
     home.sessionVariables = {
       PATH = "/opt/homebrew/opt/openjdk@21/bin:$PATH";
     };
+
+    nx = {
+      editors = {
+        neovim = {
+          enable = true;
+          langs = {
+            python = true;
+            go = true;
+            java = true;
+            latex = true;
+          };
+        };
+      };
+      git.enable = true;
+      cli = {
+        opencode.enable = true;
+      };
+      media = {
+        spicetify.enable = true;
+        nixcord.enable = true;
+      };
+      productivity = {
+        obsidian.enable = true;
+        latex.enable = true;
+      };
+    };
   };
 
   system.primaryUser = username;
@@ -79,18 +108,6 @@
     onActivation.upgrade = true;
   };
 
-  nx = {
-    programs = {
-      neovim.enable = true;
-      zsh.enable = true;
-      anki.enable = true;
-      spicetify.enable = true;
-      zed-editor.enable = true;
-      obsidian.enable = true;
-			opencode.enable = true;
-    };
-  };
-
   nix.enable = false;
 
   system.stateVersion = 5;