From dc74d5596bc334565123063bd09546bfc85a0b5e Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Thu, 21 Nov 2024 15:13:42 +0100 Subject: [PATCH] Sif: WIP --- instances/sif/hardware-configuration.nix | 110 ++++------------------- 1 file changed, 17 insertions(+), 93 deletions(-) diff --git a/instances/sif/hardware-configuration.nix b/instances/sif/hardware-configuration.nix index d292cc3..4b88719 100644 --- a/instances/sif/hardware-configuration.nix +++ b/instances/sif/hardware-configuration.nix @@ -1,131 +1,55 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config -, lib -, modulesPath -, ... -}: +{ config, lib, modulesPath, ... }: { - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - + imports = [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; boot = { initrd = { - availableKernelModules = [ - "xhci_pci" - "ahci" - "nvme" - "sd_mod" - ]; + availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ]; kernelModules = [ ]; }; kernelModules = [ "kvm-intel" ]; extraModulePackages = [ ]; }; - fileSystems = { "/" = { - device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c"; + device = "/dev/disk/by-uuid/6a17608f-cf0e-4fb4-ae73-c38569fc0577"; fsType = "btrfs"; - options = [ - "subvol=@root" - "x-gvfs-hide" - ]; + options = [ "subvol=@root" ]; }; "/nix" = { - device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c"; + device = "/dev/disk/by-uuid/6a17608f-cf0e-4fb4-ae73-c38569fc0577"; fsType = "btrfs"; - options = [ - "subvol=@nix" - "x-gvfs-hide" - ]; + options = [ "subvol=@nix" ]; }; - "/home/bertof" = { - device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c"; + "/home" = { + device = "/dev/disk/by-uuid/6a17608f-cf0e-4fb4-ae73-c38569fc0577"; fsType = "btrfs"; - options = [ - "subvol=@bertof/@home" - "x-gvfs-hide" - ]; - }; - "/home/bertof/Giochi/SSD" = { - device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c"; - fsType = "btrfs"; - options = [ - "subvol=@bertof/@games" - "x-gvfs-hide" - ]; - }; - "/home/bertof/Video" = { - device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c"; - fsType = "btrfs"; - options = [ - "subvol=@bertof/@videos" - "x-gvfs-hide" - ]; - }; - "/home/bertof/Musica" = { - device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c"; - fsType = "btrfs"; - options = [ - "subvol=@bertof/@music" - "x-gvfs-hide" - ]; - }; - "/home/bertof/Immagini" = { - device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c"; - fsType = "btrfs"; - options = [ - "subvol=@bertof/@images" - "x-gvfs-hide" - ]; - }; - "/home/bertof/Scaricati" = { - device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c"; - fsType = "btrfs"; - options = [ - "subvol=@bertof/@downloads" - "x-gvfs-hide" - ]; - }; - "/home/bertof/Documenti" = { - device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c"; - fsType = "btrfs"; - options = [ - "subvol=@bertof/@documents" - "x-gvfs-hide" - ]; - }; - "/home/bertof/Documenti/Git" = { - device = "/dev/disk/by-uuid/c6e3d4df-4861-48a5-8107-d6fd1addad8c"; - fsType = "btrfs"; - options = [ - "subvol=@bertof/@git" - "x-gvfs-hide" - ]; + options = [ "subvol=@home" ]; }; "/boot" = { - device = "/dev/disk/by-uuid/82DB-3444"; + device = "/dev/disk/by-uuid/5BD2-463F"; fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; }; }; - swapDevices = [{ device = "/dev/disk/by-uuid/5f3cf424-2bd8-4352-a778-1bb067cb5700"; }]; + swapDevices = [{ device = "/dev/disk/by-uuid/87eb2eb4-8596-43c2-bdbe-e0c87ee45710"; }]; # 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..useDHCP`. # networking.useDHCP = lib.mkDefault true; - # networking.interfaces.docker0.useDHCP = lib.mkDefault true; - # networking.interfaces.enp10s0u1u2.useDHCP = lib.mkDefault true; - # networking.interfaces.enp60s0.useDHCP = lib.mkDefault true; - # networking.interfaces.virbr0.useDHCP = lib.mkDefault true; + # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.tailscale0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true; # networking.interfaces.ztmjfdwjkp.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }