diff --git a/flake.lock b/flake.lock
index a8401976..3851fea9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1691963303,
-        "narHash": "sha256-zqvt4N4Ic06BrGo02itCIPTEKzVnGT0BtGbIr+aUGqE=",
+        "lastModified": 1692248770,
+        "narHash": "sha256-tZeFpETKQGbgnaSIO1AGWD27IyTcBm4D+A9d7ulQ4NM=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "3fcd83783a1e2ddad0f14821da4186a95bc76c50",
+        "rev": "511177ffe8226c78c9cf6a92a7b5f2df3684956b",
         "type": "github"
       },
       "original": {
@@ -43,11 +43,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692199161,
-        "narHash": "sha256-GqKApvQ1JCf5DzH/Q+P4nwuHb6MaQGaWTu41lYzveF4=",
+        "lastModified": 1693189188,
+        "narHash": "sha256-o6otfsB/ecudboYFwiCeL49BX3/8vRC/XUZTgkaDx54=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "4eed2457b053c4bbad7d90d2b3a1d539c2c9009c",
+        "rev": "00169fe4a6015a88c3799f0bf89689e06a4d4896",
         "type": "github"
       },
       "original": {
@@ -95,11 +95,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1692099905,
-        "narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=",
+        "lastModified": 1693208669,
+        "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f",
+        "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
         "type": "github"
       },
       "original": {
@@ -115,20 +115,20 @@
         "nixpkgs": [
           "nixpkgs-unstable"
         ],
+        "systems": "systems",
         "wlroots": "wlroots",
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1691078410,
-        "narHash": "sha256-t1Ksv5/xwRgi8oH9jyoIEuMHi9cYIZSg3yEJLYMb78Y=",
+        "lastModified": 1693240184,
+        "narHash": "sha256-Kk//DvJzpZre2SwEsgUpdAr0tU8Haz+TcuALHYqOQbA=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "9654749244117f7f150c6f2a2ce4dede6e8cbb25",
+        "rev": "df691859fbe0b1acee9fa5c97440b5953b8edb32",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "ref": "v0.28.0",
         "repo": "Hyprland",
         "type": "github"
       }
