flake.lock

@@ -183,11 +183,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1698853384,
+        "lastModified": 1698053470,
-        "narHash": "sha256-/FQ2WeCjdjdNo9eGTO7JruGAjO2Ccime8y1OU4/Aesk=",
+        "narHash": "sha256-sP8D/41UiwC2qn0X40oi+DfuVzNHMROqIWdSdCI/AYA=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "11d50c5d52472ed40d3cb109daad03c836d2b328",
+        "rev": "80d98a7d55c6e27954a166cb583a41325e9512d7",
         "type": "github"
       },
       "original": {

flake.nix

@@ -37,9 +37,6 @@
       astatine = {
         name = "astatine";
         group = "event";
-        modules = [
-          ./users/criese-nethinks
-        ];
       };
       backup-4 = { name = "backup-4"; };
       beryllium = {

hosts/astatine/configuration.nix

@@ -6,7 +6,6 @@
       ./hardware-configuration.nix
 
       ./isa.nix
-      ./users.nix
     ];
 
   boot.kernelParams = [ "console=ttyS0,115200n8" ];

hosts/astatine/users.nix

@@ -1,10 +0,0 @@
-{ ... }:
-
-{
-  users.users.criese-nethinks = {
-    extraGroups = [
-      "wheel"
-    ];
-  };
-
-}

hosts/web-2/configuration.nix

@@ -18,7 +18,6 @@
       ./meow.nix
       ./milchinsel.nix
       ./mitel-ommclient2.nix
-      ./nix-install.nix
       ./ping.nix
       ./public.nix
       ./radicale.nix

hosts/web-2/nix-install.nix

@@ -1,31 +0,0 @@
-{ pkgs, ... }:
-
-let
-  install_script = pkgs.writeTextDir "web/install" ''
-    #!/usr/bin/env bash
-    set -euo pipefail
-
-    which nix 2>1 > /dev/null || { echo "nix command not found. Install nix and try again"; exit 1; }
-
-    nix --extra-experimental-features "nix-command" \
-      --substituters "https://nix-cache.clerie.de" \
-      --trusted-public-keys "nix-cache.clerie.de:bAt1GJTS9BOTcXFWj3nURrSlcjqikCev9yDvqArMP5g=" \
-      copy --from "https://nix-cache.clerie.de" \
-      ${pkgs.nixfiles-auto-install}
-    ${pkgs.nixfiles-auto-install}/bin/nixfiles-auto-install
-  '';
-in {
-  services.nginx.virtualHosts = {
-    "install.nix.clerie.de" = {
-      enableACME = true;
-      forceSSL = true;
-      locations."/" = {
-        root = install_script + "/web/";
-        extraConfig = ''
-          index install;
-          types { } default_type "text/plain; charset=utf-8";
-        '';
-      };
-    };
-  };
-}

users/criese-nethinks/default.nix

@@ -1,10 +0,0 @@
-{ ... }:
-
-{
-  users.users.criese-nethinks = {
-    isNormalUser = true;
-    openssh.authorizedKeys.keys = [
-      (builtins.readFile ./ssh-criese.pub)
-    ];
-  };
-}

users/criese-nethinks/ssh-criese.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCXduKo8ZksOerEvN4y8SrMqz1G1B8Ibav7Jf1ELBNnQUEOBrRQFMDWgltPySEB0C4lq6rdkkIs6669PSmQp2KLW+aP1Ch/tvIv2mgWk7/XVbzUQgA8nDa2j9fHdiQ7dW7tE9ccgBsZlVX5VYHnq+P1Birkp6RJF+Wiizy6mvDEsHnSdI0INWX1+ffCjCwCRuxABxG3usqYZdSYIFQaFdw7wsz8sqXs8uEb57+y+ZTfZpZj7FnoN+sHZwBcCbCdhs50P/3Q3zsWeK66rXJC83mKCsVOGU0Ls9gslDNDBrAZhbBNOgUkbQmH8yuuAVUu807B7cR5jsK6NrfRwnnyBK1nAiKJNZU0Y8VPkhTsa1XYAxU91QGLtPbhnhBisCSMLD0Le/fOnU3I6dsKtg8sVwdL1jn/c6vU2t4lEi3Eczcc316OVH5+b+L7JuplDBQH8dN6PkxuYBEp9/zl77n7gIH/1MfhmDBZfkVHZX8NKM72QtSwgu4U/vgMsZ6fSDYM58E= criese