Commit 2025eb4a4e63
Changed files (3)
lib/default.nix
@@ -12,7 +12,7 @@
mkHome =
{
hostname,
- user,
+ username,
desktop ? null,
system ? "x86_64-linux",
}:
@@ -33,8 +33,8 @@
hostname
desktop
globals
+ username
;
- username = user;
libx = import ./functions.nix { inherit (inputs.nixpkgs) lib; };
};
modules = [
@@ -42,45 +42,6 @@
];
};
- newMkHost =
- {
- hostname,
- system ? "x86_64-linux",
- pkgsInput ? inputs.nixpkgs,
- }:
- let
- globals = import ../globals.nix {
- inherit (pkgsInput) lib;
- inherit hostname;
- };
- specialArgs = {
- inherit
- self
- inputs
- outputs
- stateVersion
- hostname
- globals
- system
- ;
- libx = import ./functions.nix { inherit (pkgsInput) lib; };
- monitoring = import ./monitoring.nix { inherit (pkgsInput) lib; };
- };
- in
- pkgsInput.lib.nixosSystem {
- inherit specialArgs;
- inherit system;
- modules = [
- self.nixosModules.wireguard-client
- self.nixosModules.wireguard-server
- self.nixosModules.govanityurl
- self.nixosModules.gosmee
- self.nixosModules.rsync-replica
- inputs.agenix.nixosModules.default
- ../systems/new.nix
- ];
- };
-
# Function for generating host configs
mkHost =
{
@@ -90,6 +51,7 @@
system ? "x86_64-linux",
pkgsInput ? inputs.nixpkgs,
homeInput ? inputs.home-manager,
+ agenixInput ? inputs.agenix,
}:
let
globals = import ../globals.nix {
@@ -121,72 +83,7 @@
self.nixosModules.govanityurl
self.nixosModules.gosmee
self.nixosModules.rsync-replica
- inputs.agenix.nixosModules.default
- inputs.lanzaboote.nixosModules.lanzaboote
- homeInput.nixosModules.home-manager
- {
- home-manager.extraSpecialArgs = specialArgs;
- home-manager.useGlobalPkgs = true;
- home-manager.useUserPackages = true;
- }
- ../systems
- ];
- };
-
- # Function for generating host configs
- mkRPIHost =
- {
- hostname,
- desktop ? null,
- hardwareType ? "",
- pkgsInput ? inputs.nixpkgs-25_05,
- homeInput ? inputs.home-manager-25_05,
- nixos-raspberrypi ? inputs.nixos-raspberrypi,
- }:
- let
- system = "aarch64-linux";
- globals = import ../globals.nix {
- inherit (pkgsInput) lib;
- inherit hostname;
- };
- specialArgs = {
- inherit
- self
- inputs
- outputs
- stateVersion
- hostname
- desktop
- hardwareType
- system
- globals
- nixos-raspberrypi
- ;
- libx = import ./functions.nix { inherit (pkgsInput) lib; };
- monitoring = import ./monitoring.nix { inherit (pkgsInput) lib; };
- };
- in
- inputs.nixos-raspberrypi.lib.nixosSystemFull {
- inherit specialArgs;
- inherit system;
- modules = [
- (
- { ... }:
- {
- imports = with inputs.nixos-raspberrypi.nixosModules; [
- raspberry-pi-5.base
- raspberry-pi-5.bluetooth
- raspberry-pi-5.page-size-16k
- raspberry-pi-5.display-vc4
- ];
- }
- )
- self.nixosModules.wireguard-client
- self.nixosModules.wireguard-server
- self.nixosModules.govanityurl
- self.nixosModules.gosmee
- self.nixosModules.rsync-replica
- inputs.agenix.nixosModules.default
+ agenixInput.nixosModules.default
inputs.lanzaboote.nixosModules.lanzaboote
homeInput.nixosModules.home-manager
{
flake.nix
@@ -99,6 +99,7 @@
hardwareType = "rpi4";
pkgsInput = inputs.nixpkgs-25_11;
homeInput = inputs.home-manager-25_11;
+ agenixInput = inputs.agenix-25_11;
};
demeter = libx.mkHost {
hostname = "demeter";
@@ -106,6 +107,7 @@
hardwareType = "rpi4";
pkgsInput = inputs.nixpkgs-25_11;
homeInput = inputs.home-manager-25_11;
+ agenixInput = inputs.agenix-25_11;
};
aix = libx.mkHost {
hostname = "aix";
@@ -113,28 +115,28 @@
hardwareType = "rpi4";
pkgsInput = inputs.nixpkgs-25_11;
homeInput = inputs.home-manager-25_11;
+ agenixInput = inputs.agenix-25_11;
};
aion = libx.mkHost {
hostname = "aion";
system = "aarch64-linux";
pkgsInput = inputs.nixpkgs-25_11;
homeInput = inputs.home-manager-25_11;
+ agenixInput = inputs.agenix-25_11;
};
rhea = libx.mkHost {
hostname = "rhea";
system = "aarch64-linux";
pkgsInput = inputs.nixpkgs-25_11;
homeInput = inputs.home-manager-25_11;
+ agenixInput = inputs.agenix-25_11;
};
kerkouane = libx.mkHost {
hostname = "kerkouane";
pkgsInput = inputs.nixpkgs-25_11;
homeInput = inputs.home-manager-25_11;
+ agenixInput = inputs.agenix-25_11;
};
- # NOTE: experimentations
- #foo = libx.newMkHost {
- # hostname = "foo";
- #};
};
nixosModules = {
@@ -144,7 +146,6 @@
govanityurl = ./modules/govanityurl;
gosmee = ./modules/gosmee;
rsync-replica = ./modules/rsync-replica;
- nixpkgs-consolidate = ./modules/nixpkgs-consolidate;
microshift = ./modules/microshift;
harmonia = ./modules/harmonia;
};
@@ -166,25 +167,19 @@
aix =
(self.nixosConfigurations.aix.extendModules {
modules = [
- "${inputs.nixpkgs-25_05}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
+ "${inputs.nixpkgs-25_11}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
];
}).config.system.build.sdImage;
athena =
(self.nixosConfigurations.athena.extendModules {
modules = [
- "${inputs.nixpkgs-25_05}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
+ "${inputs.nixpkgs-25_11}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
];
}).config.system.build.sdImage;
demeter =
(self.nixosConfigurations.demeter.extendModules {
modules = [
- "${inputs.nixpkgs-25_05}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
- ];
- }).config.system.build.sdImage;
- nagoya =
- (self.nixosConfigurations.nagoya.extendModules {
- modules = [
- "${inputs.nixpkgs-25_05}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
+ "${inputs.nixpkgs-25_11}/nixos/modules/installer/sd-card/sd-image-aarch64.nix"
];
}).config.system.build.sdImage;
};
globals.nix
@@ -283,18 +283,6 @@ _: {
};
ssh = {
hostKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH18c6kcorVbK2TwCgdewL6nQf29Cd5BVTeq8nRYUigm";
- };
- # syncthing = {
- # id = "ZKUNKBI-N2K2LTG-AWLDAEX-NE6NALQ-DLFO6YV-FU4A7IE-KCF5ZCD-IEYSKAH";
- # folders = {
- # org = { };
- # documents = { };
- # sync = { };
- # screenshots = { };
- # wallpapers = { };
- # };
- # };
- ssh = {
vincent = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGxstR3xEf87leVVDS3GVPx8Ap9+eP+OfkSvM26V54XP vincent@shikoku";
};
};