Compare commits

..

2 Commits

Author SHA1 Message Date
6d5e6add02 move 'nixos-hardware' from 'vm' to 'astyanax' host 2025-11-23 22:06:25 +01:00
cdf5127071 modularize NixOS secrets config 2025-11-23 22:06:25 +01:00
2 changed files with 15 additions and 3 deletions

View File

@@ -14,6 +14,7 @@ in
system.stateVersion = "25.05"; system.stateVersion = "25.05";
imports = [ imports = [
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-e14-intel
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
inputs.sops-nix.nixosModules.sops inputs.sops-nix.nixosModules.sops
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
@@ -55,7 +56,7 @@ in
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users.${username} = import ../../home/hosts/${hostName} { users.${username} = import ../../home/hosts/astyanax {
inherit inputs; inherit inputs;
inherit config; inherit config;
inherit pkgs; inherit pkgs;

View File

@@ -1,16 +1,20 @@
{ {
lib,
inputs, inputs,
config, config,
pkgs, pkgs,
... ...
}: }:
let
username = "h";
in
{ {
system.stateVersion = "25.05"; system.stateVersion = "25.05";
imports = [ imports = [
inputs.nixos-hardware.nixosModules.lenovo-thinkpad-e14-intel
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
inputs.sops-nix.nixosModules.sops
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
./hard.nix ./hard.nix
./disk.nix ./disk.nix
@@ -23,8 +27,15 @@
../../modules/x.nix ../../modules/x.nix
../../modules/fonts ../../modules/fonts
../../modules/ssh/hardened-openssh.nix ../../modules/ssh/hardened-openssh.nix
(import ../../modules/secrets {
inherit lib;
inherit inputs;
inherit config;
})
]; ];
secrets.username = "h";
environment.systemPackages = [ inputs.nvim.packages.x86_64-linux.nvim ]; environment.systemPackages = [ inputs.nvim.packages.x86_64-linux.nvim ];
nix.settings.experimental-features = [ nix.settings.experimental-features = [
@@ -55,7 +66,7 @@
home-manager = { home-manager = {
useGlobalPkgs = true; useGlobalPkgs = true;
useUserPackages = true; useUserPackages = true;
users.h = import ../../home/hosts/vm { users.${username} = import ../../home/hosts/vm {
inherit inputs; inherit inputs;
inherit config; inherit config;
inherit pkgs; inherit pkgs;