@@ -138,14 +138,18 @@
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
         ]
       },
       "locked": {
-        "lastModified": 1684265364,
-        "narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=",
+        "lastModified": 1691753796,
+        "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530",
+        "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
         "type": "github"
       },
       "original": {
@@ -166,11 +170,11 @@
         "nvim-luaref": "nvim-luaref"
       },
       "locked": {
-        "lastModified": 1692287182,
-        "narHash": "sha256-Tq6+YKDpXOLZX8fujgr/pf38cVH1tBsF2SpnuE9lj+c=",
+        "lastModified": 1693226220,
+        "narHash": "sha256-goTRFDplqvgeLMxuOE3o2Gs5v6cTdUYEDRH9PDRcVhk=",
         "owner": "konradmalik",
         "repo": "neovim-flake",
-        "rev": "8286576732f07a9e08caf3a026845b1079dd615e",
+        "rev": "3dbe2b05c74fe8e6069aeeefb9bb1d7aea642247",
         "type": "github"
       },
       "original": {
@@ -188,11 +192,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1692138954,
-        "narHash": "sha256-mZiGi4hRCEeIPvnqBj5HoOVChsuMClDhHjVXekxuVn4=",
+        "lastModified": 1693188222,
+        "narHash": "sha256-7C4OxJPtPoUqej//opeDWqJbqb/XE+S92UKOYiYJfP0=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "7854874367bf0c7dc5e6c1bcd8d8778a3794f927",
+        "rev": "e3389c1533d587672941f556a762ce21c7b00ee4",
         "type": "github"
       },
       "original": {
@@ -224,11 +228,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1691871742,
-        "narHash": "sha256-6yDNjfbAMpwzWL4y75fxs6beXHRANfYX8BNSPjYehck=",
+        "lastModified": 1692952286,
+        "narHash": "sha256-TsrtPv3+Q1KR0avZxpiJH+b6fX/R/hEQVHbjl1ebotY=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "430a56dd16fe583a812b2df44dca002acab2f4f6",
+        "rev": "817e297fc3352fadc15f2c5306909aa9192d7d97",
         "type": "github"
       },
       "original": {
@@ -240,11 +244,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1692134936,
-        "narHash": "sha256-Z68O969cioC6I3k/AFBxsuEwpJwt4l9fzwuAMUhCCs0=",
+        "lastModified": 1693183237,
+        "narHash": "sha256-c7OtyBkZ/vZE/WosBpRGRtkbWZjDHGJP7fg1FyB9Dsc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "bfd953b2c6de4f550f75461bcc5768b6f966be10",
+        "rev": "ea5234e7073d5f44728c499192544a84244bf35a",
         "type": "github"
       },
       "original": {
@@ -256,11 +260,11 @@
     },
     "nixpkgs-darwin": {
       "locked": {
-        "lastModified": 1692192038,
-        "narHash": "sha256-fXUZ7GF2VPoLGP0DmTbdUxCRRFVZWn09XvopOqDOAFg=",
+        "lastModified": 1693183237,
+        "narHash": "sha256-c7OtyBkZ/vZE/WosBpRGRtkbWZjDHGJP7fg1FyB9Dsc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b0c9d793fcab2f749ab3d543ba42facf90bb1bd9",
+        "rev": "ea5234e7073d5f44728c499192544a84244bf35a",
         "type": "github"
       },
       "original": {
@@ -287,11 +291,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1692219526,
-        "narHash": "sha256-5Kd+yjwPJAzUhC5FdLdrd97+aM6ZL124P6YwdErMimc=",
+        "lastModified": 1693240935,
+        "narHash": "sha256-x6HQp3lbtAyZf0x7lBkU7R2uknwEqTyMP86ADVo7hEo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9049df5a042d6496c7aaa41ced282f3798127eef",
+        "rev": "074dea1e11c459588b4da209cc487d57e1257539",
         "type": "github"
       },
       "original": {
@@ -303,11 +307,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1692190437,
-        "narHash": "sha256-yJUZzmzSmDYb9ONPnMQDru66RjZgGQZRvj3tQebkexk=",
+        "lastModified": 1693145325,
+        "narHash": "sha256-Gat9xskErH1zOcLjYMhSDBo0JTBZKfGS0xJlIRnj6Rc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9b2aa98db6b10503666a50f4eb93b2fc0d57bde5",
+        "rev": "cddebdb60de376c1bdb7a4e6ee3d98355453fe56",
         "type": "github"
       },
       "original": {
@@ -360,36 +364,50 @@
         ]
       },
       "locked": {
-        "lastModified": 1692253362,
-        "narHash": "sha256-CRrGwLcRwlsGzVhYWEn0d6vwH357hcBdvY6hQx6tWeo=",
-        "owner": "shyim",
+        "lastModified": 1693105804,
+        "narHash": "sha256-nlqNjW7dfucUJQqRGuG08MKPOSME8fLOCx/bd9hiEPs=",
+        "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "2557741644f883c76846e542d1a1404b31a9ebcf",
+        "rev": "0618c8f0ed5255ad74ee08d1618841ff5af85c86",
         "type": "github"
       },
       "original": {
-        "owner": "shyim",
-        "ref": "shyim-patch-1",
+        "owner": "Mic92",
         "repo": "sops-nix",
         "type": "github"
       }
     },
+    "systems": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
     "wlroots": {
       "flake": false,
       "locked": {
         "host": "gitlab.freedesktop.org",
-        "lastModified": 1690165843,
-        "narHash": "sha256-gv5kjss6REeQG0BmvK2gTx7jHLRdCnP25po6It6I6N8=",
+        "lastModified": 1692976565,
+        "narHash": "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3",
+        "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294",
         "type": "gitlab"
       },
       "original": {
         "host": "gitlab.freedesktop.org",
         "owner": "wlroots",
         "repo": "wlroots",
-        "rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3",
+        "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294",
         "type": "gitlab"
       }
     },
