From 679497cf607e59cb4c62d80174228e776369751f Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Wed, 6 Apr 2022 07:04:03 -0700 Subject: refactor boot configuration to a module We don't need the previous `hosts/common/system` configs anymore, as everything has been moved out. We keep some boot configuration for carmel in the host configuration for now, but I need to check why I don't have similar settings for tahoe (since I also need to unlock the host remotely). --- hosts/common/system/boot-ssh.nix | 21 --------------------- hosts/common/system/boot.nix | 16 ---------------- hosts/common/system/default.nix | 5 ----- 3 files changed, 42 deletions(-) delete mode 100644 hosts/common/system/boot-ssh.nix delete mode 100644 hosts/common/system/boot.nix delete mode 100644 hosts/common/system/default.nix (limited to 'hosts/common/system') diff --git a/hosts/common/system/boot-ssh.nix b/hosts/common/system/boot-ssh.nix deleted file mode 100644 index 2b865d5..0000000 --- a/hosts/common/system/boot-ssh.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, lib, pkgs, ... }: - -{ - boot.initrd = { - network = { - enable = true; - postCommands = '' - echo "cryptsetup-askpass; exit" > /root/.profile - ''; - ssh = { - enable = true; - port = 2222; - hostKeys = [ - /etc/ssh/ssh_host_ed25519_key - /etc/ssh/ssh_host_rsa_key - ]; - authorizedKeys = config.users.users.fcuny.openssh.authorizedKeys.keys; - }; - }; - }; -} diff --git a/hosts/common/system/boot.nix b/hosts/common/system/boot.nix deleted file mode 100644 index 75433eb..0000000 --- a/hosts/common/system/boot.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ pkgs, config, lib, ... }: - -{ - boot = { - loader = { - # Use the systemd-boot EFI boot loader. - systemd-boot.enable = true; - # Prohibits gaining root access by passing init=/bin/sh as a kernel parameter - systemd-boot.editor = false; - efi.canTouchEfiVariables = true; - }; - - kernelPackages = pkgs.linuxPackages_latest; - tmpOnTmpfs = true; - }; -} diff --git a/hosts/common/system/default.nix b/hosts/common/system/default.nix deleted file mode 100644 index a4ef6cd..0000000 --- a/hosts/common/system/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ pkgs, ... }: - -{ - imports = [ ./boot.nix ]; -} -- cgit 1.4.1