diff --git a/flake.lock b/flake.lock
index a608a1b..c4b1858 100644
--- a/flake.lock
+++ b/flake.lock
@@ -40,11 +40,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742234739,
-        "narHash": "sha256-zFL6zsf/5OztR1NSNQF33dvS1fL/BzVUjabZq4qrtY4=",
+        "lastModified": 1739757849,
+        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f6af7280a3390e65c2ad8fd059cdc303426cbd59",
+        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
         "type": "github"
       },
       "original": {
@@ -103,11 +103,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1742220949,
-        "narHash": "sha256-ZlPrKLM0FWUP36MNCJYGTlN4ZvoXZ4WY/ENKoaGU6yg=",
+        "lastModified": 1742032096,
+        "narHash": "sha256-/vWpgh3DCdoREIoydTfUnZLYSxKa0yRczOJaT0dDT0o=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "5d8d116ac90f54e4c95bd5c9de31b8df477b12b9",
+        "rev": "e2614d598a86eb892e4d98d18458ee2633285c00",
         "type": "github"
       },
       "original": {
@@ -136,11 +136,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1742103165,
-        "narHash": "sha256-zAzMwvozlS2gmqdhrgeMz0PNp3kRDkwxIEfqWT3Hj6g=",
+        "lastModified": 1742026950,
+        "narHash": "sha256-pd00WzjmAxxS3Da0e4eEzfgauAfX5HwMGfs3nm2hwwA=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "287480b541e85b13ff6419d372f82fa8e42c603c",
+        "rev": "9e560e7e607638da4f47b6dfef5a83b18711f75d",
         "type": "github"
       },
       "original": {
@@ -149,13 +149,29 @@
         "type": "github"
       }
     },
+    "nixos-hardware": {
+      "locked": {
+        "lastModified": 1741325094,
+        "narHash": "sha256-RUAdT8dZ6k/486vnu3tiNRrNW6+Q8uSD2Mq7gTX4jlo=",
+        "owner": "NixOS",
+        "repo": "nixos-hardware",
+        "rev": "b48cc4dab0f9711af296fc367b6108cf7b8ccb16",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "master",
+        "repo": "nixos-hardware",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1742136038,
-        "narHash": "sha256-DDe16FJk18sadknQKKG/9FbwEro7A57tg9vB5kxZ8kY=",
+        "lastModified": 1741332913,
+        "narHash": "sha256-ri1e8ZliWS3Jnp9yqpKApHaOo7KBN33W8ECAKA4teAQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a1185f4064c18a5db37c5c84e5638c78b46e3341",
+        "rev": "20755fa05115c84be00b04690630cb38f0a203ad",
         "type": "github"
       },
       "original": {
@@ -170,6 +186,7 @@
         "home-manager": "home-manager",
         "lix-module": "lix-module",
         "niri": "niri",
+        "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs"
       }
     },
@@ -208,11 +225,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1742083780,
-        "narHash": "sha256-cVLagXvI4jFbCe76tpvAWA2N2WF94Pl0PpgsGp2P6rM=",
+        "lastModified": 1741910413,
+        "narHash": "sha256-z9bvteu0rf+xmUDj4VifN06XAFJZQGRSOvdN7rn/oDs=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "f9ec97b007547ad80147404335ed22e880dbd69d",
+        "rev": "0325cb1f48a292d873a6844772cca00251cbf945",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 703576d..9b21548 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,7 +1,7 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
-    # nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
 
     home-manager = {
       url = "github:nix-community/home-manager/release-24.11";
@@ -26,6 +26,7 @@
       nixpkgs,
       home-manager,
       lix-module,
+      nixos-hardware,
       niri,
     }:
     let
