diff --git a/flake.lock b/flake.lock
index b99c1a8..77178e5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1677757546,
-        "narHash": "sha256-tA1ukoluctzLVyWRaKtD4KlTwgXbUsGB5vcyni1OJ9I=",
+        "lastModified": 1681092193,
+        "narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "86bb69b0b1e10d99a30c4352f230f03106dd0f8a",
+        "rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
         "type": "github"
       },
       "original": {
@@ -24,11 +24,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1678095239,
-        "narHash": "sha256-4F6jovFJcwh6OkMsY94ZrHdrvVqZi1FX5pYv6V9LIQw=",
+        "lastModified": 1680876084,
+        "narHash": "sha256-eP9yxP0wc7XuVaODugh+ajgbFGaile2O1ihxiLxOuvU=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "f6610997b0fc5ea5f9e142c348fca27497efe1c7",
+        "rev": "3006d2860a6ed5e01b0c3e7ffb730e9b293116e2",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1678137616,
-        "narHash": "sha256-T+lWTRdcYaOnZQW+Ehdlg+YldC2l9cq2GXJFPq22Nxc=",
+        "lastModified": 1681041438,
+        "narHash": "sha256-NmRGMklxBZ8Ol47CKMQxAU1F+v8ySpsHAAiC7ZL4vxY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "7edcdf7b169c33cd3eef9aba50521ce93ee666b8",
+        "rev": "48dcbaf7fa799509cbec85d55b8d62dcf1477d57",
         "type": "github"
       },
       "original": {
@@ -55,11 +55,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1678111249,
-        "narHash": "sha256-ZTIbK7vthZwti5XeLZE+twkb4l44q01q2XoLMmmJe94=",
+        "lastModified": 1681036984,
+        "narHash": "sha256-AbScJXshYzbeUKHh+Y3OICc3iAtr+NqJ3Xb81GW+ptU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a028e2873d7fcf44e66b784b4ba061824315537f",
+        "rev": "fd531dee22c9a3d4336cc2da39e8dd905e8f3de4",
         "type": "github"
       },
       "original": {
diff --git a/home/sway.nix b/home/sway.nix
index ea4f506..64ae222 100644
--- a/home/sway.nix
+++ b/home/sway.nix
@@ -32,14 +32,15 @@ let
     extraWorkspaces;
 in
 {
+  home.sessionVariables = {
+    MOZ_USE_XINPUT2 = 1;
+    _JAVA_AWT_WM_NONREPARENTING = 1;
+    GTK_THEME = "Adwaita-dark";
+    NIXOS_OZONE_WL = 1;
+  };
   wayland.windowManager.sway = {
     enable = true;
     wrapperFeatures.gtk = true;
-    extraSessionCommands = ''
-      export MOZ_USE_XINPUT2=1
-      export _JAVA_AWT_WM_NONREPARENTING=1
-      export GTK_THEME=Adwaita-dark
-    '';
     config = {
       modifier = "Mod4";
       terminal = "kitty";
diff --git a/sets/1password.nix b/sets/1password.nix
index ecc29e1..05be735 100644
--- a/sets/1password.nix
+++ b/sets/1password.nix
@@ -1,10 +1,11 @@
-{ pkgs, ... }:
+{ pkgs-unstable, ... }:
 
 {
-  environment.systemPackages = with pkgs; [
-    _1password
-    _1password-gui
-  ];
+  programs._1password-gui = {
+    enable = true;
+    package = pkgs-unstable._1password-gui;
+    polkitPolicyOwners = [ "artemis" ];
+  };
   services.gnome.gnome-keyring.enable = true;
   programs.seahorse.enable = true;
 }
diff --git a/sets/ime.nix b/sets/ime.nix
new file mode 100644
index 0000000..a65efc3
--- /dev/null
+++ b/sets/ime.nix
@@ -0,0 +1,16 @@
+{ pkgs, ... }:
+
+{
+  i18n.inputMethod = {
+    enabled = "fcitx5";
+    fcitx5.addons = with pkgs; [ fcitx5-mozc fcitx5-gtk ];
+  };
+  environment.systemPackages = with pkgs; [ fcitx5-configtool ];
+
+  # Required for support in kitty, ibus/fcitx5 are somewhat compatible so this works
+  environment.variables.GLFW_IM_MODULE = "ibus";
+
+  home-manager.users.artemis.wayland.windowManager.sway.config.startup = [
+    { command = "fcitx5 -d --replace"; always = true; }
+  ];
+}
diff --git a/sets/workstation.nix b/sets/workstation.nix
index c49001b..e01d66d 100644
--- a/sets/workstation.nix
+++ b/sets/workstation.nix
@@ -10,6 +10,7 @@
   ];
 
   i18n.defaultLocale = "de_DE.UTF-8";
+  i18n.supportedLocales = [ "all" ];
 
   environment = {
     variables.EDITOR = "nvim";
diff --git a/system/starlight/default.nix b/system/starlight/default.nix
index f926d58..82c9ded 100644
--- a/system/starlight/default.nix
+++ b/system/starlight/default.nix
@@ -14,6 +14,7 @@
     ../../sets/sshd.nix
     ../../sets/virtualization.nix
     ../../sets/workstation.nix
+    ../../sets/ime.nix
     ../../sets/1password.nix
     inputs.nixos-hardware.nixosModules.common-cpu-amd
     inputs.nixos-hardware.nixosModules.common-gpu-amd