diff --git a/configuration.nix b/configuration.nix
index c9bb602..92446c9 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -9,7 +9,14 @@ in
 {
   imports =
     [
-      <nixos-hardware/lenovo/legion/16ach6h/hybrid>
+    #  <nixos-hardware/lenovo/legion/16ach6h/hybrid> # this is borked in latest update for some reason, edid doesn't build
+      <nixos-hardware/common/cpu/amd>
+      <nixos-hardware/common/cpu/amd/pstate.nix>
+      <nixos-hardware/common/cpu/amd/zenpower.nix>
+      <nixos-hardware/common/gpu/amd>
+      <nixos-hardware/common/gpu/nvidia/prime.nix>
+      <nixos-hardware/common/pc/laptop>
+      <nixos-hardware/common/pc/laptop/ssd>
       ./hardware-configuration.nix
       <home-manager/nixos>
       ./cachix.nix
@@ -134,15 +141,25 @@ in
   # The nvidia fun part
   hardware.opengl.enable = true;
 
+  boot.kernelModules = ["amdgpu"];
   hardware.nvidia = {
+    modesetting.enable = true;
+    powerManagement.enable = true;
     prime = {
       # hardware specific, beware!
-      amdgpuBusId = lib.mkForce "PCI:01:00:0";
-      nvidiaBusId = lib.mkForce "PCI:06:00:0";
+      amdgpuBusId = lib.mkForce "PCI:06:00:0";
+      nvidiaBusId = lib.mkForce "PCI:01:00:0";
     };
   };
 
   security.polkit.enable = true;
+  # OBS Studio virtual camera
+  boot.extraModulePackages = with config.boot.kernelPackages; [
+    v4l2loopback
+  ];
+  boot.extraModprobeConfig = ''
+    options v4l2loopback devices=1 video_nr=1 card_label="OBS Cam" exclusive_caps=1
+  '';
 
   # Open ports in the firewall.
   networking.firewall.allowedTCPPorts = [
diff --git a/home.nix b/home.nix
index 2445972..9e8b880 100644
--- a/home.nix
+++ b/home.nix
@@ -37,6 +37,9 @@ in
             jetbrains.phpstorm
             jetbrains.pycharm-community-bin
             jetbrains.clion
+            jetbrains.goland
+            jetbrains.datagrip
+            datovka
             nwg-displays
             wireguard-tools
             mongodb-compass
@@ -53,6 +56,7 @@ in
             kdePackages.ksystemstats
             kdePackages.kinfocenter
             kdePackages.kirigami-addons
+            kdePackages.ark
             #xorg.xbacklight
             cachix
             playerctl
@@ -60,6 +64,7 @@ in
             qt6ct
             nil # nix language server
 
+            gping
             caddy
             jq
             htmlq
@@ -128,7 +133,7 @@ in
             pipx
             gobject-introspection
 
-            unstable-pkgs.prisma-engines
+            # unstable-pkgs.prisma-engines
             openssl
             gcc
             # required by mise plugins
@@ -146,11 +151,11 @@ in
             shellInit = with unstable-pkgs; ''
                 source ~/.config/fish/config-old.fish
 
-                set -x PRISMA_SCHEMA_ENGINE_BINARY "${prisma-engines}/bin/schema-engine"
-                set -x PRISMA_QUERY_ENGINE_BINARY "${prisma-engines}/bin/query-engine"
-                set -x PRISMA_QUERY_ENGINE_LIBRARY "${prisma-engines}/lib/libquery_engine.node"
-                set -x PRISMA_FMT_BINARY "${prisma-engines}/bin/prisma-fmt"
             '';
+            # set -x PRISMA_SCHEMA_ENGINE_BINARY "${prisma-engines}/bin/schema-engine"
+            # set -x PRISMA_QUERY_ENGINE_BINARY "${prisma-engines}/bin/query-engine"
+            # set -x PRISMA_QUERY_ENGINE_LIBRARY "${prisma-engines}/lib/libquery_engine.node"
+            # set -x PRISMA_FMT_BINARY "${prisma-engines}/bin/prisma-fmt"
             plugins = with pkgs.fishPlugins; [
                 { name = "grc"; src = grc.src; }
                 { name = "tide"; src = tide.src; }
diff --git a/setup-nix-channels.sh b/setup-nix-channels.sh
index 9a1c36c..7345702 100644
--- a/setup-nix-channels.sh
+++ b/setup-nix-channels.sh
@@ -1,4 +1,5 @@
 sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager
 sudo nix-channel --add https://github.com/NixOS/nixos-hardware/archive/master.tar.gz nixos-hardware
 sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable
+sudo nix-channel --add https://nixos.org/channels/nixos-24.05 nixos
 sudo nix-channel --update