diff --git a/machine/backyard/default.nix b/machine/backyard/default.nix index e03d516..47f6273 100644 --- a/machine/backyard/default.nix +++ b/machine/backyard/default.nix @@ -1,18 +1,15 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, ... }: +{ pkgs, ... }: { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; + imports = [ + ./hardware-configuration.nix + ]; # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; + boot.loader = { + systemd-boot.enable = true; + efi.canTouchEfiVariables = true; + }; networking.hostName = "backyard"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. diff --git a/machine/backyard/hardware-configuration.nix b/machine/backyard/hardware-configuration.nix index 76b063e..d7ec2a7 100644 --- a/machine/backyard/hardware-configuration.nix +++ b/machine/backyard/hardware-configuration.nix @@ -18,17 +18,19 @@ fsType = "ext4"; }; - fileSystems."/boot" = - { device = "/dev/disk/by-uuid/971B-96E8"; - fsType = "vfat"; - }; - fileSystems."/nix" = { device = "/dev/disk/by-uuid/0d031c2d-e66e-41d2-906f-1955b5a26f23"; fsType = "ext4"; }; - swapDevices = [ ]; + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/971B-96E8"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/f55dc7e7-eeec-4be6-88e4-f3e94e749fd2"; } + ]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's