update robi
This commit is contained in:
parent
fff0b232ab
commit
8eb4a46c46
2 changed files with 10 additions and 19 deletions
27
flake.nix
27
flake.nix
|
@ -85,22 +85,6 @@
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# deployment
|
|
||||||
apps.${system} = {
|
|
||||||
# nix run ".#deploy.sterni"
|
|
||||||
deploy = pkgs.callPackage ./nixos/krops.nix {
|
|
||||||
inherit writeCommand secrets;
|
|
||||||
lib = krops.lib;
|
|
||||||
};
|
|
||||||
|
|
||||||
# nix run ".#test.sterni"
|
|
||||||
test = pkgs.callPackage ./nixos/krops.nix {
|
|
||||||
inherit writeCommand secrets;
|
|
||||||
lib = krops.lib;
|
|
||||||
nixosRebuildCommand = "test";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# colmena
|
# colmena
|
||||||
devShell.${system} =
|
devShell.${system} =
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
|
@ -154,6 +138,7 @@
|
||||||
nixpkgs-fmt.defaultPackage."x86_64-linux"
|
nixpkgs-fmt.defaultPackage."x86_64-linux"
|
||||||
];
|
];
|
||||||
imports = [
|
imports = [
|
||||||
|
./nixos/configs/${name}/configuration.nix
|
||||||
cluster-module.nixosModules.tinc
|
cluster-module.nixosModules.tinc
|
||||||
(sopsModule name)
|
(sopsModule name)
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
|
@ -164,8 +149,8 @@
|
||||||
|
|
||||||
sterni = { name, nodes, pkgs, ... }: {
|
sterni = { name, nodes, pkgs, ... }: {
|
||||||
deployment.targetHost = "${name}.private";
|
deployment.targetHost = "${name}.private";
|
||||||
|
deployment.tags = [ "desktop" ];
|
||||||
imports = [
|
imports = [
|
||||||
./nixos/configs/${name}/configuration.nix
|
|
||||||
grocy-scanner.nixosModule
|
grocy-scanner.nixosModule
|
||||||
];
|
];
|
||||||
home-manager.users.mainUser = {
|
home-manager.users.mainUser = {
|
||||||
|
@ -178,12 +163,18 @@
|
||||||
|
|
||||||
pepe = { name, nodes, pkgs, ... }: {
|
pepe = { name, nodes, pkgs, ... }: {
|
||||||
deployment.targetHost = "${name}.private";
|
deployment.targetHost = "${name}.private";
|
||||||
|
deployment.tags = [ "server" ];
|
||||||
imports = [
|
imports = [
|
||||||
./nixos/configs/${name}/configuration.nix
|
|
||||||
grocy-scanner.nixosModule
|
grocy-scanner.nixosModule
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
robi = { name, nodes, pkgs, ... }: {
|
||||||
|
deployment.targetHost = "${name}";
|
||||||
|
deployment.tags = [ "server" ];
|
||||||
|
imports = [ ];
|
||||||
|
};
|
||||||
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -240,7 +240,7 @@ in
|
||||||
# nextcloud setup
|
# nextcloud setup
|
||||||
services.nextcloud = {
|
services.nextcloud = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.nextcloud23;
|
package = pkgs.nextcloud24;
|
||||||
autoUpdateApps.enable = true;
|
autoUpdateApps.enable = true;
|
||||||
#nginx.enable = true;
|
#nginx.enable = true;
|
||||||
hostName = "nextcloud.ingolf-wagner.de";
|
hostName = "nextcloud.ingolf-wagner.de";
|
||||||
|
|
Loading…
Reference in a new issue