diff --git a/home/vinzenz/zsh.nix b/home/vinzenz/zsh.nix
index 02efbce..0b5ed96 100644
--- a/home/vinzenz/zsh.nix
+++ b/home/vinzenz/zsh.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
   config.programs.zsh = {
     initExtra = ''
@@ -9,9 +9,11 @@
     enableCompletion = true;
 
     shellAliases = {
-      myos-rebuild-boot = "sudo nixos-rebuild boot --flake .# --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json";
-      myos-rebuild-switch = "sudo nixos-rebuild switch --flake .# --show-trace --log-format internal-json -v |& ${pkgs.nix-output-monitor}/bin/nom --json";
-
+      my-apply = "sudo nixos-rebuild boot --flake";
+      my-switch = "sudo nixos-rebuild switch --flake";
+      my-update = "sudo nixos-rebuild boot --upgrade --flake";
+      my-pull = "git -C ~/Repos/nixos-configuration pull --rebase";
+      my-test = "sudo nixos-rebuild test";
       my-direnvallow = "echo \"use nix\" > .envrc && direnv allow";
       my-ip4 = "ip addr show | grep 192";
       deadnix = "nix run github:astro/deadnix -- ";
diff --git a/hosts/forgejo-runner-1/configuration.nix b/hosts/forgejo-runner-1/configuration.nix
index 345e622..81b5be8 100644
--- a/hosts/forgejo-runner-1/configuration.nix
+++ b/hosts/forgejo-runner-1/configuration.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   # uncomment for build check on non arm system (requires --impure)
   # nixpkgs.buildPlatform = builtins.currentSystem;
diff --git a/hosts/forgejo-runner-1/hardware.nix b/hosts/forgejo-runner-1/hardware.nix
index e3e6880..f7cb083 100644
--- a/hosts/forgejo-runner-1/hardware.nix
+++ b/hosts/forgejo-runner-1/hardware.nix
@@ -1,4 +1,4 @@
-{ modulesPath, ... }:
+{ lib, modulesPath, ... }:
 {
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
 
diff --git a/hosts/hetzner-vpn2/configuration.nix b/hosts/hetzner-vpn2/configuration.nix
index 8e16ff7..be2fe7b 100644
--- a/hosts/hetzner-vpn2/configuration.nix
+++ b/hosts/hetzner-vpn2/configuration.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   # uncomment for build check on non arm system (requires --impure)
   # nixpkgs.buildPlatform = builtins.currentSystem;
diff --git a/hosts/hetzner-vpn2/hardware.nix b/hosts/hetzner-vpn2/hardware.nix
index e8fa931..7cf5ce7 100644
--- a/hosts/hetzner-vpn2/hardware.nix
+++ b/hosts/hetzner-vpn2/hardware.nix
@@ -1,4 +1,4 @@
-{ modulesPath, ... }:
+{ lib, modulesPath, ... }:
 {
   imports = [ (modulesPath + "/profiles/qemu-guest.nix") ];
 
diff --git a/hosts/hetzner-vpn2/nginx.nix b/hosts/hetzner-vpn2/nginx.nix
index 218b7a9..a9bc583 100644
--- a/hosts/hetzner-vpn2/nginx.nix
+++ b/hosts/hetzner-vpn2/nginx.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
 {
   security.acme = {
     acceptTerms = true;
diff --git a/hosts/vinzenz-lpt2/configuration.nix b/hosts/vinzenz-lpt2/configuration.nix
index 5267e89..7ad1351 100644
--- a/hosts/vinzenz-lpt2/configuration.nix
+++ b/hosts/vinzenz-lpt2/configuration.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   imports = [ ./nginx.nix ];
 
diff --git a/hosts/vinzenz-pc2/configuration.nix b/hosts/vinzenz-pc2/configuration.nix
index d2f7439..aa01095 100644
--- a/hosts/vinzenz-pc2/configuration.nix
+++ b/hosts/vinzenz-pc2/configuration.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   imports = [
     ./hardware.nix
diff --git a/modules/desktop-environment.nix b/modules/desktop-environment.nix
index afb5255..9d4fcd8 100644
--- a/modules/desktop-environment.nix
+++ b/modules/desktop-environment.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 {
   config = {
     services = {
diff --git a/modules/desktop-hardware.nix b/modules/desktop-hardware.nix
index 1fed3a8..62d0ab9 100644
--- a/modules/desktop-hardware.nix
+++ b/modules/desktop-hardware.nix
@@ -1,6 +1,7 @@
 {
   lib,
   pkgs,
+  config,
   ...
 }:
 {
diff --git a/modules/gaming.nix b/modules/gaming.nix
index 4214c23..6cb625f 100644
--- a/modules/gaming.nix
+++ b/modules/gaming.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 {
   config = {
     hardware = {
diff --git a/modules/gnome.nix b/modules/gnome.nix
index 669109c..c510a9d 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 {
   config = {
     services = {
diff --git a/modules/intel-graphics.nix b/modules/intel-graphics.nix
index 74c6e67..f23b357 100644
--- a/modules/intel-graphics.nix
+++ b/modules/intel-graphics.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 {
   config = {
     hardware.graphics = {