From 8dcf355819cc6cd1e87924218c1adcd900ecda84 Mon Sep 17 00:00:00 2001
From: Alexander Kassouni <alex@kassouni.net>
Date: Fri, 28 Aug 2026 23:27:52 -0700
Subject: refactor base nixos modules

---
 flake.nix | 44 +++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index 847d3ab..66b1f5a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,10 @@
     slippi.url = "github:lytedev/slippi-nix";
     slippi.inputs.nixpkgs.follows = "nixpkgs";
     slippi.inputs.home-manager.follows = "home-manager";
+    nixos-hardware = {
+      url = "github:NixOS/nixos-hardware";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
@@ -22,6 +26,7 @@
       home-manager,
       nixvim,
       xmonad-config,
+      nixos-hardware,
       sidra,
       slippi,
       ...
@@ -48,8 +53,44 @@
           };
           modules = [
             ./machines/hierophant/configuration.nix
-            ./machines/hierophant/hardware-configuration.nix
+            ./machines/common
+            xmonad-config.nixosModules.default
+            slippi.nixosModules.default
+            home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = {
+                pkgs-unstable = import nixpkgs-unstable {
+                  system = "x86_64-linux";
+                  config.allowUnfree = true;
+                };
+              };
+              home-manager.users.kassouni = { pkgs, ... }: {
+                imports = [
+                  ./users/kassouni/home.nix
+                  nixvim.homeModules.nixvim
+                  xmonad-config.homeManagerModules.default
+                  slippi.homeManagerModules.default
+                ];
+                home.packages = [ sidra.packages.${pkgs.system}.default ];
+              };
+            }
+          ];
+        };
+        magician = nixpkgs.lib.nixosSystem {
+          system = "x86_64-linux";
+          specialArgs = {
+            pkgs-unstable = import nixpkgs-unstable {
+              system = "x86_64-linux";
+              config.allowUnfree = true;
+            };
+          };
+          modules = [
+            ./machines/magician/configuration.nix
+            ./machines/common
             xmonad-config.nixosModules.default
+            nixos-hardware.nixosModules.framework-intel-core-ultra-series3
             slippi.nixosModules.default
             home-manager.nixosModules.home-manager
             {
@@ -73,6 +114,7 @@
             }
           ];
         };
+ 
       };
 
       devShells = forAllSystems (system: {
-- 
cgit v1.3.1