nix-configs

commit 42f317cb53c8ac535f773397574fa650714bc27b
parent 7554681e152d42000a0de3560066002a21b6b34a
Author: breadcat <breadcat@users.noreply.github.com>
Date:   Wed,  6 Aug 2025 12:36:32 +0100

Ordering again

Diffstat:
M
machines/arcadia.nix
 | 
15
+++++++--------
M
machines/artemis.nix
 | 
4
++--

2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/machines/arcadia.nix b/machines/arcadia.nix
@@ -1,6 +1,6 @@
 # HTPC
 
-{ config, pkgs, domain, machine, username, fullname, sshkey, sshport, timezone, ... }:
+{ config, pkgs, domain, machine, username, fullname, sshkey, sshport, timezone, privatekey, ... }:
 
 let
   home-manager = builtins.fetchTarball https://github.com/nix-community/home-manager/archive/release-25.05.tar.gz; # stable
@@ -10,21 +10,20 @@ in
 {
   # Common OS imports
   imports =
-    [ # Include the results of the hardware scan.
-      ./${machine}-hardware.nix
+    [
+      ./${machine}-hardware.nix # Include the results of the hardware scan.
+      (import "${home-manager}/nixos") # Home-Manager
       ../common/audio.nix
       ../common/flakes.nix
       ../common/garbage.nix
       (import ../common/locale.nix {inherit config pkgs timezone;})
       ../common/mount-drives.nix
       ../common/nfs.nix
-      # ../common/kodi-module.nix
       ../common/packages.nix
+      (import ../common/ssh.nix {inherit username sshkey sshport privatekey;})
       (import ../common/syncthing.nix {inherit config pkgs username;})
       (import ../common/user.nix {inherit config pkgs username fullname;})
-      (import ../common/ssh.nix {inherit username sshkey sshport;})
       ../scripts/htpc-launcher.nix
-      (import "${home-manager}/nixos")
     ];
 
   # Home-Manager
@@ -32,10 +31,10 @@ in
   home-manager.users.${username} = { pkgs, ... }: {
     imports = [
       (import ../home/fish.nix {inherit pkgs domain;})
-      ../home/hyprland.nix
       ../home/ghostty.nix
+      ../home/hyprland.nix
       (import ../home/kodi.nix {inherit username;})
-      (import ../home/ssh.nix {inherit domain username sshport;})
+      (import ../home/ssh.nix {inherit domain username sshport privatekey;})
     ];
 
     # The state version is required and should stay at the version you
diff --git a/machines/artemis.nix b/machines/artemis.nix
@@ -25,12 +25,11 @@ in {
     [
     ./${machine}-hardware.nix # Include the results of the hardware scan.
     (import "${home-manager}/nixos") # Home-Manager
-    (import ../common/docker.nix {inherit config pkgs username domain timezone htpasswd todosecret vpnusername vpnpassword;})
     (import ../common/blog-duolingo.nix {inherit pkgs domain username;})
     (import ../common/blog-status.nix {inherit pkgs domain username;})
+    (import ../common/docker.nix {inherit config pkgs username domain timezone htpasswd todosecret vpnusername vpnpassword;})
     ../common/flakes.nix
     ../common/garbage.nix
-    ../common/vnstat.nix
     (import ../common/locale.nix {inherit pkgs timezone;})
     (import ../common/magnets.nix {inherit pkgs username;})
     ../common/mount-drives.nix
@@ -39,6 +38,7 @@ in {
     (import ../common/ssh.nix {inherit username sshkey sshport;})
     (import ../common/syncthing.nix {inherit config pkgs username;})
     (import ../common/user.nix {inherit config pkgs username fullname;})
+    ../common/vnstat.nix
     ../scripts/stagit-generate.nix
     ];