diff options
| -rw-r--r-- | flake.lock | 91 | ||||
| -rw-r--r-- | flake.nix | 46 |
2 files changed, 7 insertions, 130 deletions
diff --git a/flake.lock b/flake.lock index 4afb02b..36b84cb 100644 --- a/flake.lock +++ b/flake.lock @@ -1,52 +1,8 @@ { "nodes": { - "agenix": { - "inputs": { - "darwin": "darwin", - "home-manager": "home-manager", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1694734964, - "narHash": "sha256-FvBMAbl6EMFVODzgaEwQ9z7tfGMQvDeyc0YZ5ArPYPE=", - "owner": "ryantm", - "repo": "agenix", - "rev": "20deb735cc405831ba04a0088fecb3887aa255c0", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", - "type": "github" - }, - "original": { - "owner": "lnl7", - "ref": "master", - "repo": "nix-darwin", - "type": "github" - } - }, - "darwin_2": { - "inputs": { - "nixpkgs": [ "nixpkgs" ] }, @@ -122,27 +78,6 @@ "home-manager": { "inputs": { "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1682203081, - "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { - "inputs": { - "nixpkgs": [ "nixpkgs" ] }, @@ -161,26 +96,6 @@ "type": "github" } }, - "homeage": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1669234151, - "narHash": "sha256-TwT87E3m2TZLgwYJESlype14HxUOrRGojPM5C2akrMg=", - "owner": "jordanisaacs", - "repo": "homeage", - "rev": "02bfe4ca06962d222e522fff0240c93946b20278", - "type": "github" - }, - "original": { - "owner": "jordanisaacs", - "repo": "homeage", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1694499547, @@ -228,11 +143,9 @@ }, "root": { "inputs": { - "agenix": "agenix", - "darwin": "darwin_2", + "darwin": "darwin", "futils": "futils", - "home-manager": "home-manager_2", - "homeage": "homeage", + "home-manager": "home-manager", "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks" } diff --git a/flake.nix b/flake.nix index b305ac5..072ad80 100644 --- a/flake.nix +++ b/flake.nix @@ -11,17 +11,6 @@ futils.url = "github:numtide/flake-utils"; - emacs-overlay.url = "github:nix-community/emacs-overlay"; - - naersk.url = "github:nix-community/naersk"; - - agenix = { - url = "github:ryantm/agenix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - nur.url = "github:nix-community/NUR"; - home-manager = { type = "github"; owner = "nix-community"; @@ -32,19 +21,11 @@ }; }; - homeage = { - url = "github:jordanisaacs/homeage"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - rust = { - url = "github:oxalica/rust-overlay"; + darwin = { + url = "github:lnl7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; - darwin.url = "github:lnl7/nix-darwin"; - darwin.inputs.nixpkgs.follows = "nixpkgs"; - pre-commit-hooks = { type = "github"; owner = "cachix"; @@ -63,7 +44,7 @@ let myLib = import ./nix inputs; lib = inputs.nixpkgs.lib // builtins; - supportedSystems = [ "x86_64-linux" "aarch64-darwin" ]; + supportedSystems = [ "aarch64-darwin" ]; forAllSystems = lib.genAttrs supportedSystems; # Nixpkgs instantiated for supported system types. @@ -155,31 +136,14 @@ tools = import ./tools { inherit pkgs; }; }); - nixosConfigurations = { - aptos = myLib.mkSystem { hostname = "aptos"; }; - carmel = myLib.mkSystem { hostname = "carmel"; }; - tahoe = myLib.mkSystem { hostname = "tahoe"; }; - }; - darwinConfigurations = { "mba-fcuny" = darwin.lib.darwinSystem { system = "aarch64-darwin"; modules = [ - home-manager.darwinModules.home-manager - ./hosts/mba + home-manager.darwinModules.home-manager + ./hosts/mba ]; }; }; - - homeConfigurations = { - useGlobalPkgs = true; - useUserPackages = true; - - "fcuny@aptos" = - myLib.mkHomeManagerConfiguration { hostname = "aptos"; }; - - "fcuny@tahoe" = - myLib.mkHomeManagerConfiguration { hostname = "tahoe"; }; - }; }; } |