From 2de06ee9657bfc03639e80f5a12d5cbb0bbfda81 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Fri, 4 Oct 2024 12:54:07 -0400
Subject: [PATCH] Use nixos-unified

---
 README.md                           |  4 ++--
 flake.lock                          | 33 ++++++++++++++---------------
 flake.nix                           |  2 +-
 modules/flake-parts/nixos-flake.nix |  8 +++----
 4 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/README.md b/README.md
index f43af3f..33944f1 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 [![project chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://nixos.zulipchat.com/#narrow/stream/413948-nixos)
 [![Harmeless Code of Conduct](https://img.shields.io/badge/harmless-8A2BE2)](https://srid.ca/coc "This project follows the 'Harmlessness Code of Conduct'")
 
-This repository contains the Nix / NixOS configuration for all of my systems. See [nixos-flake](https://community.flake.parts/nixos-flake) if you wish to create your own configuration from scratch.
+This repository contains the Nix / NixOS configuration for all of my systems. See [nixos-unified](https://nixos-unified.org) if you wish to create your own configuration from scratch.
 
 ## Setup
 
@@ -54,7 +54,7 @@ Start from `flake.nix` (see [Flakes](https://nixos.wiki/wiki/Flakes)). [`flake-p
 | `./mdules/{nixos,darwin,home,flake-parts}/foo.nix` | `{nixos,darwin,home,flake}Modules.foo` |
 | `./overlays/foo.nix` | `overlays.foo` |
 | `./packages` | N/A (Nix packages) |
-| `./secrets` | N/A (agenix data) | 
+| `./secrets` | N/A (agenix data) |
 
 ## Tips
 
diff --git a/flake.lock b/flake.lock
index 7e281d4..6ead44c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -689,22 +689,6 @@
         "type": "github"
       }
     },
-    "nixos-flake": {
-      "locked": {
-        "lastModified": 1727741402,
-        "narHash": "sha256-dUtUaG8norNNdqX9UM/31/fbpkiyBf4iKLr02agjEcI=",
-        "owner": "srid",
-        "repo": "nixos-flake",
-        "rev": "82752b478b4ae17248983a4cbc6a7dbd0acb71a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "srid",
-        "ref": "autoWire",
-        "repo": "nixos-flake",
-        "type": "github"
-      }
-    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1678397099,
@@ -720,6 +704,21 @@
         "type": "github"
       }
     },
+    "nixos-unified": {
+      "locked": {
+        "lastModified": 1727917530,
+        "narHash": "sha256-yXjRRdwmeUeuUwANwY2630Utr3crjq43KNpXZpl5Xo8=",
+        "owner": "srid",
+        "repo": "nixos-unified",
+        "rev": "469a19843f13ed5196ef73154c4c96a1e48cf626",
+        "type": "github"
+      },
+      "original": {
+        "owner": "srid",
+        "repo": "nixos-unified",
+        "type": "github"
+      }
+    },
     "nixos-vscode-server": {
       "inputs": {
         "flake-utils": "flake-utils_2",
@@ -1048,8 +1047,8 @@
         "home-manager": "home-manager",
         "nix-darwin": "nix-darwin",
         "nix-index-database": "nix-index-database",
-        "nixos-flake": "nixos-flake",
         "nixos-hardware": "nixos-hardware",
+        "nixos-unified": "nixos-unified",
         "nixos-vscode-server": "nixos-vscode-server",
         "nixpkgs": "nixpkgs_4",
         "nixvim": "nixvim",
diff --git a/flake.nix b/flake.nix
index 11eefbf..3508a84 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,7 @@
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
     nixos-hardware.url = "github:NixOS/nixos-hardware";
-    nixos-flake.url = "github:srid/nixos-flake/autoWire"; # https://github.com/srid/nixos-flake/pull/74
+    nixos-unified.url = "github:srid/nixos-unified";
     disko.url = "github:nix-community/disko";
     disko.inputs.nixpkgs.follows = "nixpkgs";
     ragenix.url = "github:yaxitech/ragenix";
diff --git a/modules/flake-parts/nixos-flake.nix b/modules/flake-parts/nixos-flake.nix
index 5cc766b..a0addbf 100644
--- a/modules/flake-parts/nixos-flake.nix
+++ b/modules/flake-parts/nixos-flake.nix
@@ -1,20 +1,20 @@
 { inputs, ... }:
 {
   imports = [
-    inputs.nixos-flake.flakeModules.default
-    inputs.nixos-flake.flakeModules.autoWire
+    inputs.nixos-unified.flakeModules.default
+    inputs.nixos-unified.flakeModules.autoWire
   ];
   perSystem = { self', ... }: {
     packages.default = self'.packages.activate;
 
     # Flake inputs we want to update periodically
     # Run: `nix run .#update`.
-    nixos-flake = {
+    nixos-unified = {
       primary-inputs = [
         "nixpkgs"
         "home-manager"
         "nix-darwin"
-        "nixos-flake"
+        "nixos-unified"
         "nix-index-database"
         "nixvim"
         "omnix"