thrall: Move most modules from flake to thrall

This commit is contained in:
Alexander Kobjolke 2024-01-24 21:50:18 +01:00
parent 2d8e1a873a
commit a12c6266cc
2 changed files with 40 additions and 49 deletions

View file

@ -42,8 +42,7 @@
}; };
}; };
outputs = outputs = { home-manager, nixpkgs, nixpkgs-unstable, ... }@inputs: {
{ home-manager, nixpkgs, nixpkgs-unstable, agenix, snm, ... }@inputs: {
nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem { nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
@ -59,10 +58,7 @@
}; };
nix.registry = lib.mapAttrs (_: value: { flake = value; }) inputs; nix.registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
}) })
snm.nixosModule
./modules/security.nix
./hosts/thrall ./hosts/thrall
agenix.nixosModules.age
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;

View file

@ -2,13 +2,16 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help). # and in the NixOS manual (accessible by running nixos-help).
{ config, pkgs, ... }: { inputs, config, pkgs, ... }:
let let
authorityFromUrl = url: authorityFromUrl = url:
builtins.head (pkgs.lib.drop 1 (pkgs.lib.splitString "://" url)); builtins.head (pkgs.lib.drop 1 (pkgs.lib.splitString "://" url));
in { in {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
inputs.snm.nixosModule
inputs.agenix.nixosModules.age
../../modules/security.nix
../../modules/upgrade-pg-cluster.nix ../../modules/upgrade-pg-cluster.nix
../../modules/nix-config.nix ../../modules/nix-config.nix
../../modules/iohk.nix ../../modules/iohk.nix
@ -135,15 +138,7 @@ in {
# List packages installed in system profile. To search, run: # List packages installed in system profile. To search, run:
# $ nix search wget # $ nix search wget
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [ wget rsync htop tmux git rclone ];
wget
rsync
htop
tmux
git
restic # fast and secure backup
rclone
];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
# started in user sessions. # started in user sessions.