update

3 files changed, 25 insertions, 19 deletions

diff --git a/config/swaylock/config b/config/swaylock/config
index 1322284..4ca899f 100644
--- a/config/swaylock/config
+++ b/config/swaylock/config
@@ -1,4 +1,4 @@
-image=~/Pictures/wallpaper.jpg
+image=/etc/nixos/dist/wallpaper.jpg
 font=UbuntuMono Nerd Font Mono
 
 bs-hl-color=f5e0dc
diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix
index 0a69e77..80883ed 100644
--- a/machines/x/configuration.nix
+++ b/machines/x/configuration.nix
@@ -20,16 +20,11 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  boot.extraModprobeConfig = "options kvm_intel nested=1";
+  boot.extraModprobeConfig = "options kvm_amd nested=1";
 
   nixpkgs.config.allowUnfree = true;
   nixpkgs.config.allowUnfreePredicate = _: true;
 
-  fileSystems."/data" = {
-    device = "/dev/sda";
-    fsType = "ext4";
-  };
-
   networking.hostName = "x";
 
   home-manager.users.compromyse = import ./home.nix;
diff --git a/machines/x/hardware-configuration.nix b/machines/x/hardware-configuration.nix
index aeb8272..27407a4 100644
--- a/machines/x/hardware-configuration.nix
+++ b/machines/x/hardware-configuration.nix
@@ -1,27 +1,38 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/347f3061-af46-40c7-aae3-fd4546cebb24";
-    fsType = "ext4";
-  };
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/50e5b4a8-3ea9-42c2-a44b-c13aaa28b8d2";
+      fsType = "ext4";
+    };
 
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/03DC-FCFF";
-    fsType = "vfat";
-  };
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/3DD3-86F4";
+      fsType = "vfat";
+    };
 
   swapDevices = [ ];
 
+  # 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
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
   networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp2s0.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }