simplify top-level flake

This commit is contained in:
Sridhar Ratnakumar 2024-02-24 17:50:27 -05:00
parent e7ca44d951
commit d20f63a876
3 changed files with 24 additions and 31 deletions

View file

@ -74,40 +74,18 @@
flake = {
# Configurations for Linux (NixOS) systems
nixosConfigurations = {
linux-builder = self.nixos-flake.lib.mkLinuxSystem
./systems/linux-builder.nix;
immediacy = self.nixos-flake.lib.mkLinuxSystem {
imports = [
self.nixosModules.default # Defined in nixos/default.nix
inputs.sops-nix.nixosModules.sops
./systems/hetzner/ax41.nix
./nixos/server/harden
];
sops.defaultSopsFile = ./secrets.json;
sops.defaultSopsFormat = "json";
services.tailscale.enable = true;
};
linux-builder =
self.nixos-flake.lib.mkLinuxSystem
./systems/linux-builder.nix;
immediacy =
self.nixos-flake.lib.mkLinuxSystem
./systems/hetzner/ax41.nix;
};
# Configurations for my (only) macOS machine (using nix-darwin)
darwinConfigurations = {
appreciate = self.nixos-flake.lib.mkMacosSystem {
nixpkgs.hostPlatform = "aarch64-darwin";
imports = [
self.darwinModules.default # Defined in nix-darwin/default.nix
./systems/darwin.nix
./systems/darwin/ci.nix
];
};
naivete = self.nixos-flake.lib.mkMacosSystem {
nixpkgs.hostPlatform = "aarch64-darwin";
imports = [
self.darwinModules.default # Defined in nix-darwin/default.nix
./systems/darwin.nix
];
};
};
darwinConfigurations.appreciate =
self.nixos-flake.lib.mkMacosSystem
./systems/darwin.nix;
};
perSystem = { self', system, pkgs, lib, config, inputs', ... }: {

View file

@ -2,6 +2,13 @@
# See nix-darwin/default.nix for other modules in use.
{
imports = [
flake.inputs.self.darwinModules.default
./darwin/ci.nix
];
nixpkgs.hostPlatform = "aarch64-darwin";
environment.systemPackages = with pkgs; [
# macOS GUI programs
wezterm

View file

@ -1,11 +1,19 @@
{ flake, modulesPath, lib, ... }: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
flake.inputs.self.nixosModules.default # Defined in nixos/default.nix
flake.inputs.sops-nix.nixosModules.sops
flake.inputs.disko.nixosModules.disko
./nixos-container.nix
../../nixos/server/harden
];
system.stateVersion = "23.11";
sops.defaultSopsFile = ./secrets.json;
sops.defaultSopsFormat = "json";
services.tailscale.enable = true;
services.openssh.enable = true;
boot = {
loader.grub = {
devices = [ "/dev/nvme0n1" "/dev/nvme1n1" ];