From 73cd8a2ab81b91aaca8095c77de12ea39fbc2fed Mon Sep 17 00:00:00 2001 From: tzlil Date: Thu, 3 Aug 2023 21:37:04 +0300 Subject: fix vm --- hosts/navi/default.nix | 17 +++++++++++++---- hosts/navi/hardware-configuration.nix | 17 +++++++++++------ 2 files changed, 24 insertions(+), 10 deletions(-) (limited to 'hosts') diff --git a/hosts/navi/default.nix b/hosts/navi/default.nix index 3424a87..d4d2446 100644 --- a/hosts/navi/default.nix +++ b/hosts/navi/default.nix @@ -47,7 +47,16 @@ algorithm = "zstd"; }; - networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp1s0.useDHCP = lib.mkDefault true; + # systemd.network.networks."10-wlp1s0" = { + # matchConfig.Name = "wlp1s0"; + # networkConfig.DHCP = "yes"; + # }; + + systemd.network.networks."10-eth0" = { + matchConfig.Name = "eth0"; + networkConfig.DHCP = "yes"; + }; # # iwd networking stuffs # networking.networkmanager.enable = lib.mkForce false; @@ -73,9 +82,9 @@ "/etc/NetworkManager/system-connections" "/var/lib/docker" ]; - users.tzlil = { - directories = [".config/SchildiChat" ".local/share/Terraria" ".local/share/Steam"]; - }; + # users.tzlil = { + # directories = [".config/SchildiChat" ".local/share/Terraria" ".local/share/Steam"]; + # }; }; home-manager.users.tzlil = { diff --git a/hosts/navi/hardware-configuration.nix b/hosts/navi/hardware-configuration.nix index f556950..480f255 100644 --- a/hosts/navi/hardware-configuration.nix +++ b/hosts/navi/hardware-configuration.nix @@ -3,7 +3,7 @@ pkgs, lib, config, - # modulesPath, + modulesPath, ... }: let device = "/dev/nvme0n1"; @@ -13,7 +13,7 @@ in { inputs.hardware.nixosModules.common-cpu-intel inputs.hardware.nixosModules.common-gpu-intel - # (modulesPath + "/virtualisation/qemu-vm.nix") + (modulesPath + "/virtualisation/qemu-vm.nix") ]; hardware.firmware = [pkgs.rtw88-firmware]; @@ -26,6 +26,7 @@ in { hardware.bluetooth.enable = true; + fileSystems."/nix/persist".neededForBoot = true; disko.devices = { disk.${baseNameOf device} = { inherit device; @@ -44,9 +45,9 @@ in { }; root = { size = "100%"; - content = { - type = "luks"; - name = "cryptroot"; + # content = { + # type = "luks"; + # name = "cryptroot"; content = { type = "btrfs"; extraArgs = ["-f"]; @@ -55,9 +56,13 @@ in { mountOptions = ["compress=zstd" "noatime"]; mountpoint = "/nix"; }; + "/nix/persist" = { + mountOptions = ["compress=zstd" "noatime"]; + mountpoint = "/nix/persist"; + }; }; }; - }; + # }; }; }; }; -- cgit 1.4.1