flake: decommission work MacBook Pro (#74)

Also removes the complexity required to deal with darwin system
configurations.

.github/workflows/ci-build.yaml

@@ -26,10 +26,3 @@ jobs:
       - uses: actions/checkout@v4
       - uses: DeterminateSystems/nix-installer-action@main
       - run: nix build .#nixosConfigurations.minimal-server-iso.config.system.build.isoImage
-  build-darwin:
-    name: Build darwin systems
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: DeterminateSystems/nix-installer-action@main
-      - run: nix build .#darwinConfigurations.WQ0C6FWJ1W.config.system.build.toplevel

flake.nix

@@ -17,10 +17,6 @@
       url = "github:nix-community/home-manager/release-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nix-darwin = {
-      url = "github:LnL7/nix-darwin";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nixos-facter-modules.url = "github:numtide/nixos-facter-modules";
     nixos-hardware.url = "github:nixos/nixos-hardware/master";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";

home/default.nix

@@ -1,14 +1,12 @@
-{pkgs, ...}: {
+{...}: {
   imports = [
     ./desktop
     ./java
-    ./profiles
     ./terminal
   ];
   config = {
     my.home = {
-      desktop.enable = pkgs.stdenv.isLinux;
-
+      desktop.enable = true;
       java.enable = true;
       terminal.enable = true;
     };

home/java/default.nix

@@ -20,7 +20,12 @@ in {
       package = pkgs.jdk21;
     };
 
-    programs.gradle.enable = true;
+    programs.gradle = {
+      enable = true;
+      settings = {
+        "org.gradle.java.installations.paths" = "${pkgs.jdk8},${pkgs.jdk11}";
+      };
+    };
 
     my.home.helix-java-support.enable = true;
   };

home/terminal/git.nix

@@ -26,6 +26,23 @@ in {
         key = osUser.signingKey;
       };
 
+      includes = [
+        {
+          condition = "gitdir:~/github/gradlex-org/";
+          contents = {
+            user.email = "[email protected]";
+            user.signingKey = "757DE51A2FD1489D";
+          };
+        }
+        {
+          condition = "gitdir:~/github/apache/";
+          contents = {
+            user.email = "[email protected]";
+            user.signingKey = "9DAADC1C9FCC82D0";
+          };
+        }
+      ];
+
       extraConfig = {
         init.defaultBranch = "main";
         push.autoSetupRemote = "true";

lib.nix

@@ -1,8 +1,8 @@
 let
   defineSystems = inputs: let
     systems = builtins.mapAttrs (k: _v: builtins.readDir ./systems/${k}) (builtins.readDir ./systems);
-    configuration = builder: system: hostName:
-      builder {
+    nixosConfiguration = system: hostName:
+      inputs.nixpkgs.lib.nixosSystem {
         inherit system;
         specialArgs = {
           inherit inputs;
@@ -18,21 +18,12 @@ let
         name = hostName;
         value = builder arch hostName;
       }) (builtins.attrNames systems.${arch});
-    nixosConfiguration = arch: hostName:
-      configuration inputs.nixpkgs.lib.nixosSystem arch hostName;
     nixosConfigurations = let
       nixosConfigurationAttrs = aarch: configurationAttrs nixosConfiguration aarch;
     in
       builtins.listToAttrs (nixosConfigurationAttrs "aarch64-linux" ++ nixosConfigurationAttrs "x86_64-linux");
-    darwinConfiguration = arch: hostName:
-      configuration inputs.nix-darwin.lib.darwinSystem arch hostName;
-    darwinConfigurations = let
-      darwinConfigurationAttrs = aarch: configurationAttrs darwinConfiguration aarch;
-    in
-      builtins.listToAttrs (darwinConfigurationAttrs "aarch64-darwin");
   in {
     inherit nixosConfigurations;
-    inherit darwinConfigurations;
   };
   lib = {
     inherit defineSystems;

modules/nixos/default.nix → modules/default.nix

@@ -2,7 +2,6 @@
   cfg = config.my.host;
 in {
   imports = [
-    ../common
     ./1password
     ./acme
     ./adguard
@@ -14,6 +13,7 @@ in {
     ./gaming
     ./grafana
     ./homelab
+    ./home-manager
     ./homepage
     ./https-proxy
     ./i18n
@@ -22,6 +22,7 @@ in {
     ./networking
     ./nextcloud
     ./nix
+    ./options
     ./proxmox-vm
     ./sops
     ./sound
@@ -38,9 +39,7 @@ in {
       my-user.enable = cfg.role == "desktop";
       sound.enable = cfg.role == "desktop";
       sway.enable = cfg.role == "desktop";
-
-      # enabled only on private desktops
-      gaming.enable = cfg.role == "desktop" && (builtins.elem "private" cfg.profiles);
+      gaming.enable = cfg.role == "desktop";
 
       # enabled only on servers
       comin.enable = cfg.role == "server";

modules/common/home-manager/default.nix → modules/home-manager/default.nix

@@ -19,7 +19,7 @@ in {
         imports = [
           inputs.catppuccin.homeManagerModules.catppuccin
           inputs.nixvim.homeManagerModules.nixvim
-          ../../../home
+          ../../home
         ];
       };
     };

modules/nixos/my-user/default.nix → modules/my-user/default.nix

@@ -21,6 +21,7 @@ in {
       extraGroups = ["networkmanager" "wheel"];
       shell = pkgs.fish;
     };
+    programs.fish.enable = true;
     my.modules.home-manager.enable = true;
     # unfree packages used in home-manager configuration
     my.modules.allowedUnfreePkgs = [

modules/common/options/default.nix → modules/options/default.nix

@@ -19,11 +19,6 @@
         type = types.enum ["desktop" "server"];
         description = "The role this machine has";
       };
-      profiles = mkOption {
-        type = types.listOf (types.enum ["private" "work"]);
-        description = "The profiles to enable on this host";
-        default = [];
-      };
     };
     user = {
       name = mkOption {