test

default.nix

@@ -1,14 +1,16 @@
-# 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
-    imports = [ # Include the results of the hardware scan.
+            self.nixosModules.default
-        ./hardware-configuration.nix
         ];
+    };
+
+    flake.nixosModules.laptop = { config, pkgs, ... }:
+
+    {
 
         config = {
 
@@ -36,8 +38,6 @@
                         };
                     };
                 };
-
-            graphics.enable = true;
             };
 
             sops = {
@@ -55,6 +55,8 @@
 
             sysconfig = {
 
+                host = "laptop";
+
                 services = {
                     wyoming = {
                         enable = true;
@@ -82,15 +84,16 @@
                                     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
+#monitor=eDP-1, addreserved, 40,0,0,0
                                 wayland.windowManager.hyprland.extraConfig = ''
                                     monitor=eDP-1,1920x1080@60,0x0,1
                                     bind = CTRL SHIFT, XF86Launch2, exec, bash -c 'if [[ $(hyprctl monitors | grep 0x0 | sed -n -e "s/\t*1920x1080@//" -e "s/.[1234567890]* at 0x0//p") == 300 ]]; then pkexec --user root /nix/var/nix/profiles/system/bin/switch-to-configuration switch; else pkexec --user root /nix/var/nix/profiles/system/specialisation/docked/bin/switch-to-configuration switch; fi'
@@ -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,9 +1,8 @@
-# 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.
-{ config, lib, pkgs, modulesPath, ... }:
 
-{
+    flake.nixosModules.laptop = { config, lib, pkgs, modulesPath, ... }:
+
+    {
         imports =
             [ (modulesPath + "/installer/scan/not-detected.nix")
             ];
@@ -26,14 +25,15 @@
 
         swapDevices = [ ];
 
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
+# (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
+# still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
         networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.eno1.useDHCP = lib.mkDefault true;
+# networking.interfaces.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
+# networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
 
         nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
         hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+    };
 }