diff --git a/cfg/winter/hardware-configuration.nix b/cfg/winter/hardware-configuration.nix index 7b4819e..c90435c 100644 --- a/cfg/winter/hardware-configuration.nix +++ b/cfg/winter/hardware-configuration.nix @@ -8,14 +8,15 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ]; + boot.initrd.availableKernelModules = [ "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" "bcachefs" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/25ffa0da-054d-4906-84aa-1625f94b0cf2"; - fsType = "ext4"; + { device = "none"; + fsType = "tmpfs"; + options = [ "defaults" "size=4G" "mode=755" ]; }; fileSystems."/boot" = @@ -23,12 +24,47 @@ fsType = "vfat"; }; + fileSystems."/mnt/bcachefs" = + { device = "/dev/sda2"; + fsType = "bcachefs"; + neededForBoot = true; + }; + + fileSystems."/nix" = + { device = "/mnt/bcachefs/binds/nix"; + fsType = "none"; + options = [ "bind" ]; + }; + + fileSystems."/home" = + { device = "/mnt/bcachefs/binds/home"; + fsType = "none"; + options = [ "bind" ]; + }; + + fileSystems."/var" = + { device = "/mnt/bcachefs/binds/var"; + fsType = "none"; + options = [ "bind" ]; + }; + + fileSystems."/root" = + { device = "/mnt/bcachefs/binds/root"; + fsType = "none"; + options = [ "bind" ]; + }; + + fileSystems."/etc/nixos" = + { device = "/mnt/bcachefs/binds/etc_nixos"; + fsType = "none"; + options = [ "bind" ]; + }; + fileSystems."/mnt/hdd" = { device = "/dev/disk/by-uuid/d5e3cfe5-c73a-4695-b81b-fc0215d4cefe"; fsType = "ext4"; }; - swapDevices = []; + swapDevices = [ ]; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; } diff --git a/cfg/winter/main.nix b/cfg/winter/main.nix index 7018fc0..ca51739 100644 --- a/cfg/winter/main.nix +++ b/cfg/winter/main.nix @@ -2,6 +2,8 @@ networking.hostName = "winter"; system.stateVersion = "20.09"; + environment.etc."machine-id".source = "/mnt/bcachefs/machine-id"; + imports = [ ./gui.nix ./hardware-configuration.nix @@ -31,10 +33,12 @@ sound.enable = true; hardware.pulseaudio.enable = true; + users.mutableUsers = false; users.users.lava = { isNormalUser = true; extraGroups = [ "wheel" ]; shell = pkgs.zsh; + initialPassword = "gaming"; }; console.useXkbConfig = true;