Move jrpotter to top-level.

flake.lock

@@ -189,12 +189,12 @@
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-w34b9SS0gjjLG3TGyHlSym5j2KeAgRnjFAeAnSIiF7s=",
+        "narHash": "sha256-Vhq9jZLDEPDZPxrL8yiMsEAz7AWySO0a5WDCMXRRorU=",
-        "path": "./framework",
+        "path": "./hive/framework",
         "type": "path"
       },
       "original": {
-        "path": "./framework",
+        "path": "./hive/framework",
         "type": "path"
       }
     },
@@ -349,11 +349,11 @@
       "locked": {
         "lastModified": 1,
         "narHash": "sha256-uviT1vNgSZnpddGqgHZUwKDPl/VYRz92X7hnw72yiTY=",
-        "path": "./phobos",
+        "path": "./hive/phobos",
         "type": "path"
       },
       "original": {
-        "path": "./phobos",
+        "path": "./hive/phobos",
         "type": "path"
       }
     },

flake.nix

@@ -3,8 +3,8 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
-    framework.url = "path:./framework";
+    framework.url = "path:./hive/framework";
-    phobos.url = "path:./phobos";
+    phobos.url = "path:./hive/phobos";
   };
 
   outputs = { nixpkgs, framework, phobos, ... }:
@@ -16,6 +16,11 @@
         meta = {
           nixpkgs = import nixpkgs { inherit system; };
           specialArgs = { inherit system; };
+          nodeSpecialArgs = {
+            framework = {
+              jrpotter = import ./users/jrpotter;
+            };
+          };
         };
 
         # Local machines. Deploy using `colmena apply-local [--sudo]`

hive/framework/configuration.nix

@@ -1,15 +1,5 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running `nixos-help`).
-
 { pkgs, ... }:
-
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
-
   boot.loader = {
     efi.canTouchEfiVariables = true;
     systemd-boot.enable = true;
@@ -52,10 +42,7 @@
     };
   };
 
-  # After 23.05, this option is called `fonts.packages`.
+  fonts.fonts = with pkgs; [ iosevka ];
-  fonts.fonts = with pkgs; [
-    iosevka
-  ];
 
   hardware.bluetooth.enable = true;
 
@@ -88,34 +75,10 @@
 
   time.timeZone = "America/Denver";
 
-  # Don't forget to set a password with `passwd`.
-  users.users.jrpotter = {
-    isNormalUser = true;
-    extraGroups = [
-      "docker"
-      "networkmanager"
-      "wheel"  # Enable `sudo` for the user.
-    ];
-  };
-
   virtualisation.docker.rootless = {
     enable = true;
     # Sets the `DOCKER_HOST` variable to the rootless Docker instance for normal
     # users by default.
     setSocketVariable = true;
   };
-
-  # Copy the NixOS configuration file and link it from the resulting system
-  # (/run/current-system/configuration.nix). This is useful in case you
-  # accidentally delete configuration.nix.
-  # system.copySystemConfiguration = true;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It's perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.05";
 }
-

hive/framework/flake.nix

@@ -14,26 +14,43 @@
   };
 
   outputs = { bootstrap, home-manager, ... }: {
-    nixosModules.default = { pkgs, system, ... }:
+    nixosModules.default = { pkgs, system, jrpotter, ... }:
       let
-        jrpotter-home-manager = {
+        # This value determines the NixOS and home-manager release from which
-          useGlobalPkgs = true;
+        # the default settings for stateful data, like file locations and
-          useUserPackages = true;
+        # database versions on your system were taken. This should probably
-          users.jrpotter = import ./jrpotter;
+        # never change.
-
+        stateVersion = "23.05";
-          # Used to pass non-default parameters to submodules.
-          extraSpecialArgs = {
-            inherit system;
-            bootstrap = bootstrap.packages.${system}.default;
-          };
-        };
       in
       {
         imports = [
+          ./hardware-configuration.nix
           ./configuration.nix
           home-manager.nixosModules.home-manager
-          { home-manager = jrpotter-home-manager; }
         ];
+
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          users.jrpotter = jrpotter;
+
+          # Used to pass non-default parameters to submodules.
+          extraSpecialArgs = {
+            inherit system stateVersion;
+            bootstrap = bootstrap.packages.${system}.default;
+          };
+        };
+
+        users.users.jrpotter = {
+          isNormalUser = true;
+          extraGroups = [
+            "docker"
+            "networkmanager"
+            "wheel"
+          ];
+        };
+
+        system.stateVersion = stateVersion;
       };
   };
 }

users/jrpotter/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, bootstrap, ... }:
+{ pkgs, bootstrap, stateVersion, ... }:
 {
   imports = [
     ./bash
@@ -52,5 +52,5 @@
   # You can update Home Manager without changing this value.
   # See the Home Manager release notes for a list of state
   # version changes in each release.
-  home.stateVersion = "23.05";
+  home.stateVersion = stateVersion;
 }