diff --git a/keys/tvb.backyard.pub b/keys/tvb.backyard.pub index d92d276..5869038 100644 --- a/keys/tvb.backyard.pub +++ b/keys/tvb.backyard.pub @@ -1 +1 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCuRR6HP0pWdlg64xdhVYSe5rkEwWgYPTvboO3kRquJ8QHtFFj8ieJ6CIi/7VrauvyqZE5YJ8is84T2GLrX5Cqxliq4CXHq+trahQvVJ+aJCPA5TW0jaNh0TktVNBN+ospQ3TcXNZaVxjeZgtcut+JBYfldpIM1NBTOITd66az3//hyLJb5vycNq0uWXxy2cQNTQ6JWh26QnobHRac8lsD/mcbI531Sqbj0TALcyGWY/hw+aIYhUCAYSJtTapVPhUliylcA7RX9oZ6rt0yB2Z5rfxMi66fbGnLIYkdgONcorgBv5K/+k2nrmng2lqK87BjZYBa801nRf80UYIh3MfV8iW9svB8OaHxcwExkxCh17RLVz0Nh3Yi6kkY6Bw+8OEkuBfrn1IgkmRPue/aDHJBpa2FLlzfh46EmJDXkhJZfjMiG1UwjpU43z4UFy7u4AykSHamduKnfEl3YjxGpVpjiPdnh5RW9SkOW45Jun3CpZiE+orAIg9FIaBNb+HFUbE+PmU98g9V3w/GzihiZ3zswanPKrvoDfc5IqcuKNuk29WA/Ia0liwfUScCtehfumCGAM8xEVZvGLs+trjvBOxCWLUlCNkY2U12k5CFKV6wdoViNpaysoSD8EHkcfNfgISxMvwgb7WD4V0LR7SrDuzeD9eqfj2O1a9ZopW2lLus1qQ== tvb@backyard +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGYv5vs78+UAeRagopi4BuvmmK1l3zZwQPY3R4rnp7oV tvb@backyard diff --git a/machine/backyard/default.nix b/machine/backyard/default.nix index 45f0104..7b00036 100644 --- a/machine/backyard/default.nix +++ b/machine/backyard/default.nix @@ -5,9 +5,9 @@ ./hardware-configuration.nix ]; - boot.loader = { - systemd-boot.enable = true; - efi.canTouchEfiVariables = true; + boot.loader.grub = { + enable = true; + device = "/dev/sda"; }; beatific.hostName = "backyard"; diff --git a/machine/backyard/hardware-configuration.nix b/machine/backyard/hardware-configuration.nix index d7ec2a7..d7426e7 100644 --- a/machine/backyard/hardware-configuration.nix +++ b/machine/backyard/hardware-configuration.nix @@ -14,22 +14,12 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/dd02cbda-2dd1-450d-9ece-92965ea3c3b8"; + { device = "/dev/disk/by-uuid/798089ca-f249-431d-aa08-65909b85a184"; fsType = "ext4"; }; - fileSystems."/nix" = - { device = "/dev/disk/by-uuid/0d031c2d-e66e-41d2-906f-1955b5a26f23"; - fsType = "ext4"; - }; - - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/971B-96E8"; - fsType = "vfat"; - }; - swapDevices = - [ { device = "/dev/disk/by-uuid/f55dc7e7-eeec-4be6-88e4-f3e94e749fd2"; } + [ { device = "/dev/disk/by-uuid/5d55f9b7-cde3-403d-9c91-61c4b68c71f9"; } ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking @@ -38,7 +28,6 @@ # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; # networking.interfaces.eno1.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp0s20f0u14.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";