diff --git a/provision/nixos/flake.lock b/provision/nixos/flake.lock index d2ef51e7..e1a259d8 100644 --- a/provision/nixos/flake.lock +++ b/provision/nixos/flake.lock @@ -21,6 +21,23 @@ "type": "github" } }, + "jovian-nixos": { + "flake": false, + "locked": { + "lastModified": 1692160665, + "narHash": "sha256-MKjvQuArGltIhZh6m23hSdogRr8DxwGqSwt0DlTlUbc=", + "ref": "development", + "rev": "97662e4872b88df79e60be0c27fc277b326fd6e9", + "revCount": 322, + "type": "git", + "url": "https://github.com/Jovian-Experiments/Jovian-NixOS" + }, + "original": { + "ref": "development", + "type": "git", + "url": "https://github.com/Jovian-Experiments/Jovian-NixOS" + } + }, "nixpkgs": { "locked": { "lastModified": 1688939073, @@ -56,6 +73,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "jovian-nixos": "jovian-nixos", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable" } diff --git a/provision/nixos/flake.nix b/provision/nixos/flake.nix index abaff02c..4ef66127 100644 --- a/provision/nixos/flake.nix +++ b/provision/nixos/flake.nix @@ -62,6 +62,23 @@ } ]; }; + + bulwark = lib.nixosSystem { + inherit system; + specialArgs = { inherit user; inherit pkgs-unstable; }; + modules = [ + ./hosts/bulwark/configuration.nix + ./hosts/bulwark/hardware.nix + home-manager.nixosModules.home-manager { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.extraSpecialArgs = { inherit user; }; + home-manager.users.${user} = { + imports = [ ./hosts/bulwark/home-configuration.nix ]; + }; + } + ]; + }; }; }; } diff --git a/provision/nixos/modules/services/default.nix b/provision/nixos/modules/services/default.nix index 61f723f0..d8b18134 100644 --- a/provision/nixos/modules/services/default.nix +++ b/provision/nixos/modules/services/default.nix @@ -1,4 +1,4 @@ { ... }: { - imports = [ ./samba-server.nix ./samba-client.nix ./jellyfin.nix ]; + imports = [ ./samba-server.nix ./samba-client.nix ./jellyfin.nix ./virt-manager.nix ]; }