module rewrite

flake.nix

@@ -98,7 +98,7 @@
                 statix = { enable = true; };
               };
               settings = {
-                statix.ignore = [ "*hardware{_,-}configuration.nix" ];
+                statix.ignore = [ "*hardware_configuration.nix" ];
               };
             };
           };
@@ -114,9 +114,8 @@
 
       flake =
         let
-          inherit (import ./modules) utils mkHosts;
-
-          hosts = mkHosts { inherit inputs; };
+          hosts = import ./modules/hosts;
+          utils = import ./utils.nix;
 
           rawInputs = {
             inherit (inputs) nixpkgs nixpkgs-unstable nixos-unstable;

modules/base/default.nix

@@ -0,0 +1,27 @@
+{ lib, ... }: {
+  imports = [
+    ./efi-grub.nix
+
+    ./aliases.nix
+    ./allow-unfree.nix
+    ./colmena.nix
+    ./direnv.nix
+    ./enable-flakes.nix
+    ./FIXES.nix
+    ./git.nix
+    ./helix
+    ./hm.nix
+    ./pass.nix
+    ./pkgs.nix
+    ./sops.nix
+    ./ssh.nix
+    ./starship.nix
+    ./swedish-locale.nix
+    ./user.nix
+    ./zsh.nix
+    ./opengl.nix
+  ];
+
+  custom.efi-grub.enable = lib.mkDefault true;
+
+}

modules/base/efi-grub.nix

@@ -0,0 +1,23 @@
+{ config, lib, ... }:
+let cfg = config.custom.efi-grub; in with lib; {
+  options.custom.efi-grub.enable = mkEnableOption "efi-grub";
+
+  config = lib.mkIf cfg.enable {
+    boot = {
+      #kernelParams = [ "quiet" "splash" ];
+      loader = {
+        efi.canTouchEfiVariables = true;
+        timeout = 10;
+        grub = {
+          enable = true;
+          efiSupport = true;
+          device = "nodev";
+          extraConfig = ''
+            GRUB_HIDDEN_TIMEOUT=10
+            GRUB_HIDDEN_TIMEOUT_QUIET=false
+          '';
+        };
+      };
+    };
+  };
+}

modules/base/opengl.nix

@@ -0,0 +1,3 @@
+_: {
+  hardware.opengl.enable = true;
+}

modules/base/ssh.nix

@@ -23,7 +23,7 @@ with lib; {
   };
   # allow these clients to connect
   users.users."ejg".openssh.authorizedKeys.keyFiles = [
-    ./_pubkeys/id_rsa_mothership.pub
+    ./pubkeys/id_rsa_mothership.pub
   ];
   # let colmena know about the identity file
   my.home.sessionVariables."SSH_CONFIG_FILE" = pkgs.writeText "colmena-ssh-config" ''
@@ -37,8 +37,7 @@ with lib; {
     startAgent = true;
     extraConfig =
       let
-        inherit ((import ../.)) mkHosts;
-        hosts = mkHosts { };
+        hosts = import ../hosts;
         hostStrings =
           lib.mapAttrsToList
             (

modules/hosts/default.nix

@@ -0,0 +1,32 @@
+rec {
+  "void" = {
+    ip = "192.168.0.3";
+    modules = [ ./void ];
+  };
+
+  "seneca" = {
+    ip = "192.168.0.4";
+    modules = [ ./seneca ];
+  };
+
+  "_oakleaf" = {
+    ip = "127.0.0.1";
+    modules = [ ./oakleaf ];
+  };
+
+  "oakleaf-home" = _oakleaf // {
+    modules = [ ./oakleaf/spec-home.nix ];
+  };
+
+  "oakleaf-laptop" = _oakleaf;
+
+  "weasel" = {
+    ip = "127.0.0.1";
+    modules = [ ./weasel ];
+  };
+  "stoneheart" = {
+    ip = "127.0.0.1";
+    modules = [ ./stoneheart ];
+  };
+}
+

modules/oakleaf/configuration.nix → modules/hosts/oakleaf/configuration.nix

@@ -2,9 +2,12 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running `nixos-help`).
 _: {
+
+  imports = [
+    ./hardware-configuration.nix
+  ];
+
   networking.hostName = "oakleaf";
   system.stateVersion = "23.05"; # Did you read the comment?
   my.home.stateVersion = "23.05";
-  # nix.settings.ssl-cert-file = "/var/lib/cert.crt";
-  hardware.opengl.enable = true;
 }

modules/hosts/oakleaf/default.nix

@@ -0,0 +1,9 @@
+_: {
+
+  imports = [
+    ../../pc
+
+    ./configuration.nix
+  ];
+
+}

modules/oakleaf/_spec-home.nix → modules/hosts/oakleaf/spec-home.nix

@@ -1,5 +1,8 @@
 { config, lib, pkgs, ... }:
 {
+
+  imports = [ ./. ];
+
   services.xserver.videoDrivers = [ "displaylink" "modesetting" ];
   services.xserver.displayManager.sessionCommands = ''
     ${lib.getBin pkgs.xorg.xrandr}/bin/xrandr --setprovideroutputsource 2 0