From a3a7e0b1da6ad9f202f9b1ed3ffba347308f4dce Mon Sep 17 00:00:00 2001
From: Nydragon <contact@ccnlc.eu>
Date: Sat, 19 Oct 2024 00:15:44 +0000
Subject: [PATCH] chore: update marr data

---
 hosts/marr/configuration.nix          |  4 +--
 hosts/marr/hardware-configuration.nix | 45 +++++++++++----------------
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index 2bd257d..6bc800d 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -37,8 +37,6 @@
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
     };
-
-    initrd.luks.devices."luks-7adaa102-d438-4e9e-9972-4a3c91b887b3".device = "/dev/disk/by-uuid/7adaa102-d438-4e9e-9972-4a3c91b887b3";
   };
 
   hardware.graphics.enable = true;
@@ -170,5 +168,5 @@
     pop-icon-theme
   ];
 
-  system.stateVersion = "24.05";
+  system.stateVersion = "24.11";
 }
diff --git a/hosts/marr/hardware-configuration.nix b/hosts/marr/hardware-configuration.nix
index 1d79056..0b63a72 100644
--- a/hosts/marr/hardware-configuration.nix
+++ b/hosts/marr/hardware-configuration.nix
@@ -1,48 +1,41 @@
 # 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, pkgs, modulesPath, ... }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [
-    "xhci_pci"
-    "thunderbolt"
-    "vmd"
-    "nvme"
-    "usb_storage"
-    "sd_mod"
-    "rtsx_pci_sdmmc"
-  ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "vmd" "nvme" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/54c1dd8a-fb4b-4ca1-89a9-6a6b662fac7c";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/1cd96fc2-b17d-4927-8301-53347f311f21";
+      fsType = "ext4";
+    };
 
-  boot.initrd.luks.devices."luks-ef68c7a7-4355-4c37-bd6f-b753f6b9520c".device = "/dev/disk/by-uuid/ef68c7a7-4355-4c37-bd6f-b753f6b9520c";
+  boot.initrd.luks.devices."luks-514b439f-cc98-46a6-9ca5-a4776c9840f8".device = "/dev/disk/by-uuid/514b439f-cc98-46a6-9ca5-a4776c9840f8";
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/83C5-F9F2";
-    fsType = "vfat";
-  };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/5CCE-7DB8";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
 
-  swapDevices = [ { device = "/dev/disk/by-uuid/ba211282-a02a-42d6-9a89-9998ffee4755"; } ];
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/95451266-9dc2-42f0-9bae-28dd7c75224f"; }
+    ];
 
   # 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.tailscale0.useDHCP = lib.mkDefault true;
   # networking.interfaces.wlp0s20f3.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";