Skip to content

Commit e1921bb

Browse files
committed
refactor: keep manifests
1 parent f8a5ba0 commit e1921bb

File tree

13 files changed

+349
-305
lines changed

13 files changed

+349
-305
lines changed

flake.lock

+39-72
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+5-8
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,16 @@
33

44
inputs = {
55
# Package sets
6-
nixpkgs.url = "github:NixOS/nixpkgs/24.05";
6+
nixpkgs.url = "github:NixOS/nixpkgs/24.11-pre";
77
nixpkgs-legacy.url = "github:NixOS/nixpkgs/23.11";
8-
nixpkgs-stable-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin";
8+
nixpkgs-stable-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.11-darwin";
99
srvos.url = "github:numtide/srvos";
1010
nixpkgs-srvos.follows = "srvos/nixpkgs";
1111

1212
# Environment/system management
1313
darwin.url = "github:LnL7/nix-darwin";
1414
darwin.inputs.nixpkgs.follows = "nixpkgs-stable-darwin";
1515

16-
nixpkgs-rke-patched.url = "github:crumohr/nixpkgs";
17-
1816
home-manager = {
1917
url = "github:nix-community/home-manager/master";
2018
inputs.nixpkgs.follows = "srvos/nixpkgs";
@@ -141,11 +139,10 @@
141139
packages.nixosConfigurations = let
142140
system = builtins.replaceStrings ["darwin"] ["linux"] baseSystem;
143141
oldLegacyPackages = import inputs.nixpkgs-legacy (nixpkgsDefaults // { inherit system; });
144-
specialArgs = {
145-
inherit oldLegacyPackages;
146-
nixpkgsRkePatched = import inputs.nixpkgs-rke-patched { inherit system; };
142+
srvosPackages = import inputs.nixpkgs-srvos (nixpkgsDefaults // { inherit system; });
143+
specialArgs = {
144+
inherit oldLegacyPackages srvosPackages;
147145
};
148-
149146
in {
150147
## Libvirt configurations
151148

nixos-darwin/configuration.nix

+3-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
with config.paas;
99

1010
{
11+
system.stateVersion = 4;
12+
1113
programs.fish.enable = true;
1214
programs.bash.enable = true;
1315
programs.direnv.enable = true;
@@ -95,7 +97,7 @@ with config.paas;
9597
nix.settings = {
9698
trusted-users = [ "staff" "admin" "nixbld" ];
9799
keep-derivations = true;
98-
keep-outputs = false;
100+
keep-outputs = true;
99101
# https://github.com/NixOS/nix/issues/7273
100102
auto-optimise-store = false;
101103
extra-platforms = [ "x86_64-linux" ];

0 commit comments

Comments
 (0)