From 97ac80f3e40a52ed32a5be39e0ccda91b38671fa Mon Sep 17 00:00:00 2001 From: iFargle Date: Sun, 31 Dec 2023 22:51:01 +0900 Subject: [PATCH] Fix up a few thigns on the desktop --- keys/ssh/keys.txt | 8 -------- nixos/common/modules/ssh-luks.nix | 4 ++-- nixos/hosts/nixos-desktop/default.nix | 9 +-------- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/keys/ssh/keys.txt b/keys/ssh/keys.txt index d11c3572..9c8f9b3c 100644 --- a/keys/ssh/keys.txt +++ b/keys/ssh/keys.txt @@ -37,14 +37,6 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP7HMCutPvexUsbjAzpd0ZOsmVtg80MOaGnCOv+I3UBf # (Thu Dec 28 19:23:15 JST 2023) Win10 Desktop ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMnAgxirNxrWnYARBG4sQ9wp21zK9uhrcNpFzegTk3Kl albert j. copeland@win10-desktop -# (Sun Dec 31 22:27:34 JST 2023) albert@nixos-desktop -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINxrszXuuCvXelfRrIW6Owq8EYenWt6V6gQlstp9mCtx albert@nixos-desktop - -# (Sun Dec 31 10:30:13 PM JST 2023) albert@nixos-desktop -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFWV04hCbmPxsaQwo8wPRWbDA5Lu9OBqPxgUA5ymyw/h albert@nixos-desktop - -# (Sun Dec 31 10:31:35 PM JST 2023) albert@nixos-desktop -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINpLqa0udroR08B2v2mIe5K0Lggezrwuyg9rPtEIhqLH albert@nixos-desktop # (Sun Dec 31 10:35:10 PM JST 2023) albert@nixos-desktop ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByqVpUx8mw0bs+q04xL5+UC7Mwqu9nKVFIsxTi2nWti albert@nixos-desktop diff --git a/nixos/common/modules/ssh-luks.nix b/nixos/common/modules/ssh-luks.nix index b716145f..42c243fa 100644 --- a/nixos/common/modules/ssh-luks.nix +++ b/nixos/common/modules/ssh-luks.nix @@ -32,8 +32,8 @@ ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKa86iTPkRDwga4/T3XdyWfu5xH8oL/AWWWozz3rUyuA abc@rdesktop'' # (Thu Dec 28 10:56:22 AM UTC 2023) pixel-5 ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP7HMCutPvexUsbjAzpd0ZOsmVtg80MOaGnCOv+I3UBf pixel-5'' - # (Thu Dec 28 19:23:15 JST 2023) Win10 Desktop - ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMnAgxirNxrWnYARBG4sQ9wp21zK9uhrcNpFzegTk3Kl albert j. copeland@win10-desktop'' + # (Sun Dec 31 10:35:10 PM JST 2023) albert@nixos-desktop + ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIByqVpUx8mw0bs+q04xL5+UC7Mwqu9nKVFIsxTi2nWti albert@nixos-desktop'' ]; hostKeys = [ # Generate new keys with: diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix index 5183415d..99f1dc42 100644 --- a/nixos/hosts/nixos-desktop/default.nix +++ b/nixos/hosts/nixos-desktop/default.nix @@ -2,19 +2,12 @@ imports = [ ./disks.nix ../../common/modules/boot.nix - # ../../common/modules/ssh-luks.nix + ../../common/modules/ssh-luks.nix ../../common/services/openrazer.nix ]; # steam, nvidia-x11, etc nixpkgs.config.allowUnfree = true; - # Temporary, before the machine is on Headscale. - # Remove when finished. - networking.extraHosts = '' - 192.168.1.210 code.sysctl.io - 192.168.1.210 pass.sysctl.io - ''; - boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "thunderbolt" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" "acpi_call" ];