From a4250020a52b9584619de5fd7b802af337e628ce Mon Sep 17 00:00:00 2001 From: Superredstone Date: Fri, 9 Jan 2026 18:16:48 +0100 Subject: [PATCH] Changed Katana configuration with new partitioning --- Justfile | 3 +++ machines/katana/boot.nix | 2 +- machines/katana/default.nix | 2 +- machines/katana/hardware.nix | 18 +++++------------- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/Justfile b/Justfile index e6b572c..3447457 100644 --- a/Justfile +++ b/Justfile @@ -13,6 +13,9 @@ machine: switch: nh os switch -a -H "${HOSTNAME}" . +new-machine: + sudo nixos-rebuild switch --flake .#${HOSTNAME} + test: nh os test -a -H "${HOSTNAME}" . diff --git a/machines/katana/boot.nix b/machines/katana/boot.nix index 3d718f9..c740889 100644 --- a/machines/katana/boot.nix +++ b/machines/katana/boot.nix @@ -3,6 +3,6 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; boot.loader.systemd-boot.configurationLimit = 10; - boot.initrd.luks.devices."luks-332a07bd-65fb-4d91-91ba-fe3f594063b1".device = "/dev/disk/by-uuid/332a07bd-65fb-4d91-91ba-fe3f594063b1"; + boot.initrd.luks.devices."luks-563ebcd9-614b-460f-af9a-5cf1d9c8bef5".device = "/dev/disk/by-uuid/563ebcd9-614b-460f-af9a-5cf1d9c8bef5"; boot.kernelPackages = pkgs.linuxPackages_zen; # pkgs.linuxPackages_latest; } diff --git a/machines/katana/default.nix b/machines/katana/default.nix index c2a720b..cbe0697 100644 --- a/machines/katana/default.nix +++ b/machines/katana/default.nix @@ -11,5 +11,5 @@ networking.hostName = "katana"; # Define your hostname. - system.stateVersion = "24.05"; # Did you read the comment? + system.stateVersion = "25.11"; # Did you read the comment? } diff --git a/machines/katana/hardware.nix b/machines/katana/hardware.nix index 0295997..fc55676 100644 --- a/machines/katana/hardware.nix +++ b/machines/katana/hardware.nix @@ -8,36 +8,28 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "vmd" "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/fcad34c3-e876-44ad-a1d0-a775c936efbf"; + { device = "/dev/mapper/luks-1a5ef40f-3c13-4efb-ae65-da42d4bf30ef"; fsType = "ext4"; }; - boot.initrd.luks.devices."luks-e7fe6c3f-b251-40bf-b053-493097907383".device = "/dev/disk/by-uuid/e7fe6c3f-b251-40bf-b053-493097907383"; + boot.initrd.luks.devices."luks-1a5ef40f-3c13-4efb-ae65-da42d4bf30ef".device = "/dev/disk/by-uuid/1a5ef40f-3c13-4efb-ae65-da42d4bf30ef"; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/78EA-8347"; + { device = "/dev/disk/by-uuid/1A33-9EC1"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; swapDevices = - [ { device = "/dev/disk/by-uuid/6a9710ed-3f74-40f3-8e3e-e1afaf4cb118"; } + [ { device = "/dev/mapper/luks-563ebcd9-614b-460f-af9a-5cf1d9c8bef5"; } ]; - # 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.enp3s0.useDHCP = lib.mkDefault true; - # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }