diff --git a/hosts/Lenni/disko.nix b/hosts/Lenni/disko.nix index 1a2b238..89316a3 100644 --- a/hosts/Lenni/disko.nix +++ b/hosts/Lenni/disko.nix @@ -24,8 +24,6 @@ content = { type = "luks"; name = "cryptroot"; - settings.allowDiscards = true; - passwordFile = "/tmp/secret.key"; content = { type = "btrfs"; extraArgs = [ "-f" ]; diff --git a/hosts/Lenni/hardware-configuration.nix b/hosts/Lenni/hardware-configuration.nix index 1c41d6d..6d4c1f3 100644 --- a/hosts/Lenni/hardware-configuration.nix +++ b/hosts/Lenni/hardware-configuration.nix @@ -8,17 +8,38 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; + fileSystems."/" = + { device = "/dev/disk/by-uuid/e09e7d80-9d85-49e6-8b0e-1f31aea83840"; + fsType = "btrfs"; + options = [ "subvol=@" ]; + }; + + boot.initrd.luks.devices."luks-a2f76baf-2f27-42a4-ae48-1963c566a9ab".device = "/dev/disk/by-uuid/a2f76baf-2f27-42a4-ae48-1963c566a9ab"; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/2A99-D7CC"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + fileSystems."/mnt/nfs" = + { device = "/nix/store/8zm9gh07p3rx8b3vqiwa1qb7zsml17sk-auto.nfs"; + fsType = "autofs"; + }; + + 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 # 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.enp195s0f4u1c2.useDHCP = lib.mkDefault true; + # networking.interfaces.enp195s0f3u1c2.useDHCP = lib.mkDefault true; # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; diff --git a/iso/flake.lock b/iso/flake.lock index d92becd..4dc7cd4 100644 --- a/iso/flake.lock +++ b/iso/flake.lock @@ -2,18 +2,17 @@ "nodes": { "nixos": { "locked": { - "lastModified": 1747209494, - "narHash": "sha256-fLise+ys+bpyjuUUkbwqo5W/UyIELvRz9lPBPoB0fbM=", + "lastModified": 1717179513, + "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d736263df906c5da72ab0f372427814de2f52f8", + "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "24.05", + "type": "indirect" } }, "root": { diff --git a/iso/flake.nix b/iso/flake.nix index ada99f0..fedcff7 100644 --- a/iso/flake.nix +++ b/iso/flake.nix @@ -1,7 +1,7 @@ { description = "Minimal NixOS installation media"; - inputs.nixos.url = "github:NixOS/nixpkgs/nixos-24.11"; + inputs.nixos.url = "nixpkgs/24.05"; outputs = { self, nixos }: { nixosConfigurations = { @@ -27,4 +27,4 @@ }; }; }; -} +} \ No newline at end of file diff --git a/modules/default/nixos/users.nix b/modules/default/nixos/users.nix index 646db83..d619cb6 100644 --- a/modules/default/nixos/users.nix +++ b/modules/default/nixos/users.nix @@ -4,7 +4,6 @@ isNormalUser = true; linger = true; description = "willifan"; - initialPassword = "temp"; extraGroups = [ "networkmanager" "wheel" "video" ]; shell = pkgs.bash; };