de/hypr/default.nix

@@ -39,7 +39,6 @@
 
   home.packages = with pkgs; [
     egl-wayland # For NVIDIA compatibility
-    xdg-utils
     xdg-desktop-portal-hyprland
     # Common DE packages required in config
     wl-clipboard

flake.lock

@@ -493,16 +493,15 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1731797098,
+        "lastModified": 1731403644,
-        "narHash": "sha256-UhWmEZhwJZmVZ1jfHZFzCg+ZLO9Tb/v3Y6LC0UNyeTo=",
+        "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "672ac2ac86f7dff2f6f3406405bddecf960e0db6",
+        "rev": "f6581f1c3b137086e42a08a906bdada63045f991",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
-        "ref": "master",
         "repo": "nixos-hardware",
         "type": "github"
       }

flake.nix

@@ -3,7 +3,6 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -57,6 +56,9 @@
       url = "github:Jovian-Experiments/Jovian-NixOS";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    # Rasoberry PI
+    nixos-hardware.url = "github:nixos/nixos-hardware";
   };
 
   outputs = {
@@ -79,7 +81,6 @@
         modules = [
           ./hosts/Zephyrus
           disko.nixosModules.disko
-          nixos-hardware.nixosModules.asus-zephyrus-ga503
           home-manager.nixosModules.home-manager
           jovian.nixosModules.jovian
         ];

hosts/Zephyrus/hardware-configuration.nix

@@ -3,6 +3,7 @@
 # to /etc/nixos/configuration.nix instead.
 {
   pkgs,
+  config,
   lib,
   modulesPath,
   ...
@@ -87,6 +88,23 @@
     ];
   };
 
+  hardware.nvidia = {
+    modesetting.enable = true;
+
+    open = false; # Bruuh
+
+    prime = {
+      offload = {
+        enable = true;
+        enableOffloadCmd = true;
+      };
+
+      amdgpuBusId = "PCI:7:0:0";
+      nvidiaBusId = "PCI:1:0:0";
+    };
+  };
+  services.xserver.videoDrivers = ["nvidia"];
+
   # 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
@@ -97,4 +115,5 @@
   # networking.interfaces.wlp4s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }

users/gaspard.nix

@@ -1,4 +1,11 @@
 {...}: {
+  home.username = "gaspard";
+  home.homeDirectory = "/home/gaspard";
+  home.stateVersion = "24.05";
+
+  programs.home-manager.enable = true;
+  programs.direnv.enable = true;
+
   imports = [
     ../shell
     ../term
@@ -7,22 +14,4 @@
     ../gaming
     ../themes/pomme.nix
   ];
-
-  home.username = "gaspard";
-  home.homeDirectory = "/home/gaspard";
-  home.stateVersion = "24.05";
-
-  programs.home-manager.enable = true;
-  programs.direnv.enable = true;
-
-  xdg.mimeApps = {
-    enable = true;
-    defaultApplications = {
-      "text/html" = "firefox.desktop";
-      "x-scheme-handler/http" = "firefox.desktop";
-      "x-scheme-handler/https" = "firefox.desktop";
-      "x-scheme-handler/about" = "firefox.desktop";
-      "x-scheme-handler/unknown" = "firefox.desktop";
-    };
-  };
 }