remove darwin
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing

I previously had one darwin host, `jakehillion-mbp-m1-13`. It never
worked right and I don't own the machine anymore. Clean up all darwin
references and add it from scratch when adding a machine in the future.
This commit is contained in:
Jake Hillion 2024-02-06 21:36:33 +00:00 committed by JakeHillion
parent f176a9e4d5
commit 4c3b948beb
6 changed files with 2 additions and 63 deletions

View File

@ -45,27 +45,6 @@
"type": "github"
}
},
"darwin_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1705356404,
"narHash": "sha256-0/WnHU5S9GXOJD2HGe/mFNmGGE+8UGnhwofsyJQVoDA=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "44a6ec1faeff61a6404c25ef1a263fc2d98d081b",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems_2"
@ -193,7 +172,6 @@
"root": {
"inputs": {
"agenix": "agenix",
"darwin": "darwin_2",
"flake-utils": "flake-utils",
"home-manager": "home-manager_2",
"impermanence": "impermanence",

View File

@ -6,9 +6,6 @@
flake-utils.url = "github:numtide/flake-utils";
darwin.url = "github:lnl7/nix-darwin/master";
darwin.inputs.nixpkgs.follows = "nixpkgs";
agenix.url = "github:ryantm/agenix";
agenix.inputs.nixpkgs.follows = "nixpkgs";
@ -20,11 +17,10 @@
description = "Hillion Nix flake";
outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-chia, flake-utils, agenix, home-manager, impermanence, darwin, ... }@inputs: {
outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-chia, flake-utils, agenix, home-manager, impermanence, ... }@inputs: {
nixosConfigurations =
let
fqdns = builtins.attrNames (builtins.readDir ./hosts);
isNixos = fqdn: !builtins.pathExists ./hosts/${fqdn}/darwin;
getSystemOverlays = system: nixpkgsConfig: [
(final: prev: {
"storj" = final.callPackage ./pkgs/storj.nix { };
@ -58,27 +54,7 @@
];
};
in
nixpkgs.lib.genAttrs (builtins.filter isNixos fqdns) mkHost;
darwinConfigurations =
let
hosts = builtins.attrNames (builtins.readDir ./hosts);
isDarwin = host: builtins.pathExists ./hosts/${host}/darwin;
mkHost = host:
let system = builtins.readFile ./hosts/${host}/system;
in
darwin.lib.darwinSystem {
inherit system;
inherit inputs;
modules = [
./hosts/${host}/default.nix
agenix.darwinModules.default
home-manager.darwinModules.default
];
};
in
nixpkgs.lib.genAttrs (builtins.filter isDarwin hosts) mkHost;
nixpkgs.lib.genAttrs fqdns mkHost;
} // flake-utils.lib.eachDefaultSystem (system: {
formatter = nixpkgs.legacyPackages.${system}.nixpkgs-fmt;
});

View File

@ -1,13 +0,0 @@
{ pkgs, config, agenix, ... }:
{
config.services.nix-daemon.enable = true;
config.environment.systemPackages = with pkgs; [
git
htop
mosh
nix
vim
];
}

View File

@ -1 +0,0 @@
aarch64-darwin

View File

@ -41,7 +41,6 @@ in
for path in hosts/*
do
hostname=''${path##*/}
if test -f "hosts/$hostname/darwin"; then continue; fi
if rev=$(${curl}/bin/curl -s --connect-timeout 15 http://$hostname:30653/current/nixos/system/configurationRevision); then
echo "$hostname: $rev (current)"