diff options
author | Kjetil Orbekk <kj@orbekk.com> | 2023-12-09 13:49:23 -0500 |
---|---|---|
committer | Kjetil Orbekk <kj@orbekk.com> | 2023-12-09 13:58:57 -0500 |
commit | 0f7e06553348894ca6f2004d3dc57dd737c35e50 (patch) | |
tree | 26d3b953c3e4b9faed8933240a2c91843c727074 /machines | |
parent | 5b006b278e8ebbcd08a089c28e754c8618d67f50 (diff) |
update
Diffstat (limited to 'machines')
-rw-r--r-- | machines/container-shape.nix | 24 | ||||
-rw-r--r-- | machines/dragon.nix | 3 | ||||
-rw-r--r-- | machines/minideck.nix | 10 | ||||
-rw-r--r-- | machines/x1-pincer.nix | 10 |
4 files changed, 0 insertions, 47 deletions
diff --git a/machines/container-shape.nix b/machines/container-shape.nix deleted file mode 100644 index db9df2f..0000000 --- a/machines/container-shape.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ config, lib, pkgs, ... }: -{ - imports = [ - ../config/container.nix - ../config/common.nix - ../config/users.nix - # Services - ../config/hydra.nix - ../config/matrix.nix - ../config/cgit.nix - ../config/weechat.nix - ../config/web-server.nix - ../config/mail-server.nix - ../config/dns.nix - ../config/borg-backup.nix - ../config/systemhttpd.nix - ]; - - users.defaultUserShell = lib.mkForce pkgs.bash; - - networking = { - hostName = lib.mkForce "shape"; - }; -} diff --git a/machines/dragon.nix b/machines/dragon.nix index 409cf5f..9e5f195 100644 --- a/machines/dragon.nix +++ b/machines/dragon.nix @@ -4,8 +4,6 @@ let vpnPrefix = "2001:470:8e2e:1000"; in { imports = [ - # ../config/router.nix - # ../config/borg-backup.nix ../config/keycloak.nix ../config/dns.nix ../config/web-server.nix @@ -18,7 +16,6 @@ in { orbekk.nextcloud.enable = true; orbekk.backups.enableServer = true; orbekk.backups.enableClient = true; - orbekk.bridge.enable = false; orbekk.zomboid-server.enable = false; services.tlp.enable = true; diff --git a/machines/minideck.nix b/machines/minideck.nix index b4bb8f6..7a76936 100644 --- a/machines/minideck.nix +++ b/machines/minideck.nix @@ -11,16 +11,6 @@ with lib; services.xserver.enable = mkForce false; services.xserver.displayManager.lightdm.enable = mkForce false; - # For bridge development. - services.postgresql = { - enable = true; - ensureDatabases = [ "bridge_latest" ]; - ensureUsers = [{ - name = "orbekk"; - ensurePermissions."DATABASE bridge_latest" = "ALL PRIVILEGES"; - }]; - }; - # Fake pipewire socket activation. services.pipewire.socketActivation = false; systemd.user.services.pipewire-setup = { diff --git a/machines/x1-pincer.nix b/machines/x1-pincer.nix index 2a899bc..1b49268 100644 --- a/machines/x1-pincer.nix +++ b/machines/x1-pincer.nix @@ -21,16 +21,6 @@ let ports = { services.printing.drivers = with pkgs; [ gutenprint brlaser ]; services.openssh.enable = true; - # For bridge development. - services.postgresql = { - enable = true; - ensureDatabases = [ "bridge_latest" ]; - ensureUsers = [{ - name = "orbekk"; - ensurePermissions."DATABASE bridge_latest" = "ALL PRIVILEGES"; - }]; - }; - # Keycloak config # age.secrets."dragon-keycloak.age".file = ../secrets/dragon-keycloak.age; # services.postgresql.enable = true; |