diff --git a/home-manager/desktop.nix b/home-manager/desktop.nix
index 53a282c..1e79967 100644
--- a/home-manager/desktop.nix
+++ b/home-manager/desktop.nix
@@ -28,11 +28,8 @@ in {
   };
   programs.mako.enable = true;
   programs.mako.defaultTimeout = 60 * 1000; # ms
-  services = {
-    gpg-agent.extraConfig = ''
-      pinentry-program ${pkgs.pinentry_gnome}/bin/pinentry-gnome3
-    '';
-  };
+  # todo broken
+  # services.gpg-agent.pinentryFlavor = "gnome3";
   wayland.windowManager.sway = {
     enable = true;
     config = {
@@ -151,12 +148,14 @@ in {
     systemdIntegration = true;
   };
 
-  # programs.firefox = {
-  #   enable = true;
-  #   package = pkgs.wrapFirefox pkgs.firefox-unwrapped {
-  #     forceWayland = true;
-  #   };
-  # };
+  programs.firefox = {
+    # TODO: back to mozilla
+    enable = true;
+    package = pkgs.wrapFirefox pkgs.latest.firefox-bin.unwrapped {
+      forceWayland = true;
+      applicationName = "firefox";
+    };
+  };
   home.sessionVariables = {
     MOZ_USE_XINPUT2 = "1";
     MOZ_ENABLE_WAYLAND = "1";
diff --git a/home-manager/home.nix b/home-manager/home.nix
index 19f27e1..15711e0 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -1,9 +1,5 @@
 { lib, config, options, pkgs, ... }:
 let
-  y-firefox = pkgs.wrapFirefox pkgs.latest.firefox-bin.unwrapped {
-    forceWayland = true;
-    applicationName = "firefox";
-  };
   thefuck-alias = shell:
     pkgs.runCommand "thefuck-alias" {
       TF_SHELL = shell;
@@ -257,7 +253,7 @@ in {
 
     ## apps
     alacritty
-    calibre
+    #calibre #TODO
     chromium
     discord
     fanficfare
@@ -270,7 +266,6 @@ in {
     tdesktop
     virt-manager
     wireshark
-    y-firefox
     yubioath-desktop
 
     ## games
diff --git a/nix/sources.json b/nix/sources.json
index 63a748c..f03341d 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -5,10 +5,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "df459e39ce667fc1455a1fa05dc107ae624f671a",
-        "sha256": "0wrbjjr6nm9k8pafj8x5iic1bikxkpq00r1z675xv5m48m78cbf9",
+        "rev": "6fbb210637d80ab228cf2cab60ef59996ce76391",
+        "sha256": "0aqd68lqqjvlk2dgs5k2d755knkgz4rv42wqq0y3wxdmz92pi0xw",
         "type": "tarball",
-        "url": "https://github.com/nix-community/emacs-overlay/archive/df459e39ce667fc1455a1fa05dc107ae624f671a.tar.gz",
+        "url": "https://github.com/nix-community/emacs-overlay/archive/6fbb210637d80ab228cf2cab60ef59996ce76391.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "home-manager": {
@@ -17,10 +17,10 @@
         "homepage": "https://nix-community.github.io/home-manager/",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8eb7c009f09f1f7b1ec151e5d537104acf42213a",
-        "sha256": "1j8nv6y5r9gsp6ws1bqzbqlz444qd8lz1xm848ii8ycimw9b0icr",
+        "rev": "7add9ce2e5c517fcc4b25b3ed13e7e28cd325034",
+        "sha256": "12wzr6f7xvyzgami0lbr3xsncg6jryabkgl59qc2fg79s951hins",
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/8eb7c009f09f1f7b1ec151e5d537104acf42213a.tar.gz",
+        "url": "https://github.com/nix-community/home-manager/archive/7add9ce2e5c517fcc4b25b3ed13e7e28cd325034.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "niv": {
@@ -29,10 +29,10 @@
         "homepage": "https://github.com/nmattia/niv",
         "owner": "nmattia",
         "repo": "niv",
-        "rev": "9cb7ef336bb71fd1ca84fc7f2dff15ef4b033f2a",
-        "sha256": "1ajyqr8zka1zlb25jx1v4xys3zqmdy3prbm1vxlid6ah27a8qnzh",
+        "rev": "df49d53b71ad5b6b5847b32e5254924d60703c46",
+        "sha256": "1j5p8mi1wi3pdcq0lfb881p97i232si07nb605dl92cjwnira88c",
         "type": "tarball",
-        "url": "https://github.com/nmattia/niv/archive/9cb7ef336bb71fd1ca84fc7f2dff15ef4b033f2a.tar.gz",
+        "url": "https://github.com/nmattia/niv/archive/df49d53b71ad5b6b5847b32e5254924d60703c46.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixos-hardware": {
@@ -41,10 +41,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "816a935bf5aa5f77cb1f03ebfe20ab13b112d0f1",
-        "sha256": "1dldbr0ikwb28ramzncriylfr8v6chf5wsadm844wx3487hx4sxr",
+        "rev": "1a0ccdbf4583ed0fce37eea7955e8ef90f840a9f",
+        "sha256": "094fs5l51ih2gm5ssg56rcryq4dybsxwi2sjhya34v8ycnpr636d",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixos-hardware/archive/816a935bf5aa5f77cb1f03ebfe20ab13b112d0f1.tar.gz",
+        "url": "https://github.com/nixos/nixos-hardware/archive/1a0ccdbf4583ed0fce37eea7955e8ef90f840a9f.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixos-mailserver": {
@@ -73,22 +73,22 @@
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58",
-        "sha256": "01j7nhxbb2kjw38yk4hkjkkbmz50g3br7fgvad6b1cjpdvfsllds",
+        "rev": "5181d5945eda382ff6a9ca3e072ed6ea9b547fee",
+        "sha256": "1hljcdmvl2kwlq68pyhlc2g5dswdgb6by9m1pppcdm3a86fhinvh",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/73ad5f9e147c0d2a2061f1d4bd91e05078dc0b58.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/5181d5945eda382ff6a9ca3e072ed6ea9b547fee.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-mozilla": {
         "branch": "master",
         "description": "mozilla related nixpkgs (extends nixos/nixpkgs repo)",
         "homepage": "",
-        "owner": "mozilla",
+        "owner": "K900",
         "repo": "nixpkgs-mozilla",
-        "rev": "15b7a05f20aab51c4ffbefddb1b448e862dccb7d",
-        "sha256": "0admybxrjan9a04wq54c3zykpw81sc1z1nqclm74a7pgjdp7iqv1",
+        "rev": "c533dd0fa5010da04601f381562c0d1f62e756ed",
+        "sha256": "1b6p0rly0rywq60ks84ghc0n5zrqiafc2r64nlbnlkh9whmh5fmj",
         "type": "tarball",
-        "url": "https://github.com/mozilla/nixpkgs-mozilla/archive/15b7a05f20aab51c4ffbefddb1b448e862dccb7d.tar.gz",
+        "url": "https://github.com/K900/nixpkgs-mozilla/archive/c533dd0fa5010da04601f381562c0d1f62e756ed.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-wayland": {
@@ -97,10 +97,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "d27494f618f938c94e0f89108214e1a888e52f25",
-        "sha256": "1qya6xm4j9mhk82f282sj5bmkcxa1a6ccv115qcl1gmdx0142n74",
+        "rev": "7edb849271e82862e343c9e86cf38cdc825ba5b0",
+        "sha256": "11l7hf4kibfpjak4qw08322db5xcigd3nwq6ymbybpglyhdy6p5j",
         "type": "tarball",
-        "url": "https://github.com/nix-community/nixpkgs-wayland/archive/d27494f618f938c94e0f89108214e1a888e52f25.tar.gz",
+        "url": "https://github.com/nix-community/nixpkgs-wayland/archive/7edb849271e82862e343c9e86cf38cdc825ba5b0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }
diff --git a/nixos/roles/server.nix b/nixos/roles/server.nix
index a61b81e..5b97dd3 100644
--- a/nixos/roles/server.nix
+++ b/nixos/roles/server.nix
@@ -6,13 +6,11 @@
   environment.noXlibs = true;
   networking.firewall.logRefusedConnections =
     false; # Silence logging of scanners and knockers
+
   # TODO: upstream with noXlibs
-  # https://github.com/NixOS/nixpkgs/pull/107394
   nixpkgs.overlays = [
     (self: super: {
-      elixir_1_8 =
-        (self.beam.packagesWith (self.beam.interpreters.erlang_nox)).elixir_1_8;
-      erlang = super.erlang_nox;
+      libdecor = null;
     })
   ];
 }