diff --git a/keys/ssh/keys.txt b/keys/ssh/keys.txt index 151e6f7b..6a017996 100644 --- a/keys/ssh/keys.txt +++ b/keys/ssh/keys.txt @@ -36,4 +36,12 @@ ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKa86iTPkRDwga4/T3XdyWfu5xH8oL/AWWWozz3rUyuA ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP7HMCutPvexUsbjAzpd0ZOsmVtg80MOaGnCOv+I3UBf pixel-5 # (Thu Dec 28 19:23:15 JST 2023) Win10 Desktop -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMnAgxirNxrWnYARBG4sQ9wp21zK9uhrcNpFzegTk3Kl albert j. copeland@win10-desktop \ No newline at end of file +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 diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix index f0006563..5183415d 100644 --- a/nixos/hosts/nixos-desktop/default.nix +++ b/nixos/hosts/nixos-desktop/default.nix @@ -1,8 +1,8 @@ { inputs, config, lib, pkgs, modulesPath, desktop, username, platform, ... }: { imports = [ ./disks.nix - ../../common/modules/secureboot.nix - ../../common/modules/ssh-luks.nix + ../../common/modules/boot.nix + # ../../common/modules/ssh-luks.nix ../../common/services/openrazer.nix ]; # steam, nvidia-x11, etc diff --git a/nixos/hosts/nixos-desktop/disks.nix b/nixos/hosts/nixos-desktop/disks.nix index 49c8d44c..af36f58c 100644 --- a/nixos/hosts/nixos-desktop/disks.nix +++ b/nixos/hosts/nixos-desktop/disks.nix @@ -35,7 +35,7 @@ type = "btrfs"; extraArgs = [ "-f" ]; subvolumes = { - "/" = { + "/root" = { mountpoint = "/"; mountOptions = [ "compress=zstd" "noatime" ]; }; # root @@ -71,4 +71,4 @@ ]; # partitions }; # content }; # disko.devices.disk.nvme0 -} # root \ No newline at end of file +} # root