feat: Re-enable abort conditions in new user template
Some checks are pending
Code Check / Run nixfmt and statix (push) Waiting to run
Some checks are pending
Code Check / Run nixfmt and statix (push) Waiting to run
This commit is contained in:
parent
ecf935a4f7
commit
2cf855bfae
|
@ -65,8 +65,7 @@
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
###*** IMPORTANT: Please set your system's hostname here ***###
|
###*** IMPORTANT: Please set your system's hostname here ***###
|
||||||
#hostName = builtins.abort "Please set the hostName variable in flake.nix";
|
hostName = builtins.abort "Please set the hostName variable in flake.nix";
|
||||||
hostName = "myHost";
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
|
nixosConfigurations."${hostName}" = nixpkgs.lib.nixosSystem {
|
||||||
|
|
|
@ -1,39 +1 @@
|
||||||
#builtins.abort "Please run 'nixos-generate-config --show-hardware-config' and copy the output into hardware-configuration.nix"
|
builtins.abort "Please run 'nixos-generate-config --show-hardware-config' and copy the output into hardware-configuration.nix"
|
||||||
|
|
||||||
# Surface Laptop Go 1st gen
|
|
||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
modulesPath,
|
|
||||||
hostName,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
{
|
|
||||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
|
||||||
|
|
||||||
boot = {
|
|
||||||
initrd = {
|
|
||||||
availableKernelModules = [ ];
|
|
||||||
kernelModules = [ ];
|
|
||||||
};
|
|
||||||
|
|
||||||
kernelModules = [ ];
|
|
||||||
extraModulePackages = [ ];
|
|
||||||
};
|
|
||||||
|
|
||||||
fileSystems = {
|
|
||||||
"/" = {
|
|
||||||
device = "/dev/sda2";
|
|
||||||
fsType = "btrfs";
|
|
||||||
options = [ "subvol=@,compress=zstd,discard" ];
|
|
||||||
};
|
|
||||||
"/boot" = {
|
|
||||||
device = "/dev/sda1";
|
|
||||||
fsType = "vfat";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
networking.useDHCP = lib.mkDefault true;
|
|
||||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
|
||||||
}
|
|
||||||
|
|
|
@ -21,7 +21,12 @@ in
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
desktopManager.budgie.enable = true;
|
desktopManager.budgie.enable = true;
|
||||||
displayManager.lightdm.enable = lib.mkIf (!(config.services.xserver.displayManager.gdm.enable || config.services.xserver.displayManager.sddm.enable)) true;
|
displayManager.lightdm.enable = lib.mkIf (
|
||||||
|
!(
|
||||||
|
config.services.xserver.displayManager.gdm.enable
|
||||||
|
|| config.services.xserver.displayManager.sddm.enable
|
||||||
|
)
|
||||||
|
) true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,12 @@ in
|
||||||
|
|
||||||
xserver.displayManager = lib.mkIf cfg.useX11 {
|
xserver.displayManager = lib.mkIf cfg.useX11 {
|
||||||
defaultSession = "plasmaX11";
|
defaultSession = "plasmaX11";
|
||||||
sddm.wayland.enable = lib.mkIf (!(config.services.xserver.displayManager.gdm.enable || config.services.xserver.displayManager.lightdm.enable)) true;
|
sddm.wayland.enable = lib.mkIf (
|
||||||
|
!(
|
||||||
|
config.services.xserver.displayManager.gdm.enable
|
||||||
|
|| config.services.xserver.displayManager.lightdm.enable
|
||||||
|
)
|
||||||
|
) true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue