diff --git a/flake.nix b/flake.nix index a0dad3b..228f921 100644 --- a/flake.nix +++ b/flake.nix @@ -85,22 +85,6 @@ ''; 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 devShell.${system} = pkgs.mkShell { @@ -154,6 +138,7 @@ nixpkgs-fmt.defaultPackage."x86_64-linux" ]; imports = [ + ./nixos/configs/${name}/configuration.nix cluster-module.nixosModules.tinc (sopsModule name) home-manager.nixosModules.home-manager @@ -164,8 +149,8 @@ sterni = { name, nodes, pkgs, ... }: { deployment.targetHost = "${name}.private"; + deployment.tags = [ "desktop" ]; imports = [ - ./nixos/configs/${name}/configuration.nix grocy-scanner.nixosModule ]; home-manager.users.mainUser = { @@ -178,12 +163,18 @@ pepe = { name, nodes, pkgs, ... }: { deployment.targetHost = "${name}.private"; + deployment.tags = [ "server" ]; imports = [ - ./nixos/configs/${name}/configuration.nix grocy-scanner.nixosModule ]; }; + robi = { name, nodes, pkgs, ... }: { + deployment.targetHost = "${name}"; + deployment.tags = [ "server" ]; + imports = [ ]; + }; + }; }; } diff --git a/nixos/configs/robi/nextcloud.nix b/nixos/configs/robi/nextcloud.nix index c2847d7..5053d55 100644 --- a/nixos/configs/robi/nextcloud.nix +++ b/nixos/configs/robi/nextcloud.nix @@ -240,7 +240,7 @@ in # nextcloud setup services.nextcloud = { enable = true; - package = pkgs.nextcloud23; + package = pkgs.nextcloud24; autoUpdateApps.enable = true; #nginx.enable = true; hostName = "nextcloud.ingolf-wagner.de";