1
1
Fork 0

Compare commits

...

3 Commits

Author SHA1 Message Date
Tim Van Baak 9d2ac1f8ec backyard: Upgrade to 23.11 2023-12-15 20:52:12 +00:00
Tim Van Baak ed5fee36ed beatific: Add 23.11 input 2023-12-15 20:52:12 +00:00
Tim Van Baak bdffba6351 stagirite: Move to 23.05
stagirite's hard drive died so if it comes back it might as well be current
2023-12-15 20:52:12 +00:00
3 changed files with 35 additions and 35 deletions

View File

@ -38,7 +38,7 @@
], ],
"nixos-shell": "nixos-shell", "nixos-shell": "nixos-shell",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-next" "nixpkgs-2305"
] ]
}, },
"locked": { "locked": {
@ -58,7 +58,7 @@
"intake-sources": { "intake-sources": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixpkgs-next" "nixpkgs-2305"
] ]
}, },
"locked": { "locked": {
@ -103,7 +103,7 @@
], ],
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs-2305"
] ]
}, },
"locked": { "locked": {
@ -120,23 +120,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs-2305": {
"locked": {
"lastModified": 1669833724,
"narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "22.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-next": {
"locked": { "locked": {
"lastModified": 1685566663, "lastModified": 1685566663,
"narHash": "sha256-btHN1czJ6rzteeCuE/PNrdssqYD2nIA4w48miQAFloM=", "narHash": "sha256-btHN1czJ6rzteeCuE/PNrdssqYD2nIA4w48miQAFloM=",
@ -152,14 +136,30 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-2311": {
"locked": {
"lastModified": 1701282334,
"narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"intake": "intake", "intake": "intake",
"intake-sources": "intake-sources", "intake-sources": "intake-sources",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs", "nixpkgs-2305": "nixpkgs-2305",
"nixpkgs-next": "nixpkgs-next" "nixpkgs-2311": "nixpkgs-2311"
} }
} }
}, },

View File

@ -1,31 +1,31 @@
{ {
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/22.11"; nixpkgs-2305.url = "github:NixOS/nixpkgs/23.05";
nixpkgs-next.url = "github:NixOS/nixpkgs/23.05"; nixpkgs-2311.url = "github:NixOS/nixpkgs/23.11";
flake-compat = { flake-compat = {
url = "github:edolstra/flake-compat"; url = "github:edolstra/flake-compat";
flake = false; flake = false;
}; };
nixos-wsl = { nixos-wsl = {
url = "github:nix-community/NixOS-WSL"; url = "github:nix-community/NixOS-WSL";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs-2305";
inputs.flake-compat.follows = "flake-compat"; inputs.flake-compat.follows = "flake-compat";
}; };
intake = { intake = {
url = "git+ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake.git"; url = "git+ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake.git";
inputs.nixpkgs.follows = "nixpkgs-next"; inputs.nixpkgs.follows = "nixpkgs-2305";
inputs.flake-compat.follows = "flake-compat"; inputs.flake-compat.follows = "flake-compat";
}; };
intake-sources = { intake-sources = {
url = "git+ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake-sources.git"; url = "git+ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake-sources.git";
inputs.nixpkgs.follows = "nixpkgs-next"; inputs.nixpkgs.follows = "nixpkgs-2305";
}; };
}; };
outputs = { outputs = {
self, self,
nixpkgs, nixpkgs-2305,
nixpkgs-next, nixpkgs-2311,
flake-compat, flake-compat,
nixos-wsl, nixos-wsl,
intake, intake,
@ -34,21 +34,21 @@
nixosModules.beatific = import ./modules/beatific.nix; nixosModules.beatific = import ./modules/beatific.nix;
nixosConfigurations = { nixosConfigurations = {
backyard = nixpkgs-next.lib.nixosSystem { backyard = nixpkgs-2311.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
self.nixosModules.beatific self.nixosModules.beatific
./machine/backyard ./machine/backyard
]; ];
}; };
catacomb = nixpkgs-next.lib.nixosSystem { catacomb = nixpkgs-2305.lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
modules = [ modules = [
self.nixosModules.beatific self.nixosModules.beatific
./machine/catacomb ./machine/catacomb
]; ];
}; };
empyrean = nixpkgs-next.lib.nixosSystem { empyrean = nixpkgs-2305.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
self.nixosModules.beatific self.nixosModules.beatific
@ -57,14 +57,14 @@
./machine/empyrean ./machine/empyrean
]; ];
}; };
stagirite = nixpkgs.lib.nixosSystem { stagirite = nixpkgs-2305.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
nixos-wsl.nixosModules.wsl nixos-wsl.nixosModules.wsl
./machine/stagirite ./machine/stagirite
]; ];
}; };
unfolder = nixpkgs-next.lib.nixosSystem { unfolder = nixpkgs-2305.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
self.nixosModules.beatific self.nixosModules.beatific

View File

@ -16,7 +16,7 @@ in
startMenuLaunchers = false; startMenuLaunchers = false;
}; };
system.stateVersion = "21.11"; #system.stateVersion = "21.11";
networking.hostName = "stagirite"; networking.hostName = "stagirite";