5 files changed, 67 insertions, 111 deletions
diff --git a/hosts/adam/audio.nix b/hosts/adam/audio.nix
deleted file mode 100644
index e34b073..0000000
--- a/hosts/adam/audio.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ ... }:
-
-{
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-}
diff --git a/hosts/adam/configuration.nix b/hosts/adam/configuration.nix
index 5423ef7..88defa1 100644
--- a/hosts/adam/configuration.nix
+++ b/hosts/adam/configuration.nix
@@ -1,17 +1,17 @@
 {
-  pkgs,
+  inputs,
+  system,
   host,
+  pkgs,
   username,
   ...
 }:
 
 {
-
   imports = [
     ./hardware-configuration.nix
-    ./audio.nix
-    ./wooting.nix
-    ../../modules/nixos
+    ../../modules
+		../../modules/system
   ];
 
   boot = {
@@ -52,54 +52,37 @@
 
   environment.variables.AMD_VULKAN_ICD = "RADV";
 
-  # Network
-  networking = {
-    hostName = host;
-    networkmanager.enable = true;
-  };
+  home-manager.users.${username} = {
+    home.username = username;
+    home.homeDirectory = "/home/${username}";
 
-  # Improve startup time
-  systemd.services.NetworkManager-wait-online.enable = false;
+    programs.home-manager.enable = true;
 
-  # Time
-  time.timeZone = "Europe/Berlin";
+    home.packages = with pkgs; [
+      obsidian
+      firefox
+      imv
+      mpv
 
-  # Keymap
-  console.keyMap = "de";
+      nextcloud-client
 
-  # User
-  users.users.${username} = {
-    isNormalUser = true;
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-      "video"
-      "input"
+      xdg-utils
+      pulsemixer
     ];
-    shell = pkgs.zsh;
-    ignoreShellProgramCheck = true;
-  };
-
-	xdg.portal = {
-		enable = true;
-		wlr.enable = true;
+    home.stateVersion = "25.05";
   };
 
-  services.openssh.enable = true;
-
-  programs.dconf.enable = true;
-
-  # Mullvad vpn
-  services.mullvad-vpn = {
-    enable = true;
-    package = pkgs.mullvad-vpn;
-  };
-
-  nix.settings.experimental-features = [
-    "nix-command"
-    "flakes"
-  ];
-  nixpkgs.config.allowUnfree = true;
+  nx.desktop.sway.enable = true;
+  nx.desktop.waybar.enable = true;
+  nx.desktop.dunst.enable = true;
+  nx.programs.gh.enable = true;
+  nx.programs.gpg.enable = true;
+  nx.programs.neovim.enable = true;
+  nx.programs.tmux.enable = true;
+  nx.programs.zsh.enable = true;
+  nx.programs.foot.enable = true;
+  nx.programs.spicetify.enable = true;
+  nx.programs.zathura.enable = true;
 
   system.stateVersion = "25.05";
 }
diff --git a/hosts/adam/home.nix b/hosts/adam/home.nix
index 3482e1d..8f22d97 100644
--- a/hosts/adam/home.nix
+++ b/hosts/adam/home.nix
@@ -5,25 +5,7 @@
     ../../modules/home-manager
   ];
 
-  home.username = username;
-  home.homeDirectory = "/home/${username}";
-
-  programs.home-manager.enable = true;
-
-  home.packages = with pkgs; [
-    obsidian
-    firefox
-    imv
-    mpv
-
-    nextcloud-client
-
-    xdg-utils
-    pulsemixer
-
-    # fonts
-    noto-fonts
-    noto-fonts-cjk-sans
+      noto-fonts-cjk-sans
     noto-fonts-emoji
   ];
 
@@ -37,6 +19,7 @@
   foot.enable = true;
   waybar.enable = true;
   dunst.enable = true;
+  hyprlock.enable = true;
 
   spicetify.enable = true;
   zathura.enable = true;
diff --git a/hosts/lilith/configuration.nix b/hosts/lilith/configuration.nix
index 897fc1d..390a8a3 100644
--- a/hosts/lilith/configuration.nix
+++ b/hosts/lilith/configuration.nix
@@ -1,10 +1,43 @@
-{ host, username, ... }:
+{
+  pkgs,
+  host,
+  username,
+  ...
+}:
 
 {
+  imports = [
+    ../../modules
+  ];
+
   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;
+
+    home.packages = with pkgs; [
+      htop
+      ffmpeg
+      wget
+      imagemagick
+
+      gcc
+      maven
+      cmake
+      gnupg
+      lua
+
+      zathura
+
+      nerd-fonts.symbols-only
+    ];
+  };
+
   system.primaryUser = username;
   system.defaults = {
     dock = {
@@ -49,5 +82,7 @@
     onActivation.upgrade = true;
   };
 
+  nx.
+
   system.stateVersion = 5;
 }
diff --git a/hosts/lilith/home.nix b/hosts/lilith/home.nix
deleted file mode 100644
index 55af127..0000000
--- a/hosts/lilith/home.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ pkgs, username, ... }:
-
-{
-  imports = [
-    ../../modules/home-manager
-  ];
-
-  home.username = username;
-  home.homeDirectory = "/Users/${username}";
-
-  home.packages = with pkgs; [
-    htop
-    ffmpeg
-    wget
-    imagemagick
-
-    gcc
-    maven
-    cmake
-    gnupg
-    lua
-
-    zathura
-
-    nerd-fonts.symbols-only
-  ];
-
-  dev.enable = true;
-  spicetify.enable = true;
-	latex.enable = true;
-	anki.enable = true;
-
-  home.stateVersion = "25.05";
-}