desktop adjustments
This commit is contained in:
parent
6a706007c8
commit
f8492fc9e9
3 changed files with 19 additions and 35 deletions
|
@ -82,23 +82,7 @@
|
|||
# networking.firewall.allowedTCPPorts = [ 4713 ];
|
||||
systemd.services."NetworkManager-wait-online".enable = false;
|
||||
|
||||
systemd.services = {
|
||||
create-swapfile = {
|
||||
serviceConfig.Type = "oneshot";
|
||||
wantedBy = ["swap-swapfile.swap"];
|
||||
script = ''
|
||||
swapfile="/swap/swapfile"
|
||||
if [[ -f "$swapfile" ]]; then
|
||||
echo "Swap file $swapfile already exists, taking no action"
|
||||
else
|
||||
echo "Setting up swap file $swapfile"
|
||||
${pkgs.coreutils}/bin/truncate -s 0 "$swapfile"
|
||||
${pkgs.e2fsprogs}/bin/chattr +C "$swapfile"
|
||||
fi
|
||||
'';
|
||||
};
|
||||
};
|
||||
swapDevices = [{device = "/swap/swapfile";}];
|
||||
|
||||
# release channel
|
||||
system.stateVersion = "22.05"; # Did you read the comment?
|
||||
system.stateVersion = "24.05"; # Did you read the comment?
|
||||
}
|
||||
|
|
|
@ -12,34 +12,32 @@
|
|||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
|
||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "uas" "usbhid" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/72ffbc9d-a319-42d7-8d26-13c921a679db";
|
||||
device = "/dev/disk/by-uuid/efb8f256-5b14-4b52-a2d9-ae4b91ecb711";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=@root" "compress=zstd:3"];
|
||||
options = ["subvol=@"];
|
||||
};
|
||||
|
||||
fileSystems."/home" = {
|
||||
device = "/dev/disk/by-uuid/72ffbc9d-a319-42d7-8d26-13c921a679db";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=@home" "compress=zstd:3"];
|
||||
};
|
||||
boot.initrd.luks.devices."luks-919f9b8b-2804-447a-97e0-f7f515d0be56".device = "/dev/disk/by-uuid/919f9b8b-2804-447a-97e0-f7f515d0be56";
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/D63E-18C9";
|
||||
device = "/dev/disk/by-uuid/3FAD-A6B4";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0077" "dmask=0077"];
|
||||
};
|
||||
|
||||
swapDevices = [
|
||||
{
|
||||
device = "/swap/swapfile";
|
||||
size = (1024 * 64) + (1024 * 8); # 72G
|
||||
}
|
||||
];
|
||||
fileSystems."/swap" = {
|
||||
device = "/dev/disk/by-uuid/efb8f256-5b14-4b52-a2d9-ae4b91ecb711";
|
||||
fsType = "btrfs";
|
||||
options = ["subvol=swap"];
|
||||
};
|
||||
|
||||
swapDevices = [];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
@ -47,7 +45,9 @@
|
|||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp9s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wg0-mullvad.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
{}: {
|
||||
{...}: {
|
||||
imports = [
|
||||
./graphics.nix
|
||||
];
|
||||
|
|
Loading…
Reference in a new issue