diff --git a/flake.lock b/flake.lock
new file mode 100644
index 00000000..7f382f67
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1726320982,
+        "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
index e69de29b..4d9ee849 100644
--- a/flake.nix
+++ b/flake.nix
@@ -0,0 +1,17 @@
+{
+   description = "FunctionalHacker's NixOS config";
+
+   inputs = {
+      nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+   };
+
+   outputs = { self, nixpkgs, ...}@inputs: {
+      nixosConfigurations.Mirkwood = nixpkgs.lib.nixosSystem {
+         system = "x86_64-linux";
+         modules = [
+            ./hosts/Mirkwood/configuration.nix
+            ./gpg.nix
+         ];
+      };
+   };
+}
diff --git a/configuration.nix b/hosts/Mirkwood/configuration.nix
similarity index 92%
rename from configuration.nix
rename to hosts/Mirkwood/configuration.nix
index 8a12708d..c0819abe 100644
--- a/configuration.nix
+++ b/hosts/Mirkwood/configuration.nix
@@ -1,15 +1,7 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
 { config, pkgs, ... }:
 
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-      ./gpg.nix
-    ];
+  imports = [ ./hardware-configuration.nix ];
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
 
diff --git a/hardware-configuration.nix b/hosts/Mirkwood/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to hosts/Mirkwood/hardware-configuration.nix