diff --git a/flake.lock b/flake.lock
index 54aac8d..48adc6a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -166,9 +166,7 @@
         "advisory-db": "advisory-db",
         "crane": "crane",
         "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "lastModified": 1693509848,
@@ -188,9 +186,7 @@
       "inputs": {
         "fenix": "fenix",
         "flake-utils": "flake-utils_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1659395338,
@@ -213,11 +209,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730190761,
-        "narHash": "sha256-o5m5WzvY6cGIDupuOvjgNSS8AN6yP2iI9MtUC6q/uos=",
+        "lastModified": 1733168902,
+        "narHash": "sha256-8dupm9GfK+BowGdQd7EHK5V61nneLfr9xR6sc5vtDi0=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "3979285062d6781525cded0f6c4ff92e71376b55",
+        "rev": "785c1e02c7e465375df971949b8dcbde9ec362e5",
         "type": "github"
       },
       "original": {
@@ -228,16 +224,14 @@
     },
     "dzgui-nix": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1727831626,
-        "narHash": "sha256-Gvt5lapgNRRTL95gFH8vm48f8gjsk7GYM4Qo5aUOzzo=",
+        "lastModified": 1733974299,
+        "narHash": "sha256-fPvJ/ZsQGVqGJqYL2gKotalQUoG1wpUYTJkRKG2BrwA=",
         "owner": "lelgenio",
         "repo": "dzgui-nix",
