move to directory based layout

demilich/configuration.nix

@@ -2,21 +2,28 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
-  imports =
+  imports = [
-    [
+    ./hardware-configuration.nix
-      ./hardware-configuration.nix
+    ../services.nix
-      ./services.nix
+    ../packages.nix
-      ./packages.nix
+    ../security.nix
-      ./security.nix
+  ];
-    ];
 
   # Enable flakes and nix-command
   nix = {
     settings = {
-      experimental-features = [ "nix-command" "flakes" ];
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
     };
   };
   nixpkgs.config.permittedInsecurePackages = [
@@ -27,10 +34,10 @@
   boot = {
     loader = {
       limine = {
-	efiSupport = true;
+        efiSupport = true;
         enable = true;
-	enableEditor = true;
+        enableEditor = true;
-	maxGenerations = 10;
+        maxGenerations = 10;
       };
       efi = {
         canTouchEfiVariables = true;
@@ -64,7 +71,10 @@
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.stobbsm = {
     isNormalUser = true;
-    extraGroups = [ "wheel" "seat" ]; # Enable ‘sudo’ for the user.
+    extraGroups = [
+      "wheel"
+      "seat"
+    ]; # Enable ‘sudo’ for the user.
     shell = pkgs.zsh;
   };
 

flake.nix

@@ -6,11 +6,12 @@
     # Use `nix flake update` to update the flake to the latest revision of the chosen release channel.
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
   };
-  outputs = inputs@{ self, nixpkgs, ... }: {
+  outputs =
-    # NOTE: 'nixos' is the default hostname
+    inputs@{ self, nixpkgs, ... }:
-    nixosConfigurations."demilich" = nixpkgs.lib.nixosSystem {
+    {
-      modules = [ ./configuration.nix ];
+      # NOTE: 'nixos' is the default hostname
+      nixosConfigurations."demilich" = nixpkgs.lib.nixosSystem {
+        modules = [ ./demilich/configuration.nix ];
+      };
     };
-  };
 }
-