From dd370bdebb0078dab20590b2f1855c344272e343 Mon Sep 17 00:00:00 2001 From: sinavir Date: Fri, 12 Jan 2024 16:19:31 +0100 Subject: [PATCH] desktop: clean up --- .../_configuration.nix} | 0 .../hardware-configuration.nix | 0 .../shared-hackens/aarch64.nix | 0 .../shared-hackens/audio.nix | 0 .../shared-hackens/default.nix | 0 .../shared-hackens/dns/default.nix | 0 .../shared-hackens/dns/forwarding.txt | 0 .../shared-hackens/gnome.nix | 0 .../shared-hackens/i18n.nix | 0 .../shared-hackens/nightworker.nix | 0 .../shared-hackens/no-sleep.nix | 0 .../shared-hackens/programs.nix | 0 .../shared-hackens/system.nix | 0 .../shared-hackens/users.nix | 8 ++++---- .../shared-hackens/vim.nix | 0 machines/{org => hackens-org}/_bootloader.nix | 0 machines/{org => hackens-org}/_configuration.nix | 0 machines/{org => hackens-org}/_networking.nix | 0 machines/{org => hackens-org}/_ssh.nix | 0 machines/{org => hackens-org}/_users.nix | 0 machines/{org => hackens-org}/dokuwiki.nix | 0 .../{org => hackens-org}/hardware-configuration.nix | 0 machines/{org => hackens-org}/legacy-redir.nix | 0 machines/{org => hackens-org}/matterbridge.nix | 0 machines/{org => hackens-org}/nginx.nix | 0 machines/{org => hackens-org}/orga/authens.nix | 0 machines/{org => hackens-org}/orga/default.nix | 0 machines/{org => hackens-org}/orga/mkAssets.nix | 0 machines/{org => hackens-org}/orga/module.nix | 0 machines/{org => hackens-org}/orga/python-cas.nix | 0 machines/{org => hackens-org}/orga/python.nix | 0 machines/{org => hackens-org}/orga/shell.nix | 0 .../{org => hackens-org}/orga/static-assets.nix | 0 machines/{org => hackens-org}/programs.nix | 0 machines/{org => hackens-org}/secrets/default.nix | 0 machines/{org => hackens-org}/secrets/django.age | Bin .../secrets/matterbridge-env.age | 0 machines/{org => hackens-org}/secrets/secrets.nix | 0 machines/{org => hackens-org}/static-sites.nix | 0 machines/{org => hackens-org}/webpass.nix | 0 meta.nix | 4 ++-- 41 files changed, 6 insertions(+), 6 deletions(-) rename machines/{milieu/configuration.nix => hackens-milieu/_configuration.nix} (100%) rename machines/{milieu => hackens-milieu}/hardware-configuration.nix (100%) rename machines/{milieu => hackens-milieu}/shared-hackens/aarch64.nix (100%) rename machines/{milieu => hackens-milieu}/shared-hackens/audio.nix (100%) rename machines/{milieu => hackens-milieu}/shared-hackens/default.nix (100%) rename machines/{milieu => hackens-milieu}/shared-hackens/dns/default.nix (100%) rename machines/{milieu => hackens-milieu}/shared-hackens/dns/forwarding.txt (100%) rename machines/{milieu => hackens-milieu}/shared-hackens/gnome.nix (100%) rename machines/{milieu => hackens-milieu}/shared-hackens/i18n.nix (100%) rename machines/{milieu => hackens-milieu}/shared-hackens/nightworker.nix (100%) rename machines/{milieu => hackens-milieu}/shared-hackens/no-sleep.nix (100%) rename machines/{milieu => hackens-milieu}/shared-hackens/programs.nix (100%) rename machines/{milieu => hackens-milieu}/shared-hackens/system.nix (100%) rename machines/{milieu => hackens-milieu}/shared-hackens/users.nix (86%) rename machines/{milieu => hackens-milieu}/shared-hackens/vim.nix (100%) rename machines/{org => hackens-org}/_bootloader.nix (100%) rename machines/{org => hackens-org}/_configuration.nix (100%) rename machines/{org => hackens-org}/_networking.nix (100%) rename machines/{org => hackens-org}/_ssh.nix (100%) rename machines/{org => hackens-org}/_users.nix (100%) rename machines/{org => hackens-org}/dokuwiki.nix (100%) rename machines/{org => hackens-org}/hardware-configuration.nix (100%) rename machines/{org => hackens-org}/legacy-redir.nix (100%) rename machines/{org => hackens-org}/matterbridge.nix (100%) rename machines/{org => hackens-org}/nginx.nix (100%) rename machines/{org => hackens-org}/orga/authens.nix (100%) rename machines/{org => hackens-org}/orga/default.nix (100%) rename machines/{org => hackens-org}/orga/mkAssets.nix (100%) rename machines/{org => hackens-org}/orga/module.nix (100%) rename machines/{org => hackens-org}/orga/python-cas.nix (100%) rename machines/{org => hackens-org}/orga/python.nix (100%) rename machines/{org => hackens-org}/orga/shell.nix (100%) rename machines/{org => hackens-org}/orga/static-assets.nix (100%) rename machines/{org => hackens-org}/programs.nix (100%) rename machines/{org => hackens-org}/secrets/default.nix (100%) rename machines/{org => hackens-org}/secrets/django.age (100%) rename machines/{org => hackens-org}/secrets/matterbridge-env.age (100%) rename machines/{org => hackens-org}/secrets/secrets.nix (100%) rename machines/{org => hackens-org}/static-sites.nix (100%) rename machines/{org => hackens-org}/webpass.nix (100%) diff --git a/machines/milieu/configuration.nix b/machines/hackens-milieu/_configuration.nix similarity index 100% rename from machines/milieu/configuration.nix rename to machines/hackens-milieu/_configuration.nix diff --git a/machines/milieu/hardware-configuration.nix b/machines/hackens-milieu/hardware-configuration.nix similarity index 100% rename from machines/milieu/hardware-configuration.nix rename to machines/hackens-milieu/hardware-configuration.nix diff --git a/machines/milieu/shared-hackens/aarch64.nix b/machines/hackens-milieu/shared-hackens/aarch64.nix similarity index 100% rename from machines/milieu/shared-hackens/aarch64.nix rename to machines/hackens-milieu/shared-hackens/aarch64.nix diff --git a/machines/milieu/shared-hackens/audio.nix b/machines/hackens-milieu/shared-hackens/audio.nix similarity index 100% rename from machines/milieu/shared-hackens/audio.nix rename to machines/hackens-milieu/shared-hackens/audio.nix diff --git a/machines/milieu/shared-hackens/default.nix b/machines/hackens-milieu/shared-hackens/default.nix similarity index 100% rename from machines/milieu/shared-hackens/default.nix rename to machines/hackens-milieu/shared-hackens/default.nix diff --git a/machines/milieu/shared-hackens/dns/default.nix b/machines/hackens-milieu/shared-hackens/dns/default.nix similarity index 100% rename from machines/milieu/shared-hackens/dns/default.nix rename to machines/hackens-milieu/shared-hackens/dns/default.nix diff --git a/machines/milieu/shared-hackens/dns/forwarding.txt b/machines/hackens-milieu/shared-hackens/dns/forwarding.txt similarity index 100% rename from machines/milieu/shared-hackens/dns/forwarding.txt rename to machines/hackens-milieu/shared-hackens/dns/forwarding.txt diff --git a/machines/milieu/shared-hackens/gnome.nix b/machines/hackens-milieu/shared-hackens/gnome.nix similarity index 100% rename from machines/milieu/shared-hackens/gnome.nix rename to machines/hackens-milieu/shared-hackens/gnome.nix diff --git a/machines/milieu/shared-hackens/i18n.nix b/machines/hackens-milieu/shared-hackens/i18n.nix similarity index 100% rename from machines/milieu/shared-hackens/i18n.nix rename to machines/hackens-milieu/shared-hackens/i18n.nix diff --git a/machines/milieu/shared-hackens/nightworker.nix b/machines/hackens-milieu/shared-hackens/nightworker.nix similarity index 100% rename from machines/milieu/shared-hackens/nightworker.nix rename to machines/hackens-milieu/shared-hackens/nightworker.nix diff --git a/machines/milieu/shared-hackens/no-sleep.nix b/machines/hackens-milieu/shared-hackens/no-sleep.nix similarity index 100% rename from machines/milieu/shared-hackens/no-sleep.nix rename to machines/hackens-milieu/shared-hackens/no-sleep.nix diff --git a/machines/milieu/shared-hackens/programs.nix b/machines/hackens-milieu/shared-hackens/programs.nix similarity index 100% rename from machines/milieu/shared-hackens/programs.nix rename to machines/hackens-milieu/shared-hackens/programs.nix diff --git a/machines/milieu/shared-hackens/system.nix b/machines/hackens-milieu/shared-hackens/system.nix similarity index 100% rename from machines/milieu/shared-hackens/system.nix rename to machines/hackens-milieu/shared-hackens/system.nix diff --git a/machines/milieu/shared-hackens/users.nix b/machines/hackens-milieu/shared-hackens/users.nix similarity index 86% rename from machines/milieu/shared-hackens/users.nix rename to machines/hackens-milieu/shared-hackens/users.nix index 201c4c4..bc7f976 100644 --- a/machines/milieu/shared-hackens/users.nix +++ b/machines/hackens-milieu/shared-hackens/users.nix @@ -1,10 +1,10 @@ { pkgs, ... }: let superadmins = [ - ../../../../pubkeys/raito.keys - ../../../../pubkeys/gdd.keys - ../../../../pubkeys/BiBi.keys - ../../../../pubkeys/sinavir.keys + ../../../pubkeys/raito.keys + ../../../pubkeys/gdd.keys + ../../../pubkeys/BiBi.keys + ../../../pubkeys/sinavir.keys ]; in { diff --git a/machines/milieu/shared-hackens/vim.nix b/machines/hackens-milieu/shared-hackens/vim.nix similarity index 100% rename from machines/milieu/shared-hackens/vim.nix rename to machines/hackens-milieu/shared-hackens/vim.nix diff --git a/machines/org/_bootloader.nix b/machines/hackens-org/_bootloader.nix similarity index 100% rename from machines/org/_bootloader.nix rename to machines/hackens-org/_bootloader.nix diff --git a/machines/org/_configuration.nix b/machines/hackens-org/_configuration.nix similarity index 100% rename from machines/org/_configuration.nix rename to machines/hackens-org/_configuration.nix diff --git a/machines/org/_networking.nix b/machines/hackens-org/_networking.nix similarity index 100% rename from machines/org/_networking.nix rename to machines/hackens-org/_networking.nix diff --git a/machines/org/_ssh.nix b/machines/hackens-org/_ssh.nix similarity index 100% rename from machines/org/_ssh.nix rename to machines/hackens-org/_ssh.nix diff --git a/machines/org/_users.nix b/machines/hackens-org/_users.nix similarity index 100% rename from machines/org/_users.nix rename to machines/hackens-org/_users.nix diff --git a/machines/org/dokuwiki.nix b/machines/hackens-org/dokuwiki.nix similarity index 100% rename from machines/org/dokuwiki.nix rename to machines/hackens-org/dokuwiki.nix diff --git a/machines/org/hardware-configuration.nix b/machines/hackens-org/hardware-configuration.nix similarity index 100% rename from machines/org/hardware-configuration.nix rename to machines/hackens-org/hardware-configuration.nix diff --git a/machines/org/legacy-redir.nix b/machines/hackens-org/legacy-redir.nix similarity index 100% rename from machines/org/legacy-redir.nix rename to machines/hackens-org/legacy-redir.nix diff --git a/machines/org/matterbridge.nix b/machines/hackens-org/matterbridge.nix similarity index 100% rename from machines/org/matterbridge.nix rename to machines/hackens-org/matterbridge.nix diff --git a/machines/org/nginx.nix b/machines/hackens-org/nginx.nix similarity index 100% rename from machines/org/nginx.nix rename to machines/hackens-org/nginx.nix diff --git a/machines/org/orga/authens.nix b/machines/hackens-org/orga/authens.nix similarity index 100% rename from machines/org/orga/authens.nix rename to machines/hackens-org/orga/authens.nix diff --git a/machines/org/orga/default.nix b/machines/hackens-org/orga/default.nix similarity index 100% rename from machines/org/orga/default.nix rename to machines/hackens-org/orga/default.nix diff --git a/machines/org/orga/mkAssets.nix b/machines/hackens-org/orga/mkAssets.nix similarity index 100% rename from machines/org/orga/mkAssets.nix rename to machines/hackens-org/orga/mkAssets.nix diff --git a/machines/org/orga/module.nix b/machines/hackens-org/orga/module.nix similarity index 100% rename from machines/org/orga/module.nix rename to machines/hackens-org/orga/module.nix diff --git a/machines/org/orga/python-cas.nix b/machines/hackens-org/orga/python-cas.nix similarity index 100% rename from machines/org/orga/python-cas.nix rename to machines/hackens-org/orga/python-cas.nix diff --git a/machines/org/orga/python.nix b/machines/hackens-org/orga/python.nix similarity index 100% rename from machines/org/orga/python.nix rename to machines/hackens-org/orga/python.nix diff --git a/machines/org/orga/shell.nix b/machines/hackens-org/orga/shell.nix similarity index 100% rename from machines/org/orga/shell.nix rename to machines/hackens-org/orga/shell.nix diff --git a/machines/org/orga/static-assets.nix b/machines/hackens-org/orga/static-assets.nix similarity index 100% rename from machines/org/orga/static-assets.nix rename to machines/hackens-org/orga/static-assets.nix diff --git a/machines/org/programs.nix b/machines/hackens-org/programs.nix similarity index 100% rename from machines/org/programs.nix rename to machines/hackens-org/programs.nix diff --git a/machines/org/secrets/default.nix b/machines/hackens-org/secrets/default.nix similarity index 100% rename from machines/org/secrets/default.nix rename to machines/hackens-org/secrets/default.nix diff --git a/machines/org/secrets/django.age b/machines/hackens-org/secrets/django.age similarity index 100% rename from machines/org/secrets/django.age rename to machines/hackens-org/secrets/django.age diff --git a/machines/org/secrets/matterbridge-env.age b/machines/hackens-org/secrets/matterbridge-env.age similarity index 100% rename from machines/org/secrets/matterbridge-env.age rename to machines/hackens-org/secrets/matterbridge-env.age diff --git a/machines/org/secrets/secrets.nix b/machines/hackens-org/secrets/secrets.nix similarity index 100% rename from machines/org/secrets/secrets.nix rename to machines/hackens-org/secrets/secrets.nix diff --git a/machines/org/static-sites.nix b/machines/hackens-org/static-sites.nix similarity index 100% rename from machines/org/static-sites.nix rename to machines/hackens-org/static-sites.nix diff --git a/machines/org/webpass.nix b/machines/hackens-org/webpass.nix similarity index 100% rename from machines/org/webpass.nix rename to machines/hackens-org/webpass.nix diff --git a/meta.nix b/meta.nix index 786c52c..421d9e1 100644 --- a/meta.nix +++ b/meta.nix @@ -5,7 +5,7 @@ let metadata = { nodes = { - milieu = { + hackens-milieu = { deployment = { targetHost = null; #"milieu.cave.hackens.org"; # targetPort = 4243; @@ -13,7 +13,7 @@ let }; imports = [agenix]; }; - org = { + hackens-org = { deployment = { targetHost = "server1.hackens.org"; # todo make something with ens firewall targetPort = 2222;