-        "rev": "38cf2b507d75cc36ec127b21fc5a4144fc821525",
+        "rev": "580022e73efedb17ddf640115539cb9bd1423d44",
         "type": "github"
       },
       "original": {
@@ -371,7 +365,7 @@
     },
     "flake-utils_5": {
       "inputs": {
-        "systems": "systems_6"
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -389,7 +383,7 @@
     },
     "flake-utils_6": {
       "inputs": {
-        "systems": "systems_7"
+        "systems": "systems_6"
       },
       "locked": {
         "lastModified": 1681202837,
@@ -407,7 +401,7 @@
     },
     "flake-utils_7": {
       "inputs": {
-        "systems": "systems_8"
+        "systems": "systems_7"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -446,16 +440,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1726989464,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "lastModified": 1733951536,
+        "narHash": "sha256-Zb5ZCa7Xj+0gy5XVXINTSr71fCfAv+IKtmIXNrykT54=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "1318c3f3b068cdcea922fa7c1a0a1f0c96c22f5f",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
@@ -464,9 +458,7 @@
       "inputs": {
         "crane": "crane_2",
         "flake-utils": "flake-utils_4",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
         "lastModified": 1728159958,
@@ -489,11 +481,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1729999765,
-        "narHash": "sha256-LYsavZXitFjjyETZoij8usXjTa7fa9AIF3Sk3MJSX+Y=",
+        "lastModified": 1733629314,
+        "narHash": "sha256-U0vivjQFAwjNDYt49Krevs1murX9hKBFe2Ye0cHpgbU=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "0e3a8778c2ee218eff8de6aacf3d2fa6c33b2d4f",
+        "rev": "f1e477a7dd11e27e7f98b646349cd66bbabf2fb8",
         "type": "github"
       },
       "original": {
@@ -511,46 +503,46 @@
         ],
         "nixpkgs-24_05": [
           "nixpkgs"
-        ],
-        "utils": "utils"
+        ]
       },
       "locked": {
-        "lastModified": 1718084203,
-        "narHash": "sha256-Cx1xoVfSMv1XDLgKg08CUd1EoTYWB45VmB9XIQzhmzI=",
+        "lastModified": 1722877200,
+        "narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b",
+        "rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
         "type": "gitlab"
       },
       "original": {
         "owner": "simple-nixos-mailserver",
-        "ref": "nixos-24.05",
+        "ref": "master",
         "repo": "nixos-mailserver",
         "type": "gitlab"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730137625,
-        "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
+        "lastModified": 1684425776,
+        "narHash": "sha256-eXzSIXkzXa9EecoDF9xCsoim0vd++8dvYU7QOuQMO8A=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
+        "rev": "8dc174d8b768893172eb3e52008f10f48dfbd5cf",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-24.05",
-        "type": "indirect"
+        "owner": "NixOS",
+        "ref": "release-22.11",
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1729880355,
-        "narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
+        "lastModified": 1733759999,
+        "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
+        "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
         "type": "github"
       },
       "original": {
@@ -559,6 +551,99 @@
         "type": "indirect"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1659219666,
+        "narHash": "sha256-pzYr5fokQPHv7CmUXioOhhzDy/XyWOIXP4LZvv/T7Mk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "7b9be38c7250b22d829ab6effdee90d5e40c6e5c",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1733749988,
+        "narHash": "sha256-+5qdtgXceqhK5ZR1YbP1fAUsweBIrhL38726oIEAtDs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "bc27f0fde01ce4e1bfec1ab122d72b7380278e68",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixpkgs-unstable",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1719010183,
+        "narHash": "sha256-8HMWaqpyjbVeEsmy/A2H6VFtW/Wr71vkPLnpTiAXu+8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0f620ca71fa69abb411a6c78739a9b171a0a95a6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1733808091,
+        "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "ref": "nixos-24.11",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1719010183,
+        "narHash": "sha256-8HMWaqpyjbVeEsmy/A2H6VFtW/Wr71vkPLnpTiAXu+8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0f620ca71fa69abb411a6c78739a9b171a0a95a6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "release-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1714091391,
+        "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "plymouth-themes": {
       "flake": false,
       "locked": {
@@ -578,11 +663,11 @@
     "ranger-icons": {
       "flake": false,
       "locked": {
-        "lastModified": 1713564482,
-        "narHash": "sha256-sijO9leDXgnjgcVlh5fKYalhjOupwFMRyH0xh2g/rEQ=",
+        "lastModified": 1732436707,
+        "narHash": "sha256-sqqsWU5/zBwIpyJKEBiCfosqKNvISWCw8cFgzLcNjUY=",
         "owner": "alexanderjeurissen",
         "repo": "ranger_devicons",
-        "rev": "a8d626485ca83719e1d8d5e32289cd96a097c861",
+        "rev": "84db73d0a50a8c6085b3ec63f834c781b603e83e",
         "type": "github"
       },
       "original": {
@@ -604,7 +689,7 @@
         "made-you-look": "made-you-look",
         "nix-index-database": "nix-index-database",
         "nixos-mailserver": "nixos-mailserver",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_5",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "plymouth-themes": "plymouth-themes",
         "ranger-icons": "ranger-icons",
@@ -765,21 +850,6 @@
         "type": "github"
       }
     },
-    "systems_8": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tlauncher": {
       "inputs": {
         "flake-utils": "flake-utils_5",
@@ -788,11 +858,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1684504342,
-        "narHash": "sha256-rJ0eH7BuPizvXPc+LjVtovse4gWEuxP2WiyNdXjPNL4=",
+        "lastModified": 1734044605,
+        "narHash": "sha256-CeCYv3JFJIySSf2eX9ceEOF1FqNGeJnzEuO5f+OvioQ=",
         "ref": "refs/heads/main",
-        "rev": "add4df7220bd0b85177a1938c02b60c966c5eb71",
-        "revCount": 3,
+        "rev": "6a68f2cda0aa2fbb399a4c43b445e8c1a2df0634",
+        "revCount": 4,
         "type": "git",
         "url": "https://git.lelgenio.xyz/lelgenio/tlauncher-nix"
       },
@@ -817,31 +887,13 @@
         "url": "https://git.lelgenio.com/lelgenio/tomater"
       }
     },
-    "utils": {
-      "inputs": {
-        "systems": "systems_5"
-      },
-      "locked": {
-        "lastModified": 1709126324,
-        "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "d465f4819400de7c8d874d50b982301f28a84605",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "vpsadminos": {
       "locked": {
-        "lastModified": 1730290190,
-        "narHash": "sha256-a+op2lnWrCytuEhLOE24SKR/irRfjwDEHkpLyAL5P90=",
+        "lastModified": 1733157322,
+        "narHash": "sha256-lN6AY1zxZ0mQzpvLIfpdHdZ7oThHOlWFb2HUeOVcCJQ=",
         "owner": "vpsfreecz",
         "repo": "vpsadminos",
-        "rev": "63ac771b9667b45ab2ea87363f69ca7f85668e9b",
+        "rev": "8ba8b0885526f484da44c0aeb4894dbaf548e61f",
         "type": "github"
       },
       "original": {
@@ -854,9 +906,7 @@
       "inputs": {
         "crane": "crane_3",
         "flake-utils": "flake-utils_6",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1719076817,
@@ -875,9 +925,7 @@
     "wl-crosshair": {
       "inputs": {
         "flake-utils": "flake-utils_7",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
         "lastModified": 1715216838,
diff --git a/flake.nix b/flake.nix
index e7f5813..c580335 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,10 +1,10 @@
 {
   description = "My system config";
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-24.05";
+    nixpkgs.url = "nixpkgs/nixos-24.11";
     nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
 
-    home-manager.url = "github:nix-community/home-manager/release-24.05";
+    home-manager.url = "github:nix-community/home-manager/release-24.11";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
 
     vpsadminos.url = "github:vpsfreecz/vpsadminos";
@@ -27,45 +27,29 @@
     };
 
     nixos-mailserver = {
-      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
+      url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.nixpkgs-24_05.follows = "nixpkgs";
     };
 
-    dzgui-nix = {
-      url = "github:lelgenio/dzgui-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    dzgui-nix.url = "github:lelgenio/dzgui-nix";
 
     tlauncher = {
       url = "git+https://git.lelgenio.xyz/lelgenio/tlauncher-nix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    disko.url = "github:nix-community/disko";
-    disko.inputs.nixpkgs.follows = "nixpkgs";
+    disko = {
+      url = "github:nix-community/disko";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # my stuff
-    dhist = {
-      url = "github:lelgenio/dhist";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    demoji = {
-      url = "github:lelgenio/demoji";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    wl-crosshair = {
-      url = "github:lelgenio/wl-crosshair";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    warthunder-leak-counter = {
-      url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    made-you-look = {
-      url = "git+https://git.lelgenio.com/lelgenio/made-you-look";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    dhist.url = "github:lelgenio/dhist";
+    demoji.url = "github:lelgenio/demoji";
+    wl-crosshair.url = "github:lelgenio/wl-crosshair";
+    warthunder-leak-counter.url = "git+https://git.lelgenio.com/lelgenio/warthunder-leak-counter";
+    made-you-look.url = "git+https://git.lelgenio.com/lelgenio/made-you-look";
     catboy-spinner = {
       url = "git+https://git.lelgenio.com/lelgenio/catboy-spinner";
       flake = false;
@@ -115,7 +99,6 @@
           { login-manager.greetd.enable = desktop == "sway"; }
 
           inputs.agenix.nixosModules.default
-          inputs.dzgui-nix.nixosModules.default
           inputs.home-manager.nixosModules.home-manager
           inputs.disko.nixosModules.disko
           {
diff --git a/hosts/double-rainbow.nix b/hosts/double-rainbow.nix
index 4c8636a..af8c5e4 100644
--- a/hosts/double-rainbow.nix
+++ b/hosts/double-rainbow.nix
@@ -37,7 +37,8 @@ in
     options = [ "subvol=@" ] ++ btrfs_options ++ btrfs_ssd;
   };
 
-  boot.initrd.luks.devices."luks-d6573cf8-25f0-4ffc-8046-ac3a4db1e964".device = "/dev/disk/by-uuid/d6573cf8-25f0-4ffc-8046-ac3a4db1e964";
+  boot.initrd.luks.devices."luks-d6573cf8-25f0-4ffc-8046-ac3a4db1e964".device =
+    "/dev/disk/by-uuid/d6573cf8-25f0-4ffc-8046-ac3a4db1e964";
 
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/97EB-7DB5";
diff --git a/hosts/monolith/amdgpu.nix b/hosts/monolith/amdgpu.nix
index f3cefaa..0df9923 100644
--- a/hosts/monolith/amdgpu.nix
+++ b/hosts/monolith/amdgpu.nix
@@ -25,16 +25,13 @@ in
     wantedBy = [ "multi-user.target" ];
   };
 
-  hardware.opengl.driSupport = true;
-  # # For 32 bit applications
-  hardware.opengl.driSupport32Bit = true;
+  hardware.graphics.enable32Bit = true;
 
-  hardware.opengl.extraPackages = with pkgs; [
+  hardware.graphics.extraPackages = with pkgs; [
     libva
     libvdpau
     vaapiVdpau
-    rocm-opencl-icd
-    rocm-opencl-runtime
+    rocmPackages.clr
     rocmPackages.rocm-smi
   ];
 
diff --git a/hosts/monolith/default.nix b/hosts/monolith/default.nix
index f4fde3a..77dfa50 100644
--- a/hosts/monolith/default.nix
+++ b/hosts/monolith/default.nix
@@ -35,7 +35,11 @@ in
     "sd_mod"
   ];
 
-  hardware.opentabletdriver.enable = true;
+  hardware.opentabletdriver = {
+    enable = true;
+    # TODO: remove this once otd gets updated
+    package = pkgs.unstable.opentabletdriver;
+  };
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
diff --git a/hosts/phantom/lemmy.nix b/hosts/phantom/lemmy.nix
index 61bf2e4..0e6ee1a 100644
--- a/hosts/phantom/lemmy.nix
+++ b/hosts/phantom/lemmy.nix
@@ -1,3 +1,4 @@
+{ pkgs, ... }:
 {
   services.lemmy = {
     enable = true;
@@ -8,6 +9,8 @@
     nginx.enable = true;
   };
 
+  services.pict-rs.package = pkgs.pict-rs;
+
   services.nginx.virtualHosts."lemmy.lelgenio.com" = {
     enableACME = true;
     forceSSL = true;
diff --git a/hosts/phantom/nextcloud.nix b/hosts/phantom/nextcloud.nix
index 88f0b02..a7ef9f3 100644
--- a/hosts/phantom/nextcloud.nix
+++ b/hosts/phantom/nextcloud.nix
@@ -7,7 +7,7 @@
 {
   services.nextcloud = {
     enable = true;
-    package = pkgs.nextcloud29;
+    package = pkgs.nextcloud30;
     hostName = "cloud.lelgenio.com";
     https = true;
     config = {
diff --git a/pkgs/gnome-pass-search-provider.nix b/pkgs/gnome-pass-search-provider.nix
index e149505..ab2e94a 100644
--- a/pkgs/gnome-pass-search-provider.nix
+++ b/pkgs/gnome-pass-search-provider.nix
@@ -5,7 +5,6 @@
   wrapGAppsHook,
   gtk3,
   gobject-introspection,
-  gnome,
 }:
 
 let
diff --git a/system/configuration.nix b/system/configuration.nix
index b905240..5db8efc 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -43,7 +43,7 @@
     glib # gsettings
     usbutils
     # dracula-theme # gtk theme
-    gnome3.adwaita-icon-theme # default gnome cursors
+    adwaita-icon-theme # default gnome cursors
   ];
 
   services.geoclue2.enable = true;
diff --git a/system/fonts.nix b/system/fonts.nix
index d8bff5a..2815563 100644
--- a/system/fonts.nix
+++ b/system/fonts.nix
@@ -3,7 +3,7 @@
   fonts.enableDefaultPackages = true;
   fonts.packages = with pkgs; [
     noto-fonts
-    noto-fonts-cjk
+    noto-fonts-cjk-sans
     noto-fonts-emoji
     nerdfonts_fira_hack
   ];
diff --git a/system/nix.nix b/system/nix.nix
index c91e362..482bb93 100644
--- a/system/nix.nix
+++ b/system/nix.nix
@@ -44,7 +44,7 @@ in
       ];
     };
     extraOptions = ''
-      experimental-features = nix-command flakes repl-flake
+      experimental-features = nix-command flakes
     '';
   };
 }
diff --git a/system/sound.nix b/system/sound.nix
index 8ef55ab..f04e513 100644
--- a/system/sound.nix
+++ b/system/sound.nix
@@ -1,6 +1,5 @@
 { pkgs, ... }:
 {
-  sound.enable = true;
   hardware.pulseaudio.enable = false;
   services.pipewire = {
     enable = true;
diff --git a/system/steam.nix b/system/steam.nix
index 1d8b412..f82c958 100644
--- a/system/steam.nix
+++ b/system/steam.nix
@@ -31,7 +31,6 @@
   environment.systemPackages = with pkgs; [
     protontricks
     bottles
+    inputs.dzgui-nix.packages.${pkgs.system}.default
   ];
-
-  programs.dzgui.enable = true;
 }
diff --git a/user/firefox.nix b/user/firefox.nix
index 063cd26..4b69ad2 100644
--- a/user/firefox.nix
+++ b/user/firefox.nix
@@ -123,6 +123,7 @@ in
             if desktop == "sway" then
               ''
                 #titlebar { display: none !important; }
+                #TabsToolbar { display: none !important; }
                 #sidebar-header { display: none !important; }
               ''
             else
diff --git a/user/gnome.nix b/user/gnome.nix
index 443f1fe..74951c7 100644
--- a/user/gnome.nix
+++ b/user/gnome.nix
@@ -10,7 +10,7 @@ lib.mkIf (config.my.desktop == "gnome") {
   home.pointerCursor = {
     name = "Adwaita";
     size = 24;
-    package = pkgs.gnome.adwaita-icon-theme;
+    package = pkgs.adwaita-icon-theme;
     gtk.enable = true;
   };
 
@@ -42,7 +42,7 @@ lib.mkIf (config.my.desktop == "gnome") {
     qt6Packages.qtstyleplugin-kvantum
   ];
 
-  services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;
+  services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome;
 
   xdg.defaultApplications = {
     enable = lib.mkForce false;
diff --git a/user/sway/sway-binds.nix b/user/sway/sway-binds.nix
index cd0ac9a..fd05236 100644
--- a/user/sway/sway-binds.nix
+++ b/user/sway/sway-binds.nix
@@ -166,7 +166,8 @@ let
   other_binds = {
     "${mod}+p" = "exec ${pkgs.wpass}/bin/wpass";
     "${mod}+s" = "exec ${menu}";
-    "${mod}+g" = "exec ${pkgs.demoji}/bin/demoji --lang pt --fallback --copy -- ${pkgs.wdmenu}/bin/wdmenu";
+    "${mod}+g" =
+      "exec ${pkgs.demoji}/bin/demoji --lang pt --fallback --copy -- ${pkgs.wdmenu}/bin/wdmenu";
     "${mod}+c" = "exec ${pkgs.color_picker}/bin/color_picker";
     "${mod}+Return" = "exec ${terminal}";
     "${mod}+Ctrl+Return" = "exec thunar";
diff --git a/user/vscode/default.nix b/user/vscode/default.nix
index 35d972b..b8afdfd 100644
--- a/user/vscode/default.nix
+++ b/user/vscode/default.nix
@@ -12,8 +12,11 @@
   };
 
   home.file = {
-    "${config.home.homeDirectory}/.config/VSCodium/User/keybindings.json".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/keybindings.json";
-    "${config.home.homeDirectory}/.config/VSCodium/User/settings.json".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/settings.json";
-    "${config.home.homeDirectory}/.config/VSCodium/product.json".source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/product.json";
+    "${config.home.homeDirectory}/.config/VSCodium/User/keybindings.json".source =
+      config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/keybindings.json";
+    "${config.home.homeDirectory}/.config/VSCodium/User/settings.json".source =
+      config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/settings.json";
+    "${config.home.homeDirectory}/.config/VSCodium/product.json".source =
+      config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/projects/nixos-config/user/vscode/product.json";
   };
 }