From cfd91e2e51f73187944533fa4cfabb20e0521608 Mon Sep 17 00:00:00 2001
From: Bill Ewanick <bill@ewanick.com>
Date: Fri, 22 Sep 2023 17:05:22 -0400
Subject: [PATCH] Move flake to top level

---
 server-config/flake.lock => flake.lock |  6 +++---
 flake.nix                              | 26 ++++++++++++++++++++++++++
 server-config/configuration.nix        |  8 --------
 server-config/flake.nix                | 18 ------------------
 4 files changed, 29 insertions(+), 29 deletions(-)
 rename server-config/flake.lock => flake.lock (70%)
 create mode 100644 flake.nix
 delete mode 100644 server-config/flake.nix

diff --git a/server-config/flake.lock b/flake.lock
similarity index 70%
rename from server-config/flake.lock
rename to flake.lock
index 7c3dfb2..58c05da 100644
--- a/server-config/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1687729501,
-        "narHash": "sha256-mTLkMePoHUWvTCf3NuKbeYEea/tsikSIKBWwb9OfRr4=",
+        "lastModified": 1695272228,
+        "narHash": "sha256-4uw2OdJPVyjdB+xcDst9SecrNIpxKXJ2usN3M5HVa7o=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "35130d4b4f0b8c50ed2aceb909a538c66c91d4a0",
+        "rev": "55ac2a9d2024f15c56adf20da505b29659911da8",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..9ac21b5
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,26 @@
+{
+  description = "System flake for Linode NixOS server";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
+  };
+
+  outputs = inputs@{ nixpkgs, ... }:
+    {
+      nixosConfigurations.linode-nixos =
+        nixpkgs.lib.nixosSystem {
+          specialArgs = { inherit inputs; };
+          modules = [
+            ./server-config/configuration.nix
+
+            # Applications that run on this server
+            nixos-apps/crueltysquad.com.nix
+            nixos-apps/cutesealfanpage.love.nix
+            nixos-apps/ewanick.com.nix
+            nixos-apps/fancytypist.com.nix
+            nixos-apps/git.ewanick.com.nix
+            nixos-apps/jitsi.crueltysquad.com.nix
+          ];
+        };
+    };
+}
diff --git a/server-config/configuration.nix b/server-config/configuration.nix
index d1c186e..5c833cd 100644
--- a/server-config/configuration.nix
+++ b/server-config/configuration.nix
@@ -9,14 +9,6 @@
     [
       # Include the results of the hardware scan.
       ./hardware-configuration.nix
-
-      # Applications that run on this server
-      ../nixos-apps/crueltysquad.com.nix
-      ../nixos-apps/cutesealfanpage.love.nix
-      ../nixos-apps/ewanick.com.nix
-      ../nixos-apps/fancytypist.com.nix
-      ../nixos-apps/git.ewanick.com.nix
-      ../nixos-apps/jitsi.crueltysquad.com.nix
     ];
 
   # Use the GRUB 2 boot loader.
diff --git a/server-config/flake.nix b/server-config/flake.nix
deleted file mode 100644
index 657ad87..0000000
--- a/server-config/flake.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  description = "System flake for Linode NixOS server";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
-  };
-
-  outputs = inputs@{ nixpkgs, ... }:
-    {
-      nixosConfigurations.linode-nixos =
-        nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
-          modules = [
-            ./configuration.nix
-          ];
-        };
-    };
-}