From 2e7f9a1f3eeedae3dcfccdcb8c5884b6996f8267 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@jimbosfiles.com>
Date: Sun, 13 Oct 2024 02:08:29 -0400
Subject: [PATCH] Update the flake again with some minor details

---
 extras/overlays.nix |  2 +-
 flake.lock          | 36 ++++++++++++++++++------------------
 flake.nix           | 21 ++++++++++-----------
 3 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/extras/overlays.nix b/extras/overlays.nix
index f048cce..fe3e019 100644
--- a/extras/overlays.nix
+++ b/extras/overlays.nix
@@ -9,7 +9,7 @@
   });
   
   finalprev = (final: prev: {
-    unstable = import inputs.nixpkgs-unstable {
+    unstable = import inputs.unstable {
       system = final.system;
       config.allowUnfree = true;
     };
diff --git a/flake.lock b/flake.lock
index 98ba869..5cf5787 100644
--- a/flake.lock
+++ b/flake.lock
@@ -333,22 +333,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-unstable": {
-      "locked": {
-        "lastModified": 1727348695,
-        "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1717602782,
@@ -447,8 +431,8 @@
         "mailserver": "mailserver",
         "minecraft": "minecraft",
         "nixpkgs": "nixpkgs_4",
-        "nixpkgs-unstable": "nixpkgs-unstable",
-        "nur": "nur"
+        "nur": "nur",
+        "unstable": "unstable"
       }
     },
     "rust-overlay": {
@@ -521,6 +505,22 @@
         "type": "github"
       }
     },
+    "unstable": {
+      "locked": {
+        "lastModified": 1728492678,
+        "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "utils": {
       "inputs": {
         "systems": "systems_2"
diff --git a/flake.nix b/flake.nix
index de700c6..4afae91 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nur.url = "github:nix-community/NUR";
     mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
     blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.8.tar.gz";
@@ -26,7 +26,7 @@
   outputs = {
     self,
     nixpkgs,
-    nixpkgs-unstable,
+    unstable,
     nur,
     mailserver,
     blender-bin,
@@ -34,18 +34,17 @@
     lanzaboote,
     home-manager,
     ...
-  } @inputs: let
-    inherit (self) outputs;
+  }@inputs: let
     mkNixos = modules: nixpkgs.lib.nixosSystem {
       inherit modules;
-      specialArgs = { inherit inputs outputs; };
+      specialArgs = { inherit (self) inputs outputs; };
     };
     
     mkHome = modules: pkgs: home-manager.lib.homeManagerConfiguration {
       inherit modules pkgs;
-      extraSpecialArgs = { inherit inputs outputs; };
+      extraSpecialArgs = { inherit (self) inputs outputs; };
     };
-  in rec {
+  in {
     # Your custom packages and modifications, exported as overlays
     overlays = import ./extras/overlays.nix { inherit inputs; };
 
@@ -57,7 +56,7 @@
     look = import ./extras/look.nix;
     ws = import ./extras/workspaces.nix;
 
-    # NixOS config entrypoint, use 'nixos-rebuild --flake .#your-hostname'
+    # NixOS configuration: 'nixos-rebuild --flake .#hostname'
     nixosConfigurations = {
       JimDesktop = mkNixos [
         ./system/hosts/JimDesktop/configuration.nix
@@ -73,12 +72,12 @@
       ];
     };
 
-    # Home-manager configuration, use 'home-manager --flake .#your-username@your-hostname'
+    # Home-manager configuration: 'home-manager --flake .#username@hostname'
     homeConfigurations = {
       "jimbo@JimDesktop" = mkHome [
         ./home/hosts/JimDesktop/home.nix
         nur.nixosModules.nur
-      ] nixpkgs.legacyPackages."x86_64-linux";
+      ] nixpkgs.legacyPackages.x86_64-linux;
 
       "jimbo@JimServer" = mkHome [
         ./home/hosts/JimServer/home.nix
@@ -89,7 +88,7 @@
         nur.nixosModules.nur
       ] nixpkgs.legacyPackages.aarch64-linux;
 
-      # Derivation for ssh envrionments on other people's servers
+      # Profile for ssh envrionments on different non-root systems
       "jimbo@JimTerminal" = mkHome [
         ./home/hosts/JimTerminal/home.nix
       ] nixpkgs.legacyPackages.x86_64-linux;