From 6f752c78607cf2043e0bd2ce4219510bc7965276 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sun, 2 Feb 2025 20:39:53 +0100 Subject: use srvos for better defaults on linde/marvin --- flake.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'flake.nix') diff --git a/flake.nix b/flake.nix index 46d17ac0..3d376f14 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + srvos.url = "github:nix-community/srvos"; + nixpkgs.follows = "srvos/nixpkgs"; nixos-hardware.url = "github:NixOS/nixos-hardware"; nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; @@ -25,8 +25,8 @@ inputs@ { self , utils + , srvos , nixpkgs - , nixpkgs-small , nixos-hardware , emacs-overlay , home-manager @@ -86,10 +86,12 @@ common-gpu-nvidia-nonprime ]); }; - nixosConfigurations.linde = nixpkgs-small.lib.nixosSystem { + nixosConfigurations.linde = nixpkgs.lib.nixosSystem { system = utils.lib.system.aarch64-linux; specialArgs = { inherit inputs; }; modules = [ + srvos.nixosModules.server + srvos.nixosModules.hardware-hetzner-cloud-arm agenix.nixosModules.default searchix.nixosModules.web golink.nixosModules.default @@ -101,6 +103,7 @@ system = utils.lib.system.aarch64-darwin; specialArgs = { inherit inputs; }; modules = [ + srvos.darwinModules.desktop ./system/marvin.nix ./packages/modules/darwin/caddy ]; -- cgit 1.4.1