modules/nixos/

configurations/darwin/appreciate.nix

@@ -8,7 +8,7 @@ in
 {
   imports = [
     self.darwinModules.default
-    "${self}/nixos/github-runner.nix"
+    "${self}/modules/nixos/shared/github-runner.nix"
   ];
 
   nixpkgs.hostPlatform = "aarch64-darwin";

configurations/nixos/immediacy.nix

@@ -9,13 +9,12 @@ in
   imports = [
     inputs.disko.nixosModules.disko
     self.nixosModules.default
-    "${self}/nixos/disko/trivial.nix"
-    "${self}/nixos/common/primary-as-admin.nix"
-    "${self}/nixos/docker.nix"
-    "${self}/nixos/actualism-app.nix"
-    "${self}/nixos/hedgedoc.nix"
-    "${self}/nixos/github-runner.nix"
-    "${self}/nixos/server/harden/basics.nix"
+    "${self}/modules/nixos/linux/disko/trivial.nix"
+    "${self}/modules/nixos/linux/docker.nix"
+    "${self}/modules/nixos/linux/actualism-app.nix"
+    "${self}/modules/nixos/linux/hedgedoc.nix"
+    "${self}/modules/nixos/linux/server/harden/basics.nix"
+    "${self}/modules/nixos/shared/github-runner.nix"
   ];
 
   nixos-flake.sshTarget = "srid@immediacy";

flake-module.nix

@@ -41,6 +41,16 @@ in
       )
       (builtins.readDir "${self}/modules/darwin");
 
+    nixosModules = inputs.nixpkgs.lib.mapAttrs'
+      (fn: _:
+        let
+          inherit (inputs.nixpkgs) lib;
+          name = lib.removeSuffix ".nix" fn;
+        in
+        lib.nameValuePair name "${self}/modules/nixos/${fn}"
+      )
+      (builtins.readDir "${self}/modules/nixos");
+
     homeModules = inputs.nixpkgs.lib.mapAttrs'
       (fn: _:
         let

flake.nix

@@ -43,7 +43,6 @@
       [
         ./flake-module.nix
         ./users
-        ./nixos
       ];
 
       perSystem = { self', pkgs, lib, system, ... }: {

modules/nixos/common.nix

@@ -0,0 +1,8 @@
+# Common to Linux & darwin
+{
+  imports = [
+    ./shared/nix.nix
+    ./shared/primary-as-admin.nix
+    ./shared/caches.nix
+  ];
+}

modules/nixos/default.nix

@@ -0,0 +1,23 @@
+# Configuration common to all Linux systems
+{ flake, ... }:
+
+let
+  inherit (flake) config inputs;
+  inherit (inputs) self;
+in
+{
+  imports = [
+    {
+      users.users.${config.people.myself}.isNormalUser = true;
+      home-manager.users.${config.people.myself} = { };
+      home-manager.sharedModules = [
+        self.homeModules.default
+        self.homeModules.linux-only
+      ];
+    }
+    self.nixosModules.common
+    inputs.ragenix.nixosModules.default # Used in github-runner.nix & hedgedoc.nix
+    ./all/self-ide.nix
+    ./all/current-location.nix
+  ];
+}

nixos/hedgedoc.nix → modules/nixos/linux/hedgedoc.nix

@@ -1,12 +1,13 @@
-{ config, ... }:
+{ flake, config, ... }:
 
 let
+  inherit (flake.inputs) self;
   domain = "pad.srid.ca";
   port = 9112;
 in
 {
   age.secrets."hedgedoc.env" = {
-    file = ../secrets/hedgedoc.env.age;
+    file = self + /secrets/hedgedoc.env.age;
     owner = "hedgedoc";
   };
   services.hedgedoc = {

nixos/github-runner.nix → modules/nixos/shared/github-runner.nix

@@ -1,14 +1,15 @@
 { flake, ... }:
 let
   inherit (flake) inputs;
+  inherit (inputs) self;
 in
 {
   imports = [
     inputs.github-nix-ci.nixosModules.default
   ];
 
   services.github-nix-ci = {
-    age.secretsDir = ../secrets;
+    age.secretsDir = self + /secrets;
     personalRunners = {
       "srid/srid".num = 1;
     };