From 2a6f52f7cf748eb54f71cd6d9a89f81194ff4623 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Tue, 14 Dec 2021 18:36:07 +0100 Subject: [PATCH] tree: move stuff around --- hosts/hackens-org/admins.nix | 17 ----------------- hosts/hackens-org/configuration.nix | 10 +++++----- hosts/hackens-org/physical.nix | 1 - hosts/hackens-org/pubkeys/rlahfa.keys | 4 ---- profiles/core-hackens/default.nix | 6 ++++++ profiles/core-hackens/personal-users.nix | 17 +++++++++++++++++ profiles/core-hackens/ssh-server.nix | 8 ++++++++ .../{hackens => shared-hackens}/aarch64.nix | 0 profiles/{hackens => shared-hackens}/audio.nix | 0 .../{hackens => shared-hackens}/backups.nix | 0 .../{hackens => shared-hackens}/default.nix | 0 profiles/{hackens => shared-hackens}/dns.nix | 0 .../dns/forwarding.txt | 0 .../{hackens => shared-hackens}/graphics.nix | 0 profiles/{hackens => shared-hackens}/hosts.nix | 0 profiles/{hackens => shared-hackens}/i18n.nix | 0 profiles/{hackens => shared-hackens}/i3.nix | 0 profiles/{hackens => shared-hackens}/kde.nix | 0 .../{hackens => shared-hackens}/monitoring.nix | 0 .../netboot-server.nix | 0 .../{hackens => shared-hackens}/nightworker.nix | 0 .../{hackens => shared-hackens}/programs.nix | 0 profiles/{hackens => shared-hackens}/ssd.nix | 0 .../{hackens => shared-hackens}/syncthing.nix | 0 profiles/{hackens => shared-hackens}/system.nix | 0 profiles/{hackens => shared-hackens}/users.nix | 4 ++-- profiles/{hackens => shared-hackens}/vim.nix | 0 .../vpn-network/default.nix | 0 .../vpn-network/wg-peers.nix | 0 .../pubkeys => pubkeys}/beigbeder.keys | 0 {profiles/hackens/pubkeys => pubkeys}/gdd.keys | 0 .../hackens/pubkeys => pubkeys}/raito.keys | 0 32 files changed, 38 insertions(+), 29 deletions(-) delete mode 100644 hosts/hackens-org/admins.nix delete mode 100644 hosts/hackens-org/pubkeys/rlahfa.keys create mode 100644 profiles/core-hackens/default.nix create mode 100644 profiles/core-hackens/personal-users.nix create mode 100644 profiles/core-hackens/ssh-server.nix rename profiles/{hackens => shared-hackens}/aarch64.nix (100%) rename profiles/{hackens => shared-hackens}/audio.nix (100%) rename profiles/{hackens => shared-hackens}/backups.nix (100%) rename profiles/{hackens => shared-hackens}/default.nix (100%) rename profiles/{hackens => shared-hackens}/dns.nix (100%) rename profiles/{hackens => shared-hackens}/dns/forwarding.txt (100%) rename profiles/{hackens => shared-hackens}/graphics.nix (100%) rename profiles/{hackens => shared-hackens}/hosts.nix (100%) rename profiles/{hackens => shared-hackens}/i18n.nix (100%) rename profiles/{hackens => shared-hackens}/i3.nix (100%) rename profiles/{hackens => shared-hackens}/kde.nix (100%) rename profiles/{hackens => shared-hackens}/monitoring.nix (100%) rename profiles/{hackens => shared-hackens}/netboot-server.nix (100%) rename profiles/{hackens => shared-hackens}/nightworker.nix (100%) rename profiles/{hackens => shared-hackens}/programs.nix (100%) rename profiles/{hackens => shared-hackens}/ssd.nix (100%) rename profiles/{hackens => shared-hackens}/syncthing.nix (100%) rename profiles/{hackens => shared-hackens}/system.nix (100%) rename profiles/{hackens => shared-hackens}/users.nix (93%) rename profiles/{hackens => shared-hackens}/vim.nix (100%) rename profiles/{hackens => shared-hackens}/vpn-network/default.nix (100%) rename profiles/{hackens => shared-hackens}/vpn-network/wg-peers.nix (100%) rename {hosts/hackens-org/pubkeys => pubkeys}/beigbeder.keys (100%) rename {profiles/hackens/pubkeys => pubkeys}/gdd.keys (100%) rename {profiles/hackens/pubkeys => pubkeys}/raito.keys (100%) diff --git a/hosts/hackens-org/admins.nix b/hosts/hackens-org/admins.nix deleted file mode 100644 index 4a87f4d..0000000 --- a/hosts/hackens-org/admins.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, ... }: -{ - users.users.rlahfa = { - isNormalUser = true; - extraGroups = [ "wheel" ]; - hashedPassword = "$6$y/I6nKCMYUku7$91vTR5kYz4nHyhbuA/j6kPsD8Vfo/Rg7ri6Ympftra9V6emOt/mPg0AScECtYjSIxretvfQ3sPUF1Ho0IWx381"; - openssh.authorizedKeys.keyFiles = [ ./pubkeys/rlahfa.keys ]; - }; - - users.users.root.openssh.authorizedKeys.keyFiles = [ ./pubkeys/beigbeder.keys ]; # Jacques Beigbeder est tjrs root. - - # Enable the OpenSSH daemon. - services.openssh.enable = true; - - # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 22 ]; -} diff --git a/hosts/hackens-org/configuration.nix b/hosts/hackens-org/configuration.nix index 2b491d0..fbdbb13 100644 --- a/hosts/hackens-org/configuration.nix +++ b/hosts/hackens-org/configuration.nix @@ -9,12 +9,12 @@ [ ./hardware-configuration.nix ./physical.nix - ./admins.nix - ./wiki.nix + ../../profiles/core-hackens + # ./wiki.nix ./bridge.nix - ./webpass.nix - ./gha.nix - ./sync.nix + # ./webpass.nix + # ./gha.nix + # ./sync.nix ./misc ]; diff --git a/hosts/hackens-org/physical.nix b/hosts/hackens-org/physical.nix index 5067644..f1174aa 100644 --- a/hosts/hackens-org/physical.nix +++ b/hosts/hackens-org/physical.nix @@ -12,5 +12,4 @@ ipv4.addresses = [ { address = "129.199.129.76"; prefixLength = 24; } ]; }; networking.defaultGateway = { address = "129.199.129.1"; interface = "eth0"; }; - } diff --git a/hosts/hackens-org/pubkeys/rlahfa.keys b/hosts/hackens-org/pubkeys/rlahfa.keys deleted file mode 100644 index 0f48a59..0000000 --- a/hosts/hackens-org/pubkeys/rlahfa.keys +++ /dev/null @@ -1,4 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcEkYM1r8QVNM/G5CxJInEdoBCWjEHHDdHlzDYNSUIdHHsn04QY+XI67AdMCm8w30GZnLUIj5RiJEWXREUApby0GrfxGGcy8otforygfgtmuUKAUEHdU2MMwrQI7RtTZ8oQ0USRGuqvmegxz3l5caVU7qGvBllJ4NUHXrkZSja2/51vq80RF4MKkDGiz7xUTixI2UcBwQBCA/kQedKV9G28EH+1XfvePqmMivZjl+7VyHsgUVj9eRGA1XWFw59UPZG8a7VkxO/Eb3K9NF297HUAcFMcbY6cPFi9AaBgu3VC4eetDnoN/+xT1owiHi7BReQhGAy/6cdf7C/my5ehZwD -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKIIcqryU28FkV+UpiTnGCOfwKO5jFhkdvU7a7Ew2KoZ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMLf6B8VV//BhOWihYK8Zy1CJ3sg4w2bP0aBO0VPs4hS -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE0xMwWedkKosax9+7D2OlnMxFL/eV4CvFZLsbLptpXr diff --git a/profiles/core-hackens/default.nix b/profiles/core-hackens/default.nix new file mode 100644 index 0000000..2226a3a --- /dev/null +++ b/profiles/core-hackens/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./personal-users.nix + ./ssh-server.nix + ]; +} diff --git a/profiles/core-hackens/personal-users.nix b/profiles/core-hackens/personal-users.nix new file mode 100644 index 0000000..9de92f7 --- /dev/null +++ b/profiles/core-hackens/personal-users.nix @@ -0,0 +1,17 @@ +{}: +{ + users.users = { + rlahfa = { + isNormalUser = true; + extraGroups = [ "wheel" ]; + hashedPassword = "$6$y/I6nKCMYUku7$91vTR5kYz4nHyhbuA/j6kPsD8Vfo/Rg7ri6Ympftra9V6emOt/mPg0AScECtYjSIxretvfQ3sPUF1Ho0IWx381"; + openssh.authorizedKeys.keyFiles = [ ../../pubkeys/rlahfa.keys ]; + }; + gdoriathdohler = { + isNormalUser = true; + extraGroups = [ "wheel" ]; + openssh.authorizedKeys.keyFiles = [ ../../pubkeys/gdd.keys ]; + }; + root.openssh.authorizedKeys.keyFiles = [ ../../pubkeys/beigbeder.keys ]; # Jacques Beigbeder est tjrs root. + }; +} diff --git a/profiles/core-hackens/ssh-server.nix b/profiles/core-hackens/ssh-server.nix new file mode 100644 index 0000000..4579bd0 --- /dev/null +++ b/profiles/core-hackens/ssh-server.nix @@ -0,0 +1,8 @@ +{ }: +{ + # Enable the OpenSSH daemon. + services.openssh.enable = true; + + # Open ports in the firewall. + networking.firewall.allowedTCPPorts = [ 22 ]; +} diff --git a/profiles/hackens/aarch64.nix b/profiles/shared-hackens/aarch64.nix similarity index 100% rename from profiles/hackens/aarch64.nix rename to profiles/shared-hackens/aarch64.nix diff --git a/profiles/hackens/audio.nix b/profiles/shared-hackens/audio.nix similarity index 100% rename from profiles/hackens/audio.nix rename to profiles/shared-hackens/audio.nix diff --git a/profiles/hackens/backups.nix b/profiles/shared-hackens/backups.nix similarity index 100% rename from profiles/hackens/backups.nix rename to profiles/shared-hackens/backups.nix diff --git a/profiles/hackens/default.nix b/profiles/shared-hackens/default.nix similarity index 100% rename from profiles/hackens/default.nix rename to profiles/shared-hackens/default.nix diff --git a/profiles/hackens/dns.nix b/profiles/shared-hackens/dns.nix similarity index 100% rename from profiles/hackens/dns.nix rename to profiles/shared-hackens/dns.nix diff --git a/profiles/hackens/dns/forwarding.txt b/profiles/shared-hackens/dns/forwarding.txt similarity index 100% rename from profiles/hackens/dns/forwarding.txt rename to profiles/shared-hackens/dns/forwarding.txt diff --git a/profiles/hackens/graphics.nix b/profiles/shared-hackens/graphics.nix similarity index 100% rename from profiles/hackens/graphics.nix rename to profiles/shared-hackens/graphics.nix diff --git a/profiles/hackens/hosts.nix b/profiles/shared-hackens/hosts.nix similarity index 100% rename from profiles/hackens/hosts.nix rename to profiles/shared-hackens/hosts.nix diff --git a/profiles/hackens/i18n.nix b/profiles/shared-hackens/i18n.nix similarity index 100% rename from profiles/hackens/i18n.nix rename to profiles/shared-hackens/i18n.nix diff --git a/profiles/hackens/i3.nix b/profiles/shared-hackens/i3.nix similarity index 100% rename from profiles/hackens/i3.nix rename to profiles/shared-hackens/i3.nix diff --git a/profiles/hackens/kde.nix b/profiles/shared-hackens/kde.nix similarity index 100% rename from profiles/hackens/kde.nix rename to profiles/shared-hackens/kde.nix diff --git a/profiles/hackens/monitoring.nix b/profiles/shared-hackens/monitoring.nix similarity index 100% rename from profiles/hackens/monitoring.nix rename to profiles/shared-hackens/monitoring.nix diff --git a/profiles/hackens/netboot-server.nix b/profiles/shared-hackens/netboot-server.nix similarity index 100% rename from profiles/hackens/netboot-server.nix rename to profiles/shared-hackens/netboot-server.nix diff --git a/profiles/hackens/nightworker.nix b/profiles/shared-hackens/nightworker.nix similarity index 100% rename from profiles/hackens/nightworker.nix rename to profiles/shared-hackens/nightworker.nix diff --git a/profiles/hackens/programs.nix b/profiles/shared-hackens/programs.nix similarity index 100% rename from profiles/hackens/programs.nix rename to profiles/shared-hackens/programs.nix diff --git a/profiles/hackens/ssd.nix b/profiles/shared-hackens/ssd.nix similarity index 100% rename from profiles/hackens/ssd.nix rename to profiles/shared-hackens/ssd.nix diff --git a/profiles/hackens/syncthing.nix b/profiles/shared-hackens/syncthing.nix similarity index 100% rename from profiles/hackens/syncthing.nix rename to profiles/shared-hackens/syncthing.nix diff --git a/profiles/hackens/system.nix b/profiles/shared-hackens/system.nix similarity index 100% rename from profiles/hackens/system.nix rename to profiles/shared-hackens/system.nix diff --git a/profiles/hackens/users.nix b/profiles/shared-hackens/users.nix similarity index 93% rename from profiles/hackens/users.nix rename to profiles/shared-hackens/users.nix index de4f44b..6b61724 100644 --- a/profiles/hackens/users.nix +++ b/profiles/shared-hackens/users.nix @@ -8,8 +8,8 @@ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDcKULx/AgnqBsgwRX2BfV8waq6JXIkvZHhu9Y8paofM8awq6Om56BZoA7AV45YOcJxO/eFDOxSegXXmt22s4WjIf8I049aMdsW54BNpFpC/h18cMzm5ylKVGHl1ier/WXxpBsA8YU++YdRlGHPpKnhCtYLnBzD4Q5h+05GMIHismNZP1aGpE9s01FuP8eaDDkZUba7oSpn03AA77DBw4/2ZreSbqo96Z6WwiG09KeZvxFtEIk98EQtmiExB2fwsK3/JIxIBCoZHh4SzERcslxxGgzdppd6NhhSh7g523zhiihLaTAPNXBovGm5wcKOU9uWe+pUWEbwV04E+809aVbkJOdYBCtIf8M91meqpupA8jK38uquePHEFvpNr5UmY0qUlJCoqTvoqg9XgrfJVjlPEmYknj/QjQzkA4k19y8njsyEjnYOBL6tsztg6Igl+NZXjBAPuAzxCsfHOtWw1WM5gANwqOL0V9f7+14yST3HwweqjHRj4xky6ritxK+ujfc= hackens@hackens-desktop" ]; openssh.authorizedKeys.keyFiles = [ - ./pubkeys/raito.keys - ./pubkeys/gdd.keys + ../../pubkeys/raito.keys + ../../pubkeys/gdd.keys ]; }; diff --git a/profiles/hackens/vim.nix b/profiles/shared-hackens/vim.nix similarity index 100% rename from profiles/hackens/vim.nix rename to profiles/shared-hackens/vim.nix diff --git a/profiles/hackens/vpn-network/default.nix b/profiles/shared-hackens/vpn-network/default.nix similarity index 100% rename from profiles/hackens/vpn-network/default.nix rename to profiles/shared-hackens/vpn-network/default.nix diff --git a/profiles/hackens/vpn-network/wg-peers.nix b/profiles/shared-hackens/vpn-network/wg-peers.nix similarity index 100% rename from profiles/hackens/vpn-network/wg-peers.nix rename to profiles/shared-hackens/vpn-network/wg-peers.nix diff --git a/hosts/hackens-org/pubkeys/beigbeder.keys b/pubkeys/beigbeder.keys similarity index 100% rename from hosts/hackens-org/pubkeys/beigbeder.keys rename to pubkeys/beigbeder.keys diff --git a/profiles/hackens/pubkeys/gdd.keys b/pubkeys/gdd.keys similarity index 100% rename from profiles/hackens/pubkeys/gdd.keys rename to pubkeys/gdd.keys diff --git a/profiles/hackens/pubkeys/raito.keys b/pubkeys/raito.keys similarity index 100% rename from profiles/hackens/pubkeys/raito.keys rename to pubkeys/raito.keys