@@ -402,14 +420,18 @@
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
         ]
       },
       "locked": {
-        "lastModified": 1685385764,
-        "narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=",
+        "lastModified": 1691841170,
+        "narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1",
+        "rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 337a7b55..0025ed94 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,14 +35,13 @@
       };
     };
     sops-nix = {
-      # url = "github:Mic92/sops-nix";
-      url = "github:shyim/sops-nix/shyim-patch-1";
+      url = "github:Mic92/sops-nix";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
       inputs.nixpkgs-stable.follows = "nixpkgs";
     };
     nix-colors.url = "github:misterio77/nix-colors";
     hyprland = {
-      url = "github:hyprwm/Hyprland/v0.28.0";
+      url = "github:hyprwm/Hyprland";
       inputs.nixpkgs.follows = "nixpkgs-unstable";
     };
   };
diff --git a/home/konrad/common/optional/desktop/common/wayland-wm/waybar.nix b/home/konrad/common/optional/desktop/common/wayland-wm/waybar.nix
index bc9dc830..e9cc0830 100644
--- a/home/konrad/common/optional/desktop/common/wayland-wm/waybar.nix
+++ b/home/konrad/common/optional/desktop/common/wayland-wm/waybar.nix
@@ -36,7 +36,7 @@ in
 {
   programs.waybar = {
     enable = true;
-    package = inputs.hyprland.packages.${pkgs.system}.waybar-hyprland;
+    package = pkgs.unstable.waybar;
     settings = {
       secondary = {
         output = builtins.map (m: m.name) (builtins.filter (m: !m.isPrimary) config.monitors);
diff --git a/hosts/common/optional/wayland-wm.nix b/hosts/common/optional/wayland-wm.nix
index 3534c917..b088d02c 100644
--- a/hosts/common/optional/wayland-wm.nix
+++ b/hosts/common/optional/wayland-wm.nix
@@ -29,8 +29,8 @@ in
     wlr.enable = !anyHyprlandEnabled;
     # gtk portal needed to make gtk apps happy
     extraPortals = [
-      pkgs.xdg-desktop-portal-gtk
-    ] ++ lib.optionals anyHyprlandEnabled [ pkgs.xdg-desktop-portal-hyprland ];
+      pkgs.unstable.xdg-desktop-portal-gtk
+    ];
   };
 
   hardware.opengl = {
diff --git a/hosts/m3800/hardware-configuration.nix b/hosts/m3800/hardware-configuration.nix
index 0479e94f..d69e6816 100644
--- a/hosts/m3800/hardware-configuration.nix
+++ b/hosts/m3800/hardware-configuration.nix
@@ -17,7 +17,7 @@
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "sd_mod" "rtsx_pci_sdmmc" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
@@ -30,5 +30,10 @@
   # networking.interfaces.wlp6s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  hardware = {
+    cpu.intel.updateMicrocode = true;
+    enableRedistributableFirmware = true;
+    enableAllFirmware = true;
+  };
 }
diff --git a/hosts/vaio/hardware-configuration.nix b/hosts/vaio/hardware-configuration.nix
index 80db6ef5..85851cc4 100644
--- a/hosts/vaio/hardware-configuration.nix
+++ b/hosts/vaio/hardware-configuration.nix
@@ -33,5 +33,9 @@
   # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware = {
+    cpu.intel.updateMicrocode = true;
+    enableRedistributableFirmware = true;
+    enableAllFirmware = true;
+  };
 }
diff --git a/hosts/xps12/hardware-configuration.nix b/hosts/xps12/hardware-configuration.nix
index eca03935..276528f7 100644
--- a/hosts/xps12/hardware-configuration.nix
+++ b/hosts/xps12/hardware-configuration.nix
@@ -30,5 +30,9 @@
   # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware = {
+    cpu.intel.updateMicrocode = true;
+    enableRedistributableFirmware = true;
+    enableAllFirmware = true;
+  };
 }