From c6a3bd10386907a14b0f03d4350792bf0e445c4e Mon Sep 17 00:00:00 2001 From: Felix Albrigtsen Date: Wed, 26 Jul 2023 09:06:51 +0200 Subject: [PATCH] Add worf --- flake.lock | 22 ++++++++++++++++++++++ flake.nix | 23 ++++++++++++++++++----- hosts/worf/configuration.nix | 13 +++++++++++++ 3 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 hosts/worf/configuration.nix diff --git a/flake.lock b/flake.lock index cb902fe..7bd8ff2 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,26 @@ { "nodes": { + "nix-darwin": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690247892, + "narHash": "sha256-WMGc1yq1cqRd+kzjWgbvHxckJIe8VQfiZ5RfR8tgABw=", + "owner": "lnl7", + "repo": "nix-darwin", + "rev": "efd35d99ce412335c478dff9da9a4256bbd39757", + "type": "github" + }, + "original": { + "owner": "lnl7", + "ref": "master", + "repo": "nix-darwin", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1687573514, @@ -34,6 +55,7 @@ }, "root": { "inputs": { + "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs", "sops-nix": "sops-nix", "unstable": "unstable" diff --git a/flake.nix b/flake.nix index de3aa77..5d3000d 100644 --- a/flake.nix +++ b/flake.nix @@ -4,14 +4,15 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05-small"; unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small"; + nix-darwin.url = "github:lnl7/nix-darwin/master"; + nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, unstable, sops-nix, ... }@inputs: + outputs = { self, nixpkgs, unstable, nix-darwin, sops-nix, ... }@inputs: let - system = "x86_64-linux"; overlay-unstable = final: prev: { unstable = unstable.legacyPackages.${prev.system}; }; @@ -19,7 +20,7 @@ { nixosConfigurations = { voyager = nixpkgs.lib.nixosSystem { - inherit system; + system = "x86_64-linux"; specialArgs = { inherit inputs; }; @@ -32,7 +33,7 @@ ]; }; chapel = nixpkgs.lib.nixosSystem { - inherit system; + system = "x86_64-linux"; specialArgs = { inherit inputs; }; @@ -42,7 +43,7 @@ ]; }; redshirt = nixpkgs.lib.nixosSystem { - inherit system; + system = "x86_64-linux"; specialArgs = { inherit inputs; }; @@ -54,6 +55,18 @@ }; }; + darwinConfigurations.worf = nix-darwin.lib.darwinSystem { + system = "aarch64-darwin"; + specialArgs = { + inherit inputs; + }; + modules = [ + ./hosts/worf/configuration.nix + # ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; }) + # sops-nix.nixosModules.sops + ]; + }; + devShells.x86_64-linux = { default = nixpkgs.legacyPackages.x86_64-linux.callPackage ./shell.nix { }; }; diff --git a/hosts/worf/configuration.nix b/hosts/worf/configuration.nix new file mode 100644 index 0000000..c7deff5 --- /dev/null +++ b/hosts/worf/configuration.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: +{ + # List packages installed in system profile. To search by name, run: + # $ nix-env -qaP | grep wget + environment.systemPackages = [ + pkgs.neovim + pkgs.iterm2 + ]; + + # Auto upgrade nix package and the daemon service. + services.nix-daemon.enable = true; + nix.package = pkgs.nix; +}