test

default.nix

@@ -1,15 +1,17 @@
-# Edit this configuration file to define what should be installed on
+{ self, inputs, ... }: {
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
 
-{ config, pkgs, ... }:
+    flake.nixosConfigurations."laptop" = inputs.nixpkgs.lib.nixosSystem {
+
+        modules = [
+            self.nixosModules.laptop
+            self.nixosModules.default
+        ];
+    };
+
+    flake.nixosModules.laptop = { config, pkgs, ... }:
 
     {
 
-    imports = [ # Include the results of the hardware scan.
-        ./hardware-configuration.nix
-    ];
-
         config = {
 
             boot.kernelParams = [ "snd-intel-dspcfg.dsp_driver=1" ];
@@ -36,8 +38,6 @@
                         };
                     };
                 };
-
-            graphics.enable = true;
             };
 
             sops = {
@@ -55,6 +55,8 @@
 
             sysconfig = {
 
+                host = "laptop";
+
                 services = {
                     wyoming = {
                         enable = true;
@@ -82,12 +84,13 @@
                                     hyprlock.enable = true;
                                     wal.enable = true;
                                     mpd.enable = true;
-                                hyprpanel.enable = true;
                                     calcurse.enable = true;
                                     rofi.enable = true;
                                     firefox.enable = true;
                                     git.enable = true;
                                     nh.enable = true;
+
+                                    aurora.enable = true;
                                 };
 
 #monitor=eDP-1, addreserved, 40,0,0,0
@@ -117,4 +120,5 @@
             system.stateVersion = "23.05"; # Did you read the comment?
         };
 
+    };
 }

flake.nix

@@ -1,38 +0,0 @@
-{
-
-    description = "System Configuration";
-
-    inputs = {
-
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
-
-        home-manager = {
-            url = "github:nix-community/home-manager/release-25.11";
-            inputs.nixpkgs.follows = "nixpkgs";
-        };
-
-        olympus = {
-            #url = "git+https://gitea.esotericbytes.com/Blunkall-Technologies/Olympus";
-            url = "git+file:///home/nathan/Projects/Olympus";
-            inputs.nixpkgs.follows = "nixpkgs";
-            inputs.home-manager.follows = "home-manager";
-        };
-    };
-
-    outputs = { self, nixpkgs, olympus, ... }: let
-        host = "laptop";
-
-    in {
-
-        nixosConfigurations."${host}" = nixpkgs.lib.nixosSystem {
-
-            specialArgs = olympus.inputs;
-
-            modules = [
-                { sysconfig.host = host; }
-                ./configuration.nix
-                olympus.profiles.laptop
-            ];
-        };
-    };
-}

hardware-configuration.nix

@@ -1,7 +1,6 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
+{ ... }: {
-# and may be overwritten by future invocations.  Please make changes
+
-# to /etc/nixos/configuration.nix instead.
+    flake.nixosModules.laptop = { config, lib, pkgs, modulesPath, ... }:
-{ config, lib, pkgs, modulesPath, ... }:
 
     {
         imports =
@@ -36,4 +35,5 @@
 
         nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
         hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    };
 }