From 9e2f1f4583b8fdc43ba7762fdb4924e3f844f180 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 30 Oct 2023 11:56:17 +0200 Subject: refactor(users/flokli): move common stuff to `archeology` profile Change-Id: I8470c0a2416c0c397e009affb44f8c7a852cd526 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9837 Reviewed-by: flokli Tested-by: BuildkiteCI Autosubmit: flokli --- .../flokli/nixos/archeology-ec2/configuration.nix | 15 +-------------- users/flokli/nixos/archeology/configuration.nix | 16 +--------------- users/flokli/nixos/profiles/archeology.nix | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 29 deletions(-) create mode 100644 users/flokli/nixos/profiles/archeology.nix (limited to 'users/flokli') diff --git a/users/flokli/nixos/archeology-ec2/configuration.nix b/users/flokli/nixos/archeology-ec2/configuration.nix index 2864952e63a4..8e8b2884fb36 100644 --- a/users/flokli/nixos/archeology-ec2/configuration.nix +++ b/users/flokli/nixos/archeology-ec2/configuration.nix @@ -3,24 +3,11 @@ { imports = [ "${modulesPath}/virtualisation/amazon-image.nix" + ../profiles/archeology.nix ]; - # Use the TVL binary cache - tvl.cache.enable = true; - networking.hostName = "archeology-ec2"; - services.clickhouse.enable = true; - - services.openssh.enable = true; - - users.users.root.openssh.authorizedKeys.keys = [ - "cert-authority ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCvb/7ojfcbKvHIyjnrNUOOgzy44tCkgXY9HLuyFta1jQOE9pFIK19B4dR9bOglPKf145CCL0mSFJNNqmNwwavU2uRn+TQrW+U1dQAk8Gt+gh3O49YE854hwwyMU+xD6bIuUdfxPr+r5al/Ov5Km28ZMlHOs3FoAP0hInK+eAibioxL5rVJOtgicrOVCkGoXEgnuG+LRbOYTwzdClhRUxiPjK8alCbcJQ53AeZHO4G6w9wTr+W5ILCfvW4OmUXCX01sKzaBiQuuFCF6M/H4LlnsPWLMra2twXxkOIhZblwC+lncps9lQaUgiD4koZeOCORvHW00G0L39ilFbbnVcL6Itp/m8RRWm/xRxS4RMnsdV/AhvpRLrhL3lfQ7E2oCeSM36v1S9rdg6a47zcnpL+ahG76Gz39Y7KmVRQciNx7ezbwxj3Q5lZtFykgdfGIAN+bT8ijXMO6m68g60i9Bz4IoMZGkiJGqMYLTxMQ+oRgR3Ro5lbj7E11YBHyeimoBYXYGHMkiuxopQZ7lIj3plxIzhmUlXJBA4jMw9KGHdYaLhaicIYhvQmCTAjrkt2HvxEe6lU8iws2Qv+pB6tAGundN36RVVWAckeQPZ4ZsgDP8V2FfibZ1nsrQ+zBKqaslYMAHs01Cf0Hm0PnCqagf230xaobu0iooNuXx44QKoDnB+w== edef" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTVTXOutUZZjXLB0lUSgeKcSY/8mxKkC0ingGK1whD2 flokli" - ]; - system.stateVersion = "23.05"; # Did you read the comment? - - environment.systemPackages = [ pkgs.helix pkgs.kakoune pkgs.tmux ]; } diff --git a/users/flokli/nixos/archeology/configuration.nix b/users/flokli/nixos/archeology/configuration.nix index 57875de86340..59438b0a72ad 100644 --- a/users/flokli/nixos/archeology/configuration.nix +++ b/users/flokli/nixos/archeology/configuration.nix @@ -2,32 +2,18 @@ { imports = [ - # Include the results of the hardware scan. ./hardware-configuration.nix + ../profiles/archeology.nix ]; - # Use the TVL binary cache - tvl.cache.enable = true; - # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/vda"; boot.kernelParams = [ "console=ttyS0" ]; - services.clickhouse.enable = true; - networking.hostName = "archeology"; - services.openssh.enable = true; - - users.users.root.openssh.authorizedKeys.keys = [ - "cert-authority ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCvb/7ojfcbKvHIyjnrNUOOgzy44tCkgXY9HLuyFta1jQOE9pFIK19B4dR9bOglPKf145CCL0mSFJNNqmNwwavU2uRn+TQrW+U1dQAk8Gt+gh3O49YE854hwwyMU+xD6bIuUdfxPr+r5al/Ov5Km28ZMlHOs3FoAP0hInK+eAibioxL5rVJOtgicrOVCkGoXEgnuG+LRbOYTwzdClhRUxiPjK8alCbcJQ53AeZHO4G6w9wTr+W5ILCfvW4OmUXCX01sKzaBiQuuFCF6M/H4LlnsPWLMra2twXxkOIhZblwC+lncps9lQaUgiD4koZeOCORvHW00G0L39ilFbbnVcL6Itp/m8RRWm/xRxS4RMnsdV/AhvpRLrhL3lfQ7E2oCeSM36v1S9rdg6a47zcnpL+ahG76Gz39Y7KmVRQciNx7ezbwxj3Q5lZtFykgdfGIAN+bT8ijXMO6m68g60i9Bz4IoMZGkiJGqMYLTxMQ+oRgR3Ro5lbj7E11YBHyeimoBYXYGHMkiuxopQZ7lIj3plxIzhmUlXJBA4jMw9KGHdYaLhaicIYhvQmCTAjrkt2HvxEe6lU8iws2Qv+pB6tAGundN36RVVWAckeQPZ4ZsgDP8V2FfibZ1nsrQ+zBKqaslYMAHs01Cf0Hm0PnCqagf230xaobu0iooNuXx44QKoDnB+w== edef" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTVTXOutUZZjXLB0lUSgeKcSY/8mxKkC0ingGK1whD2 flokli" - ]; - system.stateVersion = "23.05"; # Did you read the comment? - - environment.systemPackages = [ pkgs.helix pkgs.kakoune pkgs.tmux ]; } diff --git a/users/flokli/nixos/profiles/archeology.nix b/users/flokli/nixos/profiles/archeology.nix new file mode 100644 index 000000000000..e5dcefa359db --- /dev/null +++ b/users/flokli/nixos/profiles/archeology.nix @@ -0,0 +1,22 @@ +# Set of unconditional config options applicable to all archeology machines. + +{ depot, pkgs, ... }: + +{ + # Use the TVL binary cache + tvl.cache.enable = true; + + # Start clickhose as a system service. + services.clickhouse.enable = true; + + # Enable SSH and let edef and flokli in + services.openssh.enable = true; + + users.users.root.openssh.authorizedKeys.keys = [ + "cert-authority ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCvb/7ojfcbKvHIyjnrNUOOgzy44tCkgXY9HLuyFta1jQOE9pFIK19B4dR9bOglPKf145CCL0mSFJNNqmNwwavU2uRn+TQrW+U1dQAk8Gt+gh3O49YE854hwwyMU+xD6bIuUdfxPr+r5al/Ov5Km28ZMlHOs3FoAP0hInK+eAibioxL5rVJOtgicrOVCkGoXEgnuG+LRbOYTwzdClhRUxiPjK8alCbcJQ53AeZHO4G6w9wTr+W5ILCfvW4OmUXCX01sKzaBiQuuFCF6M/H4LlnsPWLMra2twXxkOIhZblwC+lncps9lQaUgiD4koZeOCORvHW00G0L39ilFbbnVcL6Itp/m8RRWm/xRxS4RMnsdV/AhvpRLrhL3lfQ7E2oCeSM36v1S9rdg6a47zcnpL+ahG76Gz39Y7KmVRQciNx7ezbwxj3Q5lZtFykgdfGIAN+bT8ijXMO6m68g60i9Bz4IoMZGkiJGqMYLTxMQ+oRgR3Ro5lbj7E11YBHyeimoBYXYGHMkiuxopQZ7lIj3plxIzhmUlXJBA4jMw9KGHdYaLhaicIYhvQmCTAjrkt2HvxEe6lU8iws2Qv+pB6tAGundN36RVVWAckeQPZ4ZsgDP8V2FfibZ1nsrQ+zBKqaslYMAHs01Cf0Hm0PnCqagf230xaobu0iooNuXx44QKoDnB+w== edef" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPTVTXOutUZZjXLB0lUSgeKcSY/8mxKkC0ingGK1whD2 flokli" + ]; + + # Get a bunch of text editors and CLI tools. + environment.systemPackages = [ pkgs.helix pkgs.kakoune pkgs.tmux ]; +} -- cgit 1.4.1