diff --git a/flake.nix b/flake.nix
index 774bdf3..4baf60f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,12 +12,9 @@
     };
   };
 
-  outputs = { nixpkgs, home-manager, hyprland, ... }:
+  outputs = { nixpkgs, home-manager, hyprland, ... } @inputs :
     let
       system = "x86_64-linux";
-      pkgs = import nixpkgs {
-        inherit system;
-      };
       lib = nixpkgs.lib;
       mkConf = import ./lib/mkconf.nix;
 
@@ -27,10 +24,10 @@
     {
       nixosConfigurations = {
         zenix = mkConf "zenix" {
-          inherit pkgs nixpkgs system user userName home-manager hyprland;
+          inherit inputs nixpkgs system user userName home-manager hyprland;
         };
         FCS-Tristan-Nixbook = mkConf "work" {
-          inherit pkgs nixpkgs system user userName home-manager hyprland;
+          inherit inputs nixpkgs system user userName home-manager hyprland;
           work = true;
         };
       };
diff --git a/global/system.nix b/global/system.nix
index 3a9c502..70a8793 100644
--- a/global/system.nix
+++ b/global/system.nix
@@ -81,9 +81,6 @@ user: { config, pkgs, ... }:
 
   services.printing.enable = true;
 
-  # services.flatpak.enable = true;
-  xdg.portal.enable = true;
-
   users.users.${user} = {
     isNormalUser = true;
     extraGroups = [ "wheel" "video" "networkmanager" ];
diff --git a/lib/mkconf.nix b/lib/mkconf.nix
index a7e552a..13d667f 100644
--- a/lib/mkconf.nix
+++ b/lib/mkconf.nix
@@ -1,5 +1,6 @@
 name:
 { nixpkgs
+, inputs
 , home-manager
 , system
 , user
@@ -11,10 +12,18 @@ name:
 }:
 
 nixpkgs.lib.nixosSystem rec {
+  specialArgs = { inherit inputs; };
+
   inherit system;
 
   modules = [
 
+    ({inputs, pkgs, ...}: {
+      programs.hyprland = {
+        enable = true;
+        package = inputs.hyprland.packages.${pkgs.system}.hyprland;
+      };
+    })
     {
       nix.settings = {
         substituters = [ "https://hyprland.cachix.org" ];
diff --git a/lib/modules/wayland.nix b/lib/modules/wayland.nix
index 4b7c728..4791801 100644
--- a/lib/modules/wayland.nix
+++ b/lib/modules/wayland.nix
@@ -68,6 +68,8 @@ in
           bind = SUPER,       space, layoutmsg,swapwithmaster master
           bind = SUPER,       F,     fullscreen,
           bind = SUPER,       V,     togglefloating,
+          bind = SUPER,       W,     layoutmsg, orientationprev
+          bind = SUPER_SHIFT, W,     layoutmsg, orientationnext
           bind = SUPER_SHIFT, V,     togglegroup,
           bind = SUPER_SHIFT, h,     changegroupactive,b
           bind = SUPER_SHIFT, h,     moveintogroup,l
diff --git a/lib/scripts.nix b/lib/scripts.nix
index aef855e..3ef5aa1 100644
--- a/lib/scripts.nix
+++ b/lib/scripts.nix
@@ -37,7 +37,6 @@ in
         fi
       '';
       hotkeys = [
-        { key = "W"; }
         { modifier = ""; key = "XF86AudioPlay"; }
       ];
     }