From a26c3494d545e247ce3f602245acec55080a399d Mon Sep 17 00:00:00 2001 From: sefidel Date: Tue, 1 Nov 2022 20:19:46 +0900 Subject: Revert "feat(nixos/selenium): ec2 instance" This reverts commit b94266070837495fa3b5bd7f5ffa968a9adb6c06. * moved to ~zachel/nixrc-server --- nixos/default.nix | 9 --------- nixos/modules/default.nix | 1 - nixos/modules/ec2.nix | 9 --------- nixos/selenium/configuration.nix | 18 ------------------ nixos/selenium/hardware-configuration.nix | 5 ----- 5 files changed, 42 deletions(-) delete mode 100644 nixos/modules/ec2.nix delete mode 100644 nixos/selenium/configuration.nix delete mode 100644 nixos/selenium/hardware-configuration.nix (limited to 'nixos') diff --git a/nixos/default.nix b/nixos/default.nix index 95eee0f..31d1a61 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -20,13 +20,4 @@ ./modules/security.nix ]; }; - - selenium = self.lib.mkSystem { - name = "selenium"; - nixpkgs = unstable-small; - extraModules = [ - ./modules/security.nix - ./modules/ec2.nix - ]; - }; } diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index c5d40e2..4469650 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -3,5 +3,4 @@ flake = import ./flake.nix; nix = import ./nix.nix; security = import ./security.nix; - ec2 = import ./ec2.nix; } diff --git a/nixos/modules/ec2.nix b/nixos/modules/ec2.nix deleted file mode 100644 index 45f3cd8..0000000 --- a/nixos/modules/ec2.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ modulesPath, config, lib, ... }: - -{ - # AWS EC2-specific tweaks - imports = [ - "${modulesPath}/virtualisation/amazon-image.nix" - ]; - ec2.hvm = true; -} diff --git a/nixos/selenium/configuration.nix b/nixos/selenium/configuration.nix deleted file mode 100644 index e099f02..0000000 --- a/nixos/selenium/configuration.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - imports = [ ]; - - users.users.worker = { - isNormalUser = true; - extraGroups = [ "wheel" ]; - openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAic4niJKrBKyTzTbpldaEiU30vS9/jkZl3yZRnu6d9O zach@zachel.io" ]; - }; - - # This value determines the NixOS release with which your system is to be - # compatible, in order to avoid breaking some software such as database - # servers. You should change this only after NixOS release notes say you - # should. - system.stateVersion = "22.05"; # Did you read the comment? - -} diff --git a/nixos/selenium/hardware-configuration.nix b/nixos/selenium/hardware-configuration.nix deleted file mode 100644 index 0b508ec..0000000 --- a/nixos/selenium/hardware-configuration.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - nix.settings.max-jobs = lib.mkDefault 4; -} -- cgit 1.4.1