From a7c7a92d7d017ea6c983e48585c0528096bc24c7 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 2 Feb 2024 16:03:07 -0700
Subject: [PATCH 1/5] change: update options to 24.05 changes

---
 configuration.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 686f6cb..14c3968 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -30,7 +30,7 @@
    time.timeZone = "America/Denver";
 
    # Enter keyboard layout
-   services.xserver.layout = "us";
+   services.xserver.xkb.layout = "us";
 
    # Define user accounts
    users.users.aaronh = {
@@ -90,7 +90,7 @@
 
    services.avahi = {
       enable = true;
-      nssmdns = true;
+      nssmdns4 = true;
       openFirewall = true;
          # Needed for detecting scanners
          publish = {

From 70b352029f74ee66ea2a351dfc61ec838e20568a Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Fri, 2 Feb 2024 16:03:53 -0700
Subject: [PATCH 2/5] update: stateVersion to 24.05

---
 configuration.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configuration.nix b/configuration.nix
index 14c3968..ef256b9 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -113,6 +113,6 @@
    };
 
    # System 
-   system.stateVersion = "23.11";
+   system.stateVersion = "24.05";
    system.autoUpgrade.enable = true;
 }

From 91f5518613fc9545e2a7362a082bde6795713db4 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 6 Feb 2024 09:22:02 -0700
Subject: [PATCH 3/5] flake: move to unstable

---
 flake.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0ee7dfb..0b2c216 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,14 +2,15 @@
    description = "Generic System Flake file";
 
    inputs = {
-      nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
+      # nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
+      nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
       disko = {
          url = github:nix-community/disko;
-         inputs.nixpkgs.follows = "nixpkgs";
+         inputs.nixpkgs.follows = "nixpkgs-unstable";
       };
       home-manager = {
-         url = "github:nix-community/home-manager/release-23.11";
-         inputs.nixpkgs.follows = "nixpkgs"; # Use system packages list where available
+         url = "github:nix-community/home-manager";
+         inputs.nixpkgs.follows = "nixpkgs-unstable";
       };
    };
 

From adac954c574ea63ec6fa936c979c21f39d882490 Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Mon, 1 Apr 2024 15:43:57 +0000
Subject: [PATCH 4/5] Update flake.nix

---
 flake.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index 0b2c216..4a51e60 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,14 +3,14 @@
 
    inputs = {
       # nixpkgs.url = "github:NixOS/nixpkgs/release-23.11";
-      nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
+      nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
       disko = {
          url = github:nix-community/disko;
-         inputs.nixpkgs.follows = "nixpkgs-unstable";
+         inputs.nixpkgs.follows = "nixpkgs";
       };
       home-manager = {
          url = "github:nix-community/home-manager";
-         inputs.nixpkgs.follows = "nixpkgs-unstable";
+         inputs.nixpkgs.follows = "nixpkgs";
       };
    };
 

From ccebfe17c0db1820826eb6f80e35439c2c91f0be Mon Sep 17 00:00:00 2001
From: Aaron Honeycutt <aaronhoneycutt@protonmail.com>
Date: Tue, 25 Jun 2024 22:11:33 +0000
Subject: [PATCH 5/5] Disable nssmdns4 for now

---
 configuration.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configuration.nix b/configuration.nix
index ef256b9..dec9bbe 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -90,7 +90,7 @@
 
    services.avahi = {
       enable = true;
-      nssmdns4 = true;
+      #nssmdns4 = true;
       openFirewall = true;
          # Needed for detecting scanners
          publish = {