extract work config

Author: esselius

darwin-configurations/Fox.nix

@@ -1,15 +1,17 @@
-{ ezModules, ... }:
+{ inputs, ezModules, ... }:
 
 {
   imports = [
     ezModules.tiling-wm
     ezModules.homebrew-packages
-    ezModules.user-peteresselius
     ezModules.linux-builder
+    ezModules.nixpkgs-path
+    inputs.nix-homebrew.darwinModules.nix-homebrew
   ];
 
   nixpkgs.hostPlatform = "aarch64-darwin";
 
   context = "home";
   formfactor = "desktop";
+  mainUser = "peteresselius";
 }

darwin-configurations/Petere-MBP.nix

@@ -2,7 +2,7 @@
 
 let
   inherit (lib) mkOption;
-  inherit (lib.types) enum;
+  inherit (lib.types) enum str path;
 in
 {
   options = {
@@ -12,5 +12,11 @@ in
     formfactor = mkOption {
       type = enum [ "desktop" "laptop" "server" "vm" ];
     };
+    mainUser = mkOption {
+      type = str;
+    };
+    nixpkgs-path = mkOption {
+      type = path;
+    };
   };
 }

darwin-modules/context.nix

@@ -5,6 +5,7 @@
     ezModules.context
     ezModules.nix
     ezModules.security
+    ezModules.user
     ../overlays.nix
   ];
 }

darwin-modules/default.nix

@@ -15,5 +15,8 @@
       "vlc"
       "wezterm"
     ];
+    brews = [
+      "age-plugin-se"
+    ];
   };
 }

darwin-modules/homebrew-packages/common.nix

@@ -1,14 +1,13 @@
-{ inputs, ... }:
+{ config, ... }:
 
 {
   nix-homebrew = {
     enable = true;
-    user = "peteresselius";
+    user = config.mainUser;
   };
   homebrew.enable = true;
 
   imports = [
-    inputs.nix-homebrew.darwinModules.nix-homebrew
     ./common.nix
     ./home.nix
     ./work.nix

darwin-modules/homebrew-packages/default.nix

@@ -1,4 +1,4 @@
-{ inputs, lib, pkgs, ... }:
+{ lib, pkgs, config, ... }:
 
 {
   nixpkgs.config.allowUnfree = true;
@@ -34,16 +34,10 @@
       interval = { Hour = 3; Minute = 15; Weekday = 6; };
     };
 
-    registry = {
-      nixpkgs.flake = inputs.nixpkgs-darwin;
-      nixpkgs-unstable.flake = inputs.nixpkgs-unstable;
-    };
-
     nixPath = lib.mkForce [
-      "nixpkgs=${inputs.nixpkgs-darwin}"
-      "nixpkgs-unstable=${inputs.nixpkgs-unstable}"
+      "nixpkgs=${config.nixpkgs-path}"
     ];
   };
 
-  system.stateVersion = 4;
+  system.stateVersion = 5;
 }

darwin-modules/nix.nix

@@ -0,0 +1,5 @@
+{ inputs, ... }:
+
+{
+  nixpkgs-path = inputs.nixpkgs;
+}

darwin-modules/nixpkgs-path.nix

@@ -1,10 +1,10 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
-  users.users.peteresselius = {
+  users.users.${config.mainUser} = {
     uid = 501;
     description = "Peter Esselius";
-    home = "/Users/peteresselius";
+    home = "/Users/" + config.mainUser;
     shell = pkgs.fish;
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFMdasDSm/XlOpv15asMENnQ/E9W9rXExBcUAVd/G6Mo"
@@ -15,5 +15,5 @@
   programs.fish.enable = true;
   environment.shells = [ pkgs.fish ];
 
-  users.knownUsers = [ "peteresselius" ];
+  users.knownUsers = [ config.mainUser ];
 }