From 0ebeac20d8c1ab4047033dfbac82b2d5481d2f4f Mon Sep 17 00:00:00 2001
From: David Crompton <davidcrompton1192@gmail.com>
Date: Mon, 29 Jan 2024 11:11:53 -0500
Subject: [PATCH] universeair: ReOrganize

---
 machines/universeair/configuration.nix | 49 ++++++++++++++------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/machines/universeair/configuration.nix b/machines/universeair/configuration.nix
index 1c49327..c944175 100644
--- a/machines/universeair/configuration.nix
+++ b/machines/universeair/configuration.nix
@@ -5,30 +5,37 @@ in
       ./app-fix.nix
     ];
     nix.registry.nixpkgs.flake = inputs.nixpkgs;
+    nixpkgs.config.allowUnfree = true;
+    # Auto upgrade nix package and the daemon service.
+    services.nix-daemon.enable = true;
+    nix.package = pkgs.nixUnstable;
+    nix.settings.auto-optimise-store = false;
 
-    home-manager.useGlobalPkgs = true;
-    home-manager.useUserPackages = true;
-    users.users.universelaptop = {
-      name = "universelaptop";
-      home = "/Users/universelaptop";
-    };
-    home-manager.users.universelaptop = { pkgs, ... }: {
-      programs.direnv.enable = true;
-      programs.direnv.nix-direnv.enable = true;
-      programs.bash.enable = true;
-      programs.zsh = {
-        enable = true;
-        shellAliases = {
-          ssh = "kitty +kitten ssh";
-          sshu = "ssh universe";
-        };
+    home-manager = {
+      useGlobalPkgs = true;
+      useUserPackages = true;
+      users.users.universelaptop = {
+        name = "universelaptop";
+        home = "/Users/universelaptop";
+      };
+      users.universelaptop = { pkgs, ... }: {
+        programs.direnv.enable = true;
+        programs.direnv.nix-direnv.enable = true;
+        programs.bash.enable = true;
+        programs.zsh = {
+          enable = true;
+          shellAliases = {
+            ssh = "kitty +kitten ssh";
+            sshu = "ssh universe";
+          };
+        };
+        home.stateVersion = "22.05";
       };
-      home.stateVersion = "22.05";
     };
+
     environment.variables = {
       EDITOR = "emacs";
     };
-    nixpkgs.config.allowUnfree = true;
 
     environment.systemPackages = (with pkgs; [
       mac-emacs
@@ -47,11 +54,7 @@ in
 
       cbqn-replxx
     ]);    
-    # Or any other shell you're using.  };
-    # Auto upgrade nix package and the daemon service.
-    services.nix-daemon.enable = true;
-    nix.package = pkgs.nixUnstable;
-    nix.settings.auto-optimise-store = false;
+
     # Create /etc/zshrc that loads the nix-darwin environment.
     programs.bash.enable = true;  # default shell on catalina
     programs.zsh.enable = true;  # default shell on catalina