diff --git a/features/common-pkgs.nix b/features/common-pkgs.nix
new file mode 100644
index 0000000..b4bbf1b
--- /dev/null
+++ b/features/common-pkgs.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+with pkgs;
+[
+  wget
+  nil
+  bash-language-server
+  devenv
+  tmux
+  ripgrep
+  bind
+  p7zip
+  unrar
+  jump
+  openjdk
+  weather
+  nerd-fonts.hack
+]
diff --git a/features/i18n.nix b/features/i18n.nix
index abb8be0..6b7e7f5 100644
--- a/features/i18n.nix
+++ b/features/i18n.nix
@@ -6,7 +6,7 @@
     defaultLocale = "en_US.UTF-8";
 
     extraLocales = [
-      "ja_JP.UTF-8"
+      "ja_JP.UTF-8/UTF-8"
     ];
 
     extraLocaleSettings = {
diff --git a/features/sops.nix b/features/sops.nix
index 9adc570..db9ea66 100644
--- a/features/sops.nix
+++ b/features/sops.nix
@@ -51,7 +51,7 @@
 
       "remotebuild_ssh_key_rsa" = {
         sopsFile = ../secrets/remotebuild-ssh-key.yaml;
-        key = "remote_build_ssh_key";
+        key = "remotebuild_ssh_key_rsa";
         owner = "root";
         group = "root";
         mode = "0400";
diff --git a/hosts/shared/nixos-pc.nix b/hosts/shared/nixos-pc.nix
index df35340..68dd742 100644
--- a/hosts/shared/nixos-pc.nix
+++ b/hosts/shared/nixos-pc.nix
@@ -193,50 +193,29 @@
   };
 
   environment = {
-    systemPackages = with pkgs; [
-      wget
-      dnsmasq
-      guestfs-tools
-      unrar
-      p7zip
-      btrfs-assistant
-      nil
-      bash-language-server
-      nerd-fonts.hack
-      jump
-      weather
-      kdePackages.kfind
-      desktop-file-utils
-      openjdk
-      openjdk17
-      openjdk25
-      tmux
-      zathura
-      hunspell
-      hunspellDicts.en_US
-      hyphenDicts.en_US
-      affinity-v3
-      libreoffice-qt
-      qimgv
-      vorta
-      distrobox
-      devenv
-      ripgrep
-      rtk
+    systemPackages =
+      import ../../features/common-pkgs.nix { inherit pkgs; }
+      ++ (with pkgs; [
+        btrfs-assistant
+        kdePackages.kfind
+        desktop-file-utils
+        zathura
+        hunspell
+        hunspellDicts.en_US
+        hyphenDicts.en_US
+        affinity-v3
+        libreoffice-qt
+        qimgv
+        vorta
+        distrobox
+        rtk
 
-      inputs.appimage-manager.packages.${pkgs.stdenv.hostPlatform.system}.default
-      inputs.gloomberb.packages.${pkgs.stdenv.hostPlatform.system}.default
-      inputs.pi.packages.${pkgs.stdenv.hostPlatform.system}.default
+        inputs.appimage-manager.packages.${pkgs.stdenv.hostPlatform.system}.default
+        inputs.gloomberb.packages.${pkgs.stdenv.hostPlatform.system}.default
+        inputs.pi.packages.${pkgs.stdenv.hostPlatform.system}.default
 
-      (python3.withPackages (
-        python-pkgs: with python-pkgs; [
-          requests
-          pandas
-        ]
-      ))
-
-      (callPackage ../../packages/heidisql/package.nix { })
-    ];
+        (callPackage ../../packages/heidisql/package.nix { })
+      ]);
 
     shellAliases = import ../../features/aliases.nix { inherit pkgs; };
     sessionVariables = import ../../features/xdg.nix { inherit pkgs; };
diff --git a/hosts/shared/nixos-server.nix b/hosts/shared/nixos-server.nix
index 23122b3..d1de3cf 100644
--- a/hosts/shared/nixos-server.nix
+++ b/hosts/shared/nixos-server.nix
@@ -85,29 +85,12 @@
   };
 
   environment = {
-    systemPackages = with pkgs; [
-      wget
-      dnsmasq
-      guestfs-tools
-      unrar
-      nil
-      bash-language-server
-      devenv
-      weather
-      borgbackup
-      openjdk
-      openjdk17
-      openjdk25
-      tmux
-      ripgrep
-
-      (python3.withPackages (
-        python-pkgs: with python-pkgs; [
-          requests
-          pandas
-        ]
-      ))
-    ];
+    systemPackages =
+      import ../../features/common-pkgs.nix { inherit pkgs; }
+      ++ (with pkgs; [
+        guestfs-tools
+        borgbackup
+      ]);
 
     shellAliases = import ../../features/aliases.nix { inherit pkgs; };
     sessionVariables = import ../../features/xdg.nix { inherit pkgs; };