fixed gpu initialization order :3

flake.lock

@@ -98,11 +98,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1772737222,
+        "lastModified": 1772820255,
-        "narHash": "sha256-VQ0i0rB4wI9EEoMybDNFzgC/hzcwxEMPmxrq/Ce0JkI=",
+        "narHash": "sha256-vdktxEQihZUcKiwbaYCBl8LuTrJZULpjwqtJyBzXBN8=",
         "owner": "xddxdd",
         "repo": "nix-cachyos-kernel",
-        "rev": "1c0e0cd60713026a6517f31890278d9d5e51de9b",
+        "rev": "aada771f510dbd9ac48614cc7b4b21a292989d3a",
         "type": "github"
       },
       "original": {
@@ -1269,11 +1269,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772785092,
+        "lastModified": 1772813986,
-        "narHash": "sha256-QUrN6Kj68aSDo0OYYWBPYAdmBURAX9PnXgs3KUpVuV8=",
+        "narHash": "sha256-x0fD+LL+O99p36c2UnjnHvVq4/7TvGH/8G5lTNIJBCo=",
         "owner": "FlameFlag",
         "repo": "nixcord",
-        "rev": "015dc71bba3888afe7ecdc62c0defe617b81ef82",
+        "rev": "e433a2919eb9b3a8c85ab3017c08685816e63a66",
         "type": "github"
       },
       "original": {
@@ -1284,11 +1284,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1772691005,
+        "lastModified": 1772774498,
-        "narHash": "sha256-TCamkDXY0G84Se5Kio6BbqtWfWfPXg9on9ZsX19tnNo=",
+        "narHash": "sha256-85HBHBEzVRQ0ZRe6u3E2snUvAyTr5mSvi5m2vl4HExo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "be4f549ba12cd3e2b66d24fa7e39cd871111bdb3",
+        "rev": "943ba5b1a58e68eb9a2c284ba6e3b30ebfe45abe",
         "type": "github"
       },
       "original": {
@@ -1345,11 +1345,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1772810599,
+        "lastModified": 1772820052,
-        "narHash": "sha256-uHSVEvbk/Dz7cdZBPCUuBIn/1aXLsWQTrxT1WpuAbVg=",
+        "narHash": "sha256-qXEI8n+4eXT+BqMzUMuKFdkltE82TjgIceiJCpdjzD4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "16acb176369e4d85cd42f5e226d54bd72cba3ce1",
+        "rev": "d78e468770f4ab5e00c5015f4d77c1a499a76dc8",
         "type": "github"
       },
       "original": {
@@ -1361,11 +1361,11 @@
     },
     "nixpkgs-staging": {
       "locked": {
-        "lastModified": 1772799059,
+        "lastModified": 1772820753,
-        "narHash": "sha256-fKCYR7IHabZ0OlZc1MgmNV2k2l0+5mQMZfPS+2rPbXw=",
+        "narHash": "sha256-Sv689sGseiqNPXGSggxrESyivroe8cgY4dxqJdBLsEc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e8a017eb48f23fab3f90eb4b1d830ef659482770",
+        "rev": "e2239e5b2c5676b963d78dccbee06a9bbbdb05d6",
         "type": "github"
       },
       "original": {

homes/aurora/default.nix

@@ -86,6 +86,7 @@
     # fonts
     nerd-fonts.departure-mono # pretty pixel art font i love!! x3
     nerd-fonts.jetbrains-mono
+    noto-fonts
 
     # cli / tui tools and commands!
     eza # replaces: ls (rust)

homes/modules/wm/hyprland/hyprland.nix

@@ -40,10 +40,6 @@
         "wl-clip-persist --clipboard regular"
 
         "playerctld daemon"
-
-        # swaps around the 3rd and 4th workspace because they always start
-        # in the wrong order
-        "hyprctl dispatch workspace 4 && hyprctl dispatch workspace 5 && hyprctl dispatch workspace 3 && hyprctl dispatch workspace 4 && hyprctl dispatch workspace 5 && hyprctl dispatch workspace 3 && hyprctl dispatch workspace 1"
       ];
 
       # monitor configuration
@@ -57,6 +53,13 @@
         "HDMI-A-1, 1920x1080@60.00, -1920x0, 1" # tv
       ];
 
+      workspace = [
+        "1, monitor:DP-2, default:true"
+        "2, monitor:DP-3, default:true"
+        "3, monitor:HDMI-A-2, default:true"
+        "4, monitor:HDMI-A-1, default:true"
+      ];
+
       general = {
         gaps_in = 5;
         gaps_out = "0, 10, 10, 10";

hosts/nixarawrui/default.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  config,
   root,
   upkgs,
   ...
@@ -25,6 +26,14 @@
     # FIX: it said my disk was full
     kernelPackages = upkgs.linuxPackages_latest;
     kernelModules = ["v4l2loopback"];
+    # force kernel to use dGPU
+    kernelParams = [
+      "amdgpu.primary=0000:03:00.0"
+      "video=PCI:0000:03:00.0:e"
+      "initcall_blacklist=simpledrm_platform_driver_init"
+      "fbcon=map:0"
+      "pci=assign-busses"
+    ];
     extraModulePackages = with kernelPackages; [v4l2loopback];
 
     # qemu
@@ -131,6 +140,30 @@
   services = {
     displayManager.sddm.enable = true;
     displayManager.sddm.wayland.enable = true;
+    # force sddm to be on the dGPU
+    displayManager.sddm.wayland.compositor = "weston";
+    displayManager.sddm.settings = let
+      xcfg = config.services.xserver;
+      # from: https://github.com/NixOS/nixpkgs/blob/1ad2d2e524cb1e7b91ebebcd10d224105dd4e1f2/nixos/modules/services/display-managers/sddm.nix#L132-L143
+      # as for some reason they do it like this and it makes it harder for me to set the option correctly for my gpu
+      # NOTE: ask butterfly if there is a better way <3
+      westonIni = (upkgs.formats.ini {}).generate "weston.ini" {
+        libinput = {
+          enable-tap = config.services.libinput.mouse.tapping;
+          left-handed = config.services.libinput.mouse.leftHanded;
+        };
+        keyboard = {
+          keymap_model = xcfg.xkb.model;
+          keymap_layout = xcfg.xkb.layout;
+          keymap_variant = xcfg.xkb.variant;
+          keymap_options = xcfg.xkb.options;
+        };
+      };
+    in {
+      Wayland = {
+        CompositorCommand = "${lib.getExe upkgs.weston} --shell=kiosk --drm-device=card0 -c ${westonIni}";
+      };
+    };
 
     udisks2.enable = true;
     flatpak.enable = true;
@@ -301,6 +334,9 @@
     # linux packages!!!
     linuxPackages.v4l2loopback
 
+    # weston is needed for sddm
+    weston
+
     # android yay
     android-tools