From a470338c439d5d5548e64fa15d012da8e0b9f41a Mon Sep 17 00:00:00 2001
From: jaina heartles <me@heartles.xyz>
Date: Sun, 21 Jul 2024 22:23:25 -0700
Subject: [PATCH] NixOS 24.05

---
 flake.lock                 | 16 ++++++++--------
 flake.nix                  |  4 ++--
 hardware-configuration.nix | 15 ++++++++-------
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 14a992c..a2a4a74 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,16 +2,16 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1713995372,
-        "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=",
+        "lastModified": 1717555607,
+        "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8",
+        "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -25,16 +25,16 @@
     },
     "stable": {
       "locked": {
-        "lastModified": 1713995372,
-        "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=",
+        "lastModified": 1717555607,
+        "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8",
+        "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-24.05",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 96b281c..0281c34 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,8 @@
 {
   inputs = {
     #nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
-    stable.url = "github:NixOS/nixpkgs/nixos-23.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    stable.url = "github:NixOS/nixpkgs/nixos-24.05";
     unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
   };
   outputs = { self, nixpkgs, stable, unstable }@attrs: {
diff --git a/hardware-configuration.nix b/hardware-configuration.nix
index ae00a24..1c2a4c7 100644
--- a/hardware-configuration.nix
+++ b/hardware-configuration.nix
@@ -21,9 +21,10 @@
 
   boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/7470830c-97b2-4cac-861f-aa92a721e5b6";
 
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/B712-0774";
-      fsType = "vfat";
+  fileSystems."/nix" =
+    { device = "/dev/disk/by-uuid/b07bcc76-06cb-4d4c-ae8a-1608662aa436";
+      fsType = "btrfs";
+      options = [ "subvol=@nix" ];
     };
 
   fileSystems."/home" =
@@ -32,10 +33,10 @@
       options = [ "subvol=@home" ];
     };
 
-  fileSystems."/nix" =
-    { device = "/dev/disk/by-uuid/b07bcc76-06cb-4d4c-ae8a-1608662aa436";
-      fsType = "btrfs";
-      options = [ "subvol=@nix" ];
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/B712-0774";
+      fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
     };
 
   swapDevices = [ ];