Switch slab to mkSystem
This commit is contained in:
parent
991320105d
commit
7b90856ce7
23
flake.nix
23
flake.nix
@ -122,29 +122,10 @@
|
|||||||
homeManagerModules = (import ./modules/home-manager) moduleInputs;
|
homeManagerModules = (import ./modules/home-manager) moduleInputs;
|
||||||
|
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
slab = lib.nixosSystem rec {
|
slab = mkSystem {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
modules = [
|
hostname = "slab";
|
||||||
./hosts/slab/configuration.nix
|
|
||||||
./hosts/slab/nvidia-optimus.nix
|
|
||||||
./system/remote.nix
|
|
||||||
./system/plasma.nix
|
|
||||||
./system/fragments/opengl.nix
|
|
||||||
./system/gaming.nix
|
|
||||||
./system/android.nix
|
|
||||||
# ./system/hyprland.nix
|
|
||||||
(homeManagerInit {
|
|
||||||
# module = import ./hosts/slab/home.nix;
|
|
||||||
inherit system;
|
|
||||||
stateVersion = "23.11";
|
stateVersion = "23.11";
|
||||||
# rootModule = import ./home/root.nix;
|
|
||||||
userModules = { ${username} = [(import ./hosts/slab/home.nix)]; root = [(import ./home/root.nix)]; };
|
|
||||||
})
|
|
||||||
];
|
|
||||||
specialArgs = {
|
|
||||||
inherit inputs outputs vars;
|
|
||||||
extraPkgs = mkExtraPkgs system;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
nullbox = lib.nixosSystem rec {
|
nullbox = lib.nixosSystem rec {
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
|
@ -16,6 +16,13 @@
|
|||||||
imports =
|
imports =
|
||||||
[ # Include the results of the hardware scan.
|
[ # Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
|
|
||||||
|
./nvidia-optimus.nix
|
||||||
|
../../system/remote.nix
|
||||||
|
../../system/plasma.nix
|
||||||
|
../../system/fragments/opengl.nix
|
||||||
|
../../system/gaming.nix
|
||||||
|
../../system/android.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = "slab";
|
networking.hostName = "slab";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user