artemist/nixos-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

spike is bcachefs now

Browse source
This commit is contained in:
Artemis Tosini 2023-09-18 06:16:42 +00:00
parent 56f92fc43e
commit 6879b0212c
Signed by: artemist
GPG key ID: EE5227935FE3FF18
3 changed files with 27 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
system/spike/boot-config.nix
View file

@ -1,24 +1,17 @@
{ config, pkgs, ... }: { lib, ... }:
{ {
boot = { boot = {
kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [ "fbcon=rotate:1" ]; kernelParams = [ "fbcon=rotate:1" ];
kernel.sysctl."vm.swappiness" = 5; kernel.sysctl."vm.swappiness" = 5;
tmp.cleanOnBoot = true; tmp.cleanOnBoot = true;
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
}; };
initrd = { swapDevices = lib.mkForce [{
luks.devices."${config.networking.hostName}" = { device = "/dev/disk/by-partuuid/ef7cb78c-a07d-45e2-a92a-0f041c42f07a";
name = config.networking.hostName; randomEncryption = {
device = "/dev/disk/by-uuid/eb0e5aaf-afa3-43e4-89b3-af4a3f7f0546"; enable = true;
preLVM = true;
allowDiscards = true; allowDiscards = true;
}; };
}; }];
};
} }

8
system/spike/default.nix
View file

@ -6,6 +6,7 @@
./hardware-configuration.nix ./hardware-configuration.nix
../../sets/hacking.nix ../../sets/hacking.nix
../../sets/laptop.nix ../../sets/laptop.nix
../../sets/secureBoot.nix
../../sets/sshd.nix ../../sets/sshd.nix
../../sets/buildMachines.nix ../../sets/buildMachines.nix
../../sets/workstation.nix ../../sets/workstation.nix
@ -13,7 +14,7 @@
]; ];
networking.hostName = "spike"; networking.hostName = "spike";
system.stateVersion = "22.05"; system.stateVersion = "23.11";
home-manager.users.artemis.xdg.configFile."rustybar/config.toml".text = '' home-manager.users.artemis.xdg.configFile."rustybar/config.toml".text = ''
[[tile]] [[tile]]
@ -40,9 +41,4 @@
scroll_button = "BTN_MIDDLE"; scroll_button = "BTN_MIDDLE";
}; };
}; };
services.btrfs.autoScrub = {
enable = true;
fileSystems = [ "/" ];
};
} }

36
system/spike/hardware-configuration.nix
View file

@ -7,35 +7,31 @@
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules =
[ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; [ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" "bcache" ];
boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" = {
device = "/dev/disk/by-uuid/ee50d2d7-34ee-4fec-bee8-53ae5f464de2"; device = "/dev/disk/by-uuid/fc77e1d6-5315-4251-90f7-33f74996ffec";
fsType = "btrfs"; fsType = "bcachefs";
options = [ "subvol=root" ];
};
fileSystems."/home" = {
device = "/dev/disk/by-uuid/ee50d2d7-34ee-4fec-bee8-53ae5f464de2";
fsType = "btrfs";
options = [ "subvol=home" ];
};
fileSystems."/nix" = {
device = "/dev/disk/by-uuid/ee50d2d7-34ee-4fec-bee8-53ae5f464de2";
fsType = "btrfs";
options = [ "subvol=nix" ];
}; };
fileSystems."/boot" = { fileSystems."/boot" = {
device = "/dev/disk/by-uuid/B78C-8B71"; device = "/dev/disk/by-uuid/307A-16D8";
fsType = "vfat"; fsType = "vfat";
}; };
swapDevices = swapDevices = [ ];
[{ device = "/dev/disk/by-uuid/057964ef-4692-4189-98c6-32e7e05565e2"; }];
# 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
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
} }