From e1652df3d00038ea0b1c11c2495022ef2b2830f5 Mon Sep 17 00:00:00 2001
From: Riley Apeldoorn <me@riley.lgbt>
Date: Tue, 23 May 2023 10:04:47 +0200
Subject: [PATCH] Fix flake.nix

---
 flake.nix | 86 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7f357eb..7f12e7e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,55 +11,57 @@
 
   outputs = args@{ home-manager, nixpkgs, ... }: with nixpkgs; {
   
-    # Configurations for NixOS machines.
-    nixosConfigurations = 
-      let mkUserConfig = path: {
-        imports = [ home-manager.nixosModules.home-manager ];
-        config = {
-          home-manager.users."riley" = a: lib.pipe a [
-            (import "${path}/home.nix")
-            (x: x // { imports = [ ./shared/home ]; })
-          ];
-        };
-      }; in {
+      # Configurations for NixOS machines.
+      nixosConfigurations =
+        let mkUserConfig = path: {
+              imports = [ home-manager.nixosModules.home-manager ];
+              config = {
+                home-manager.users."riley" = a: lib.pipe a [
+                  (import "${path}/home.nix")
+                  (x: x // { imports = [ ./shared/home ]; })
+                ];
+              };
+            };
+        in {
 
-        # Desktop system
-        "thor" = lib.nixosSystem {
-          system = "x86_64-linux";
+          # Desktop system
+          "thor" = lib.nixosSystem {
+            system = "x86_64-linux";
+            modules = [
+              (mkUserConfig ./system/thor)
+              ./system/thor/core.nix
+              ./shared/core
+            ];
+            specialArgs = args;
+          };
+
+          # Pinebook
+          "odin" = lib.nixosSystem {
+            system = "aarch64-linux";
+            modules = [
+              (mkUserConfig ./system/odin)
+              ./system/odin/core.nix
+              ./shared/core
+            ];
+            specialArgs = args;
+          };
+
+        };
+
+      # Configurations for non-NixOS machines.
+      homeConfigurations = with home-manager.lib; {
+        "dev-lt-63" = homeManagerConfiguration {
+          pkgs = nixpkgs.legacyPackages."x86_64-linux";
           modules = [
-            (mkUserConfig ./system/thor)
-            ./system/thor/core.nix
-            ./shared/core
+            ./system/dev-lt-63/home.nix
+            ./shared/home
           ];
-          specialArgs = args;
         };
-
-        # Pinebook
-        "odin" = lib.nixosSystem {
-          system = "aarch64-linux";
-          modules = [
-            (mkUserConfig ./system/odin)
-            ./system/odin/core.nix
-            ./shared/core
-          ];
-          specialArgs = args;
-        };
-
       };
 
-    # Configurations for non-NixOS machines.
-    homeConfigurations = with home-manager.lib; {
-      "dev-lt-63" = homeManagerConfiguration {
-        pkgs = nixpkgs.legacyPackages."x86_64-linux";
-        modules = [
-          (mkUserConfig ./system/dev-lt-63)
-        ];
+      overlays = {
+        default = (import ./shared/overlay.nix);
       };
-    };
-
-    overlays = {
-      default = (import ./shared/overlay.nix);
-    };
     
   };