VSinerva/nixos-conf
1
0
Fork 0
Code Activity Actions

Move some options into base.nix

Browse source
This commit is contained in:
Vili Sinervä 2024-09-06 10:33:39 +03:00
parent 442b72de55
commit 2ad217fd84
No known key found for this signature in database
GPG key ID: DF8FEAF54EFAC996
9 changed files with 8 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

7
base.nix
View file

@ -117,7 +117,12 @@
}; };
time.timeZone = "Europe/Helsinki"; time.timeZone = "Europe/Helsinki";
boot.loader.timeout = 0; boot.loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
timeout = 0;
};
services.logind.lidSwitch = if config.boot.resumeDevice != "" then "hibernate" else "suspend";
#################### Memory management #################### #################### Memory management ####################
zramSwap.enable = true; zramSwap.enable = true;

2
hardware-specific/amd-laptop.nix
View file

@ -18,7 +18,5 @@
Option "TearFree" "true" Option "TearFree" "true"
''; '';
}; };
logind.lidSwitch = if config.boot.resumeDevice != "" then "hibernate" else "suspend";
}; };
} }

3
machine-confs/generic.nix
View file

@ -4,9 +4,6 @@
imports = [ ../base.nix ]; imports = [ ../base.nix ];
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
#Many installs will need this, and it won't hurt either way #Many installs will need this, and it won't hurt either way
services.qemuGuest.enable = true; services.qemuGuest.enable = true;

5
machine-confs/helium.nix
View file

@ -89,10 +89,5 @@
}; };
resumeDevice = "/dev/mapper/luks-f6e1979b-0dee-4ee9-8170-10490019854b"; resumeDevice = "/dev/mapper/luks-f6e1979b-0dee-4ee9-8170-10490019854b";
kernelParams = [ "resume_offset=44537856" ]; kernelParams = [ "resume_offset=44537856" ];
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
}; };
} }

7
machine-confs/lithium.nix
View file

@ -61,12 +61,5 @@
resumeDevice = "/dev/mapper/nixos"; resumeDevice = "/dev/mapper/nixos";
kernelParams = [ "resume_offset=39292928" ]; kernelParams = [ "resume_offset=39292928" ];
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
}; };
};
services.logind.lidSwitch = if config.boot.resumeDevice != "" then "hibernate" else "suspend";
} }

5
machine-confs/nextcloud.nix
View file

@ -8,10 +8,5 @@
]; ];
# HARDWARE SPECIFIC # HARDWARE SPECIFIC
services.qemuGuest.enable = true; services.qemuGuest.enable = true;
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
} }

4
machine-confs/nixos-cpu.nix
View file

@ -9,9 +9,5 @@
]; ];
# HARDWARE SPECIFIC # HARDWARE SPECIFIC
services.qemuGuest.enable = true; services.qemuGuest.enable = true;
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
} }

5
machine-confs/vaultwarden.nix
View file

@ -8,10 +8,5 @@
]; ];
# HARDWARE SPECIFIC # HARDWARE SPECIFIC
services.qemuGuest.enable = true; services.qemuGuest.enable = true;
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
} }

2
machine-confs/wg-rpi.nix
View file

@ -108,6 +108,8 @@ in
"usb_storage" "usb_storage"
]; ];
loader = { loader = {
systemd-boot.enable = pkgs.lib.mkForce false;
efi.canTouchEfiVariables = pkgs.lib.mkForce false;
grub.enable = false; grub.enable = false;
generic-extlinux-compatible.enable = true; generic-extlinux-compatible.enable = true;
}; };