diff --git a/config/plancha/hardware-configuration.nix b/config/plancha/hardware-configuration.nix index 1972121..cf2c0b1 100644 --- a/config/plancha/hardware-configuration.nix +++ b/config/plancha/hardware-configuration.nix @@ -14,8 +14,27 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; - fsType = "ext4"; + { device = "/dev/disk/by-uuid/b4deb5e5-6488-41ca-9718-08be27d0bfd4"; + fsType = "btrfs"; + options = [ "subvol=root" ]; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/b4deb5e5-6488-41ca-9718-08be27d0bfd4"; + fsType = "btrfs"; + options = [ "subvol=home" ]; + }; + + fileSystems."/nix" = + { device = "/dev/disk/by-uuid/b4deb5e5-6488-41ca-9718-08be27d0bfd4"; + fsType = "btrfs"; + options = [ "subvol=nix" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/7864-394A"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; }; swapDevices = [ ]; diff --git a/config/plancha/network-configuration.nix b/config/plancha/network-configuration.nix index 3a30e3f..42f8d58 100644 --- a/config/plancha/network-configuration.nix +++ b/config/plancha/network-configuration.nix @@ -9,8 +9,8 @@ networking = { hostName = "plancha"; - useDHCP = false; - defaultGateway = "192.168.36.1"; + # useDHCP = false; + # defaultGateway = "192.168.36.1"; nat = { enable = true; @@ -32,11 +32,11 @@ interfaces = { # primary network interface, connected to WAN through a router end0 = { - useDHCP = false; - ipv4.addresses = [ { - address = "192.168.36.16"; - prefixLength = 24; - } ]; + useDHCP = true; + # ipv4.addresses = [ { + # address = "192.168.36.16"; + # prefixLength = 24; + # } ]; }; # interface for containers virtual network br0 = { diff --git a/krops.nix b/krops.nix index 948f920..60d6281 100644 --- a/krops.nix +++ b/krops.nix @@ -83,7 +83,7 @@ let plancha = pkgs.krops.writeDeploy "deploy-server-plancha" { source = source "plancha"; - target = lib.mkTarget "operator@192.168.36.16" // { + target = lib.mkTarget "operator@192.168.12.12" // { port = "144"; sudo = true; };