desktop: clean up

2024-01-12 16:19:31 +01:00 · 2024-01-12 16:19:31 +01:00 · dd370bdebb
commit dd370bdebb
parent 9acf72a648
41 changed files with 6 additions and 6 deletions
--- a/machines/hackens-milieu/_configuration.nix
+++ b/machines/hackens-milieu/_configuration.nix
--- a/machines/hackens-milieu/hardware-configuration.nix
+++ b/machines/hackens-milieu/hardware-configuration.nix
--- a/machines/hackens-milieu/shared-hackens/aarch64.nix
+++ b/machines/hackens-milieu/shared-hackens/aarch64.nix
--- a/machines/hackens-milieu/shared-hackens/audio.nix
+++ b/machines/hackens-milieu/shared-hackens/audio.nix
--- a/machines/hackens-milieu/shared-hackens/default.nix
+++ b/machines/hackens-milieu/shared-hackens/default.nix
--- a/machines/hackens-milieu/shared-hackens/dns/default.nix
+++ b/machines/hackens-milieu/shared-hackens/dns/default.nix
--- a/machines/hackens-milieu/shared-hackens/dns/forwarding.txt
+++ b/machines/hackens-milieu/shared-hackens/dns/forwarding.txt
--- a/machines/hackens-milieu/shared-hackens/gnome.nix
+++ b/machines/hackens-milieu/shared-hackens/gnome.nix
--- a/machines/hackens-milieu/shared-hackens/i18n.nix
+++ b/machines/hackens-milieu/shared-hackens/i18n.nix
--- a/machines/hackens-milieu/shared-hackens/nightworker.nix
+++ b/machines/hackens-milieu/shared-hackens/nightworker.nix
--- a/machines/hackens-milieu/shared-hackens/no-sleep.nix
+++ b/machines/hackens-milieu/shared-hackens/no-sleep.nix
--- a/machines/hackens-milieu/shared-hackens/programs.nix
+++ b/machines/hackens-milieu/shared-hackens/programs.nix
--- a/machines/hackens-milieu/shared-hackens/system.nix
+++ b/machines/hackens-milieu/shared-hackens/system.nix
--- a/machines/hackens-milieu/shared-hackens/users.nix
+++ b/machines/hackens-milieu/shared-hackens/users.nix
@ -1,10 +1,10 @@
 { pkgs, ... }:
 let
  superadmins = [
-    ../../../../pubkeys/raito.keys
+    ../../../pubkeys/raito.keys
-    ../../../../pubkeys/gdd.keys
+    ../../../pubkeys/gdd.keys
-    ../../../../pubkeys/BiBi.keys
+    ../../../pubkeys/BiBi.keys
-    ../../../../pubkeys/sinavir.keys
+    ../../../pubkeys/sinavir.keys
  ];
 in
 {
--- a/machines/hackens-milieu/shared-hackens/vim.nix
+++ b/machines/hackens-milieu/shared-hackens/vim.nix
--- a/machines/hackens-org/_bootloader.nix
+++ b/machines/hackens-org/_bootloader.nix
--- a/machines/hackens-org/_configuration.nix
+++ b/machines/hackens-org/_configuration.nix
--- a/machines/hackens-org/_networking.nix
+++ b/machines/hackens-org/_networking.nix
--- a/machines/hackens-org/_ssh.nix
+++ b/machines/hackens-org/_ssh.nix
--- a/machines/hackens-org/_users.nix
+++ b/machines/hackens-org/_users.nix
--- a/machines/hackens-org/dokuwiki.nix
+++ b/machines/hackens-org/dokuwiki.nix
--- a/machines/hackens-org/hardware-configuration.nix
+++ b/machines/hackens-org/hardware-configuration.nix
--- a/machines/hackens-org/legacy-redir.nix
+++ b/machines/hackens-org/legacy-redir.nix
--- a/machines/hackens-org/matterbridge.nix
+++ b/machines/hackens-org/matterbridge.nix
--- a/machines/hackens-org/nginx.nix
+++ b/machines/hackens-org/nginx.nix
--- a/machines/hackens-org/orga/authens.nix
+++ b/machines/hackens-org/orga/authens.nix
--- a/machines/hackens-org/orga/default.nix
+++ b/machines/hackens-org/orga/default.nix
--- a/machines/hackens-org/orga/mkAssets.nix
+++ b/machines/hackens-org/orga/mkAssets.nix
--- a/machines/hackens-org/orga/module.nix
+++ b/machines/hackens-org/orga/module.nix
--- a/machines/hackens-org/orga/python-cas.nix
+++ b/machines/hackens-org/orga/python-cas.nix
--- a/machines/hackens-org/orga/python.nix
+++ b/machines/hackens-org/orga/python.nix
--- a/machines/hackens-org/orga/shell.nix
+++ b/machines/hackens-org/orga/shell.nix
--- a/machines/hackens-org/orga/static-assets.nix
+++ b/machines/hackens-org/orga/static-assets.nix
--- a/machines/hackens-org/programs.nix
+++ b/machines/hackens-org/programs.nix
--- a/machines/hackens-org/secrets/default.nix
+++ b/machines/hackens-org/secrets/default.nix
--- a/machines/hackens-org/secrets/django.age
+++ b/machines/hackens-org/secrets/django.age
--- a/machines/hackens-org/secrets/matterbridge-env.age
+++ b/machines/hackens-org/secrets/matterbridge-env.age
--- a/machines/hackens-org/secrets/secrets.nix
+++ b/machines/hackens-org/secrets/secrets.nix
--- a/machines/hackens-org/static-sites.nix
+++ b/machines/hackens-org/static-sites.nix
--- a/machines/hackens-org/webpass.nix
+++ b/machines/hackens-org/webpass.nix
--- 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;