diff --git a/host/speer/filesystems.nix b/host/speer/filesystems.nix index e7c98c1..44fecf8 100644 --- a/host/speer/filesystems.nix +++ b/host/speer/filesystems.nix @@ -3,21 +3,21 @@ "/dev/disk/by-uuid/bf353bb1-43bf-453f-ae7e-0fa9b4d8778c"; boot.initrd.kernelModules = [ "dm-snapshot" ]; - fileSystems."/" = { - device = "/dev/disk/by-uuid/661ad230-72da-4326-bb3a-4965006475f8"; - fsType = "btrfs"; - options = [ "subvol=nixos" ]; - }; - - fileSystems."/home" = { - device = "/dev/disk/by-uuid/661ad230-72da-4326-bb3a-4965006475f8"; - fsType = "btrfs"; - options = [ "subvol=home" ]; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/A5C5-1372"; - fsType = "vfat"; + fileSystems = { + "/" = { + device = "/dev/disk/by-uuid/661ad230-72da-4326-bb3a-4965006475f8"; + fsType = "btrfs"; + options = [ "subvol=nixos" ]; + }; + "/home" = { + device = "/dev/disk/by-uuid/661ad230-72da-4326-bb3a-4965006475f8"; + fsType = "btrfs"; + options = [ "subvol=home" ]; + }; + "/boot" = { + device = "/dev/disk/by-uuid/A5C5-1372"; + fsType = "vfat"; + }; }; swapDevices = [ ]; @@ -25,5 +25,4 @@ # Use the systemd-boot EFI boot loader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - } diff --git a/host/speer/networking.nix b/host/speer/networking.nix index 6e1de0d..2f868c8 100644 --- a/host/speer/networking.nix +++ b/host/speer/networking.nix @@ -1,26 +1,7 @@ -{ config, pkgs, ... }: - -{ - +{ config, pkgs, ... }: { networking = { networkmanager.enable = true; useDHCP = false; - #wireless.enable = true; # Enables wireless support via wpa_supplicant. hostName = "speer"; }; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - #networking.wireguard.enable = true; - #networking.wireguard.interfaces = let - # meta = import ../../meta; - # vnetworks = meta.network.virtual; - # vnetworkName = "mgmt"; - #in { - # "wg-${vnetworkName}" = - # pkgs.lib.qois.wireguard.makeInterface config.networking.hostName - # vnetworkName vnetworks.${vnetworkName}; - #}; }