titaniumtown/server-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Simon Gardling 2025-08-07 20:50:18 -07:00
parent 003418b27b
commit 80d9e1029d
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
flake.nix
View File

@ -62,6 +62,7 @@
username = "primary"; username = "primary";
hostname = "muffin"; hostname = "muffin";
eth_interface = "enp4s0"; eth_interface = "enp4s0";
system = "x86_64-linux";
service_configs = rec { service_configs = rec {
zpool_ssds = "tank"; zpool_ssds = "tank";
@ -133,12 +134,17 @@
}; };
}; };
pkgs = nixpkgs.legacyPackages.x86_64-linux; pkgs = import nixpkgs {
inherit system;
hostPlatform = system;
buildPlatform = builtins.currentSystem;
};
lib = import ./lib.nix { inherit inputs pkgs; }; lib = import ./lib.nix { inherit inputs pkgs; };
in in
{ {
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem { nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = rec { specialArgs = rec {
inherit inherit
username username
@ -154,19 +160,17 @@
( (
{ lib, ... }: { lib, ... }:
{ {
config = { config.assertions = [
assertions = [ {
{ assertion =
assertion = let
let ports = lib.attrValues service_configs.ports;
ports = lib.attrValues service_configs.ports; uniquePorts = lib.unique ports;
uniquePorts = lib.unique ports; in
in (lib.length ports) == (lib.length uniquePorts);
(lib.length ports) == (lib.length uniquePorts); message = "Duplicate ports detected in 'ports' configuration";
message = "Duplicate ports detected in 'ports' configuration"; }
} ];
];
};
} }
) )
@ -193,10 +197,7 @@
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
( (
{ {
pkgs,
username,
home-manager, home-manager,
stateVersion,
... ...
}: }:
{ {
@ -217,7 +218,7 @@
profiles.system = { profiles.system = {
sshUser = "root"; sshUser = "root";
user = "root"; user = "root";
path = deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.muffin; path = deploy-rs.lib.${system}.activate.nixos self.nixosConfigurations.muffin;
}; };
}; };

1
hardware.nix
View File

@ -19,7 +19,6 @@
swapDevices = [ ]; swapDevices = [ ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = true; hardware.cpu.amd.updateMicrocode = true;
hardware.enableRedistributableFirmware = true; hardware.enableRedistributableFirmware = true;
} }