feat(flake/nixosModules): init

9 files changed, 45 insertions, 4 deletions

diff --git a/os/cez/configuration.nix b/os/cez/configuration.nix
index a069f21..a05f00e 100644
--- a/os/cez/configuration.nix
+++ b/os/cez/configuration.nix
@@ -7,5 +7,8 @@
     ./modules/specialisation.nix
     ./modules/wireguard.nix
     ./modules/tlp.nix
+    ../../global/cez
   ];
+
+  networking.hostName = "cez";
 }
diff --git a/os/common/configuration.nix b/os/common/configuration.nix
index b1dd263..d8d465e 100644
--- a/os/common/configuration.nix
+++ b/os/common/configuration.nix
@@ -16,11 +16,17 @@ in
     ./modules/user.nix
     ./modules/environment.nix
     ./modules/pppd.nix
+    ./modules/home-manager.nix
+    ../../global/common
   ];
 
   system.stateVersion = "24.05";
   time.timeZone = "Asia/Kolkata";
-  networking.useDHCP = false;
+
+  networking = {
+    useDHCP = false;
+    hostName = lib.mkOptionDefault "common";
+  };
 
   swapDevices = lib.mkDefault [
     {
diff --git a/os/common/modules/home-manager.nix b/os/common/modules/home-manager.nix
new file mode 100644
index 0000000..d93df49
--- /dev/null
+++ b/os/common/modules/home-manager.nix
@@ -0,0 +1,18 @@
+{ config, lib, ... }:
+let
+  username = config.global.userdata.name;
+  host = config.networking.hostName;
+in
+{
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = false;
+    users.${username} =
+      { ... }:
+      {
+        imports = [
+          ../../../home/common/home.nix
+        ] ++ lib.optional (builtins.pathExists ../../../home/${host}) ../../../home/${host}/home.nix;
+      };
+  };
+}
diff --git a/os/fscusat/configuration.nix b/os/fscusat/configuration.nix
index 598ae8c..68d9765 100644
--- a/os/fscusat/configuration.nix
+++ b/os/fscusat/configuration.nix
@@ -10,6 +10,7 @@
     ./modules/mirror
   ];
 
+  networking.hostName = "fscusat";
   services.openssh.ports = [
     22
     465
diff --git a/os/kay/configuration.nix b/os/kay/configuration.nix
index 696cad3..a7765a8 100644
--- a/os/kay/configuration.nix
+++ b/os/kay/configuration.nix
@@ -21,6 +21,7 @@
     ./modules/alina.nix
   ];
 
+  networking.hostName = "kay";
   boot = {
     consoleLogLevel = 3;
     binfmt.emulatedSystems = [ "aarch64-linux" ];
diff --git a/os/kay/modules/alina.nix b/os/kay/modules/alina.nix
index 6f8fac4..c567953 100644
--- a/os/kay/modules/alina.nix
+++ b/os/kay/modules/alina.nix
@@ -1,8 +1,10 @@
-{ config, pkgs, ... }:
+{ config, alina, ... }:
 let
   domain = "alinafs.com";
 in
 {
+  imports = [ alina.nixosModules.alina ];
+
   sops.secrets."misc/alina" = { };
 
   services.postgresql = {
diff --git a/os/lia/configuration.nix b/os/lia/configuration.nix
index 6e5323e..27a0959 100644
--- a/os/lia/configuration.nix
+++ b/os/lia/configuration.nix
@@ -10,4 +10,6 @@
     ./modules/lxc.nix
     ./modules/sshfwd.nix
   ];
+
+  networking.hostName = "lia";
 }
diff --git a/os/pc/configuration.nix b/os/pc/configuration.nix
index 33f38cd..423f66d 100644
--- a/os/pc/configuration.nix
+++ b/os/pc/configuration.nix
@@ -1,4 +1,9 @@
-{ config, pkgs, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
   user = config.global.userdata.name;
 in
@@ -15,6 +20,8 @@ in
     ./modules/firejail.nix
   ];
 
+  networking.hostName = lib.mkDefault "pc";
+
   boot = {
     consoleLogLevel = 3;
     kernelPackages = pkgs.linuxPackages_latest;
diff --git a/os/server/configuration.nix b/os/server/configuration.nix
index 24f6f09..124b227 100644
--- a/os/server/configuration.nix
+++ b/os/server/configuration.nix
@@ -1,7 +1,8 @@
-{ ... }:
+{ lib, ... }:
 {
   imports = [ ../common/configuration.nix ];
 
+  networking.hostName = lib.mkDefault "server";
   services.openssh = {
     enable = true;
     settings.PasswordAuthentication = false;