diff --git a/flake.lock b/flake.lock
index b82f715..cdeda5d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1707923576,
-        "narHash": "sha256-vch1hvgoB2TEl1+0J9h5uPkTrL4zNFUxE/razagkqQQ=",
+        "lastModified": 1707151070,
+        "narHash": "sha256-jDz+459Iqn895HWnxhIPW0alIlDG7Ar1ZM0ONJysWbg=",
         "owner": "hercules-ci",
         "repo": "arion",
-        "rev": "2b1fa9a8e9e40bb8e65a677c6fdd66dae4f4676e",
+        "rev": "9e5caa2b4869c9094a39a7819511a88c35e35671",
         "type": "github"
       },
       "original": {
@@ -190,11 +190,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1707919853,
-        "narHash": "sha256-qxmBGDzutuJ/tsX4gp+Mr7fjxOZBbeT9ixhS5o4iFOw=",
+        "lastModified": 1707683400,
+        "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "043ba285c6dc20f36441d48525402bcb9743c498",
+        "rev": "21b078306a2ab68748abf72650db313d646cf2ca",
         "type": "github"
       },
       "original": {
@@ -329,11 +329,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1707689078,
-        "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
+        "lastModified": 1706913249,
+        "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
+        "rev": "e92b6015881907e698782c77641aa49298330223",
         "type": "github"
       },
       "original": {
@@ -345,11 +345,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1707786466,
-        "narHash": "sha256-yLPfrmW87M2qt+8bAmwopJawa+MJLh3M9rUbXtpUc1o=",
+        "lastModified": 1707650010,
+        "narHash": "sha256-dOhphIA4MGrH4ElNCy/OlwmN24MsnEqFjRR6+RY7jZw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "01885a071465e223f8f68971f864b15829988504",
+        "rev": "809cca784b9f72a5ad4b991e0e7bcf8890f9c3a6",
         "type": "github"
       },
       "original": {
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 0340bfb..fe7fff2 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -55,10 +55,8 @@ in
       xserver = {
         enable = true;
 
-        xkb = {
-          layout = "us";
-          variant = "altgr-intl";
-        };
+        layout = "us";
+        xkbVariant = "altgr-intl";
 
         libinput = {
           enable = true;
diff --git a/modules/desktop/polybar.nix b/modules/desktop/polybar.nix
index b822dd8..a01189c 100644
--- a/modules/desktop/polybar.nix
+++ b/modules/desktop/polybar.nix
@@ -39,7 +39,7 @@
             separator-foreground = "\${colors.disabled}";
             font-0 = "FiraCode Nerd Font";
             modules-left = "xworkspaces xwindow";
-            modules-right = "memory cpu wlan bat0 bat1";
+            modules-right = "memory cpu wlan battery";
             cursor-click = "pointer";
             cursor-scroll = "ns-resize";
             enable-ipc = true;
@@ -103,9 +103,12 @@
             interface-type = "wireless";
             label-connected = "%{F#F0C674}%{F-} %local_ip%";
           };
-          "battery-base" = {
+
+          "module/battery" = {
             type = "internal/battery";
             poll-interval = 1;
+            battery = "BAT0";
+            adapter = "ADP1";
             time-format = "%H%{F#7c6f64}:%{F#d5c4a1}%M";
             label-charging = "%{F#98971a}󰚥 %{F#ebdbb2}%percentage%%%{F#d5c4a1} %time%";
             format-charging = "<ramp-capacity> <label-charging>";
@@ -128,16 +131,6 @@
               "%{F#98971a}󰁹"
             ];
           };
-          "module/bat0" = {
-            "inherit" = "battery-base";
-            battery = "BAT0";
-            adapter = "ADP1";
-          };
-          "module/bat1" = {
-            "inherit" = "battery-base";
-            battery = "BAT1";
-            adapter = "ADP1";
-          };
 
           "settings" = {
             screenchange-reload = true;
diff --git a/modules/flatpak.nix b/modules/flatpak.nix
index e3683fe..cd44ac7 100644
--- a/modules/flatpak.nix
+++ b/modules/flatpak.nix
@@ -14,8 +14,6 @@ in
       services.flatpak.enable = true;
       xdg.portal = {
         enable = true;
-        # TODO
-        config.common.default = "*";
         extraPortals = [
           pkgs.xdg-desktop-portal-gtk
         ];