From c264f825e03bb1983f0c264b1be7774ce201fbab Mon Sep 17 00:00:00 2001
From: David Crompton <davidcrompton1192@gmail.com>
Date: Thu, 17 Aug 2023 14:05:41 -0400
Subject: [PATCH] Merge Prep

---
 flake.lock                             | 15 +++++++--------
 flake.nix                              |  4 ++--
 machines/universeair/configuration.nix |  2 +-
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6d7d232..9dfd734 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,16 +7,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1692099905,
-        "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=",
+        "lastModified": 1692260837,
+        "narHash": "sha256-2FpkX1zl+7ni7djK7NeE1ZGupRUwZgjW+RPCSBgDf4k=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f",
+        "rev": "6a94c1a59737783c282c4031555a289c28b961e4",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-23.05",
         "repo": "home-manager",
         "type": "github"
       }
@@ -44,16 +43,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1692232013,
-        "narHash": "sha256-a5hct9pN+RSxLclPBsWCg9zOCG9c0Uf1cq3XlntQpDQ=",
+        "lastModified": 1692174805,
+        "narHash": "sha256-xmNPFDi/AUMIxwgOH/IVom55Dks34u1g7sFKKebxUm0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "edf586f399ddb6aef26edc2df3aa843e97a2ddc1",
+        "rev": "caac0eb6bdcad0b32cb2522e03e4002c8975c62e",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixpkgs-23.05-darwin",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 18a2aff..7f4e971 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,10 +1,10 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-23.05-darwin";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     sops-nix.url = "github:Mic92/sops-nix";
     nix-darwin.url = "github:LnL7/nix-darwin/master";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
-    home-manager.url = "github:nix-community/home-manager/release-23.05";
+    home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
   
diff --git a/machines/universeair/configuration.nix b/machines/universeair/configuration.nix
index 53efad0..0d976f2 100644
--- a/machines/universeair/configuration.nix
+++ b/machines/universeair/configuration.nix
@@ -39,7 +39,7 @@ flakify() {
     nixpkgs.config.allowUnfree = true;
 
     environment.systemPackages = (with pkgs; [
-      emacs-macport
+      emacs
       (aspellWithDicts (p: with p;[
         en
         en-computers