imperium: refactor inline modules to flake output
This commit is contained in:
parent
6f9f01fe84
commit
7b91747729
19
flake.lock
19
flake.lock
|
@ -113,13 +113,30 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1723362943,
|
||||
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a58bc8ad779655e790115244571758e8de055e3d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat",
|
||||
"intake": "intake",
|
||||
"intake-sources": "intake-sources",
|
||||
"nixpkgs-2311": "nixpkgs-2311",
|
||||
"nixpkgs-2405": "nixpkgs-2405"
|
||||
"nixpkgs-2405": "nixpkgs-2405",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
22
flake.nix
22
flake.nix
|
@ -2,6 +2,7 @@
|
|||
inputs = {
|
||||
nixpkgs-2311.url = "github:NixOS/nixpkgs/23.11";
|
||||
nixpkgs-2405.url = "github:NixOS/nixpkgs/nixos-24.05";
|
||||
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
flake-compat = {
|
||||
url = "github:edolstra/flake-compat";
|
||||
flake = false;
|
||||
|
@ -21,11 +22,25 @@
|
|||
self,
|
||||
nixpkgs-2311,
|
||||
nixpkgs-2405,
|
||||
nixpkgs-unstable,
|
||||
flake-compat,
|
||||
intake,
|
||||
intake-sources,
|
||||
}@inputs: {
|
||||
nixosModules.beatific = import ./modules/beatific.nix;
|
||||
nixosModules = {
|
||||
beatific = import ./modules/beatific.nix;
|
||||
tf2-gperftools = ({ ... }: {
|
||||
environment.systemPackages = [ nixpkgs-2405.legacyPackages."i686-linux".gperftools ];
|
||||
});
|
||||
unstable-vscode = ({ ... }: let
|
||||
pkgs = import nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; };
|
||||
in {
|
||||
environment.systemPackages = [
|
||||
pkgs.vscode
|
||||
pkgs.icu
|
||||
];
|
||||
});
|
||||
};
|
||||
|
||||
nixosConfigurations = {
|
||||
backyard = nixpkgs-2405.lib.nixosSystem {
|
||||
|
@ -62,9 +77,8 @@
|
|||
system = "x86_64-linux";
|
||||
modules = [
|
||||
self.nixosModules.beatific
|
||||
({ ... }: {
|
||||
environment.systemPackages = [ nixpkgs-2405.legacyPackages."i686-linux".gperftools ];
|
||||
})
|
||||
self.nixosModules.tf2-gperftools
|
||||
self.nixosModules.unstable-vscode
|
||||
./machine/imperium
|
||||
];
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue