refactor: use flake-parts, change modules structure

3 files changed, 48 insertions, 131 deletions

diff --git a/hosts/adam/configuration.nix b/hosts/adam/configuration.nix
index 0abfeac..18f3d4f 100644
--- a/hosts/adam/configuration.nix
+++ b/hosts/adam/configuration.nix
@@ -1,9 +1,11 @@
 {
   pkgs,
-  username,
   ...
 }:
 
+let
+  username = "schererleander";
+in
 {
   imports = [
     ./hardware-configuration.nix
@@ -11,33 +13,13 @@
 
   boot = {
     kernelPackages = pkgs.linuxPackages_latest;
-    kernelParams = [
-      "amd_pstate=active"
-      "quiet"
-      "splash"
-      "boot.shell_on_fail"
-      "udev.log_priority=3"
-      "rd.systemd.show_status=auto"
-    ];
-    initrd = {
-      luks.devices."luks-803851e9-7fa8-4367-a927-0bb76d0fe830".device =
-        "/dev/disk/by-uuid/803851e9-7fa8-4367-a927-0bb76d0fe830";
-    };
-    consoleLogLevel = 3;
+    kernelParams = [ "amd_pstate=active" ];
+    initrd.luks.devices."luks-803851e9-7fa8-4367-a927-0bb76d0fe830".device =
+      "/dev/disk/by-uuid/803851e9-7fa8-4367-a927-0bb76d0fe830";
     loader = {
       timeout = 0;
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
-      systemd-boot.consoleMode = "max";
-    };
-    plymouth = {
-      enable = true;
-      theme = "lone";
-      themePackages = with pkgs; [
-        (adi1090x-plymouth-themes.override {
-          selected_themes = [ "lone" ];
-        })
-      ];
     };
   };
 
@@ -47,20 +29,6 @@
     enable32Bit = true;
   };
 
-  hardware.bluetooth = {
-    enable = true;
-    powerOnBoot = true;
-    settings = {
-      General = {
-        Experimental = true;
-        FastConnectable = true;
-      };
-      Policy = {
-        AutoEnable = true;
-      };
-    };
-  };
-
   networking.networkmanager.enable = true;
 
   # Localisation
@@ -84,48 +52,31 @@
   programs.dconf.enable = true;
 
   nx = {
+    plymouth.enable = true;
     desktop.kde.enable = true;
-		dns.enable = true;
-
-    user.${username} = {
-      stateVersion = "25.11";
-      packages = with pkgs; [
-        imv
-        mpv
-        firefox
-        zoxide
-      ];
-      shellAliases = {
-        open = "xdg-open";
-      };
+    steam.enable = true;
+    dns.enable = true;
+    hardware.bluetooth.enable = true;
+  };
 
-      nx = {
-        terminal.defaultShell = "zsh";
+  # User configuration
+  users.users.${username} = {
+    isNormalUser = true;
+    home = "/home/${username}";
+    shell = pkgs.zsh;
+    ignoreShellProgramCheck = true;
+    extraGroups = [
+      "wheel"
+      "networkmanager"
+      "video"
+      "input"
+    ];
+  };
 
-        editors.neovim = {
-          enable = true;
-          langs = {
-            python = true;
-            go = true;
-            latex = true;
-						nix = true;
-						lua = 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;
-        };
-      };
-    };
+  home-manager.users.${username} = {
+    imports = [ ../../home/schererleander.nix ];
+    home.username = username;
+    home.homeDirectory = "/home/${username}";
   };
 
   system.stateVersion = "25.11";
diff --git a/hosts/lilith/configuration.nix b/hosts/lilith/configuration.nix
index 2a35c74..e631b51 100644
--- a/hosts/lilith/configuration.nix
+++ b/hosts/lilith/configuration.nix
@@ -1,57 +1,21 @@
 {
-  pkgs,
   host,
-  username,
   ...
 }:
 
+let
+  username = "schererleander";
+in
 {
   networking.hostName = host;
 
-  nx.user.${username} = {
-    stateVersion = "25.11";
-    packages = with pkgs; [
-      htop
-      ffmpeg
-      wget
+  # User configuration
+  users.users.${username}.home = "/Users/${username}";
 
-      zathura
-      gemini-cli
-      iterm2
-      rectangle
-      slack
-      podman
-      jetbrains.idea-community
-
-      nerd-fonts.symbols-only
-    ];
-    sessionVariables = {
-      PATH = "/opt/homebrew/opt/openjdk@21/bin:$PATH";
-    };
-
-    nx = {
-      terminal.defaultShell = "zsh";
-
-      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;
-      };
-    };
+  home-manager.users.${username} = {
+    imports = [ ../../home/schererleander.nix ];
+    home.username = username;
+    home.homeDirectory = "/Users/${username}";
   };
 
   system.primaryUser = username;
@@ -63,8 +27,6 @@
     };
     WindowManager.EnableStandardClickToShowDesktop = false;
     finder = {
-      #ShowPathbar = true;
-      #ShowStatusBar = true;
       _FXShowPosixPathInTitle = true;
       _FXSortFoldersFirst = true;
     };
@@ -82,11 +44,7 @@
       "openjdk@21"
     ];
     casks = [
-      "nextcloud"
       "mullvad-vpn"
-      "bambu-studio"
-      "arduino-ide"
-      "anki"
     ];
     onActivation.cleanup = "zap";
     onActivation.autoUpdate = true;
diff --git a/hosts/sachiel/configuration.nix b/hosts/sachiel/configuration.nix
index 3944006..207447d 100644
--- a/hosts/sachiel/configuration.nix
+++ b/hosts/sachiel/configuration.nix
@@ -1,10 +1,12 @@
 {
   pkgs,
   host,
-  username,
   ...
 }:
 
+let
+  username = "administrator";
+in
 {
   imports = [
     ./hardware-configuration.nix
@@ -65,10 +67,16 @@
   };
 
   nx.server = {
-    openssh.enable = true;
+    openssh = {
+      enable = true;
+      allowedUsers = [ username ];
+    };
     fail2ban.enable = true;
     nginx.enable = true;
-    nextcloud.enable = true;
+    nextcloud = {
+      enable = true;
+      user = username;
+    };
     site.enable = true;
   };