2 files changed, 35 insertions, 18 deletions
diff --git a/nixos/laptop/configuration.nix b/nixos/laptop/configuration.nix
index ceed24e..983e966 100644
--- a/nixos/laptop/configuration.nix
+++ b/nixos/laptop/configuration.nix
@@ -25,16 +25,30 @@
     displayManager.lightdm.enable = false;
   };
 
+  environment.systemPackages = with pkgs; [
+    joycond-cemuhook
+  ];
 
-  # environment.systemPackages = with pkgs; [
-  #   qemu
-  # ];
+  virtualisation.docker = {
+    enable = true;
+    liveRestore = true;
+    daemon.settings = {
+      bip = "172.20.0.1/16";
+      default-address-pools = [{
+        base = "172.20.0.0/8";
+        size = 16;
+      }];
+    };
+  };
+  # services.postgresql.enable = true;
   
   programs.adb.enable = true;
   services.udev.packages = [
     pkgs.android-udev-rules
   ];
 
+  services.joycond.enable = true;
+
   home-manager = {
     extraSpecialArgs = { inherit inputs outputs; };
     useGlobalPkgs = true;
diff --git a/nixos/laptop/hardware-configuration.nix b/nixos/laptop/hardware-configuration.nix
index e3e8a01..8dc4a78 100644
--- a/nixos/laptop/hardware-configuration.nix
+++ b/nixos/laptop/hardware-configuration.nix
@@ -8,23 +8,23 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" "sdhci_pci" ];
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
+  boot.kernelModules = [ "kvm-amd" "amdgpu" "hid_nintendo" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/b4d5e165-3c5d-494f-b6f4-dad51c470f4b";
+    { device = "/dev/disk/by-uuid/f42dd8ca-f644-462f-a804-1e41d3a56d54";
       fsType = "ext4";
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/4075-1CD3";
+    { device = "/dev/disk/by-uuid/76AA-EF6D";
       fsType = "vfat";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/92692e2e-0394-4d43-b309-d0d650af1e21"; }
+    [ { device = "/dev/disk/by-uuid/f1217bb2-a665-41f1-b381-057aac378262"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@@ -32,21 +32,24 @@
   # 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.eno1.useDHCP = lib.mkDefault true;
-  # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp1s0.useDHCP = lib.mkDefault true;
+  networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-  
-  hardware.bluetooth = {
-    enable = true;
-  };
-  
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
   hardware.opengl = {
     enable = true;
     driSupport = true;
     driSupport32Bit = true;
-    extraPackages = with pkgs; [ intel-compute-runtime ];
+    extraPackages = with pkgs; [
+      amdvlk
+      rocmPackages.clr.icd
+    ];
+  };
+
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
   };
-  # hardware.opentabletdriver.enable = true;
 }