refactor: additional deduping and fixes

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
+]

features/i18n.nix

@@ -6,7 +6,7 @@
     defaultLocale = "en_US.UTF-8";
 
     extraLocales = [
-      "ja_JP.UTF-8"
+      "ja_JP.UTF-8/UTF-8"
     ];
 
     extraLocaleSettings = {

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";

hosts/shared/nixos-pc.nix

@@ -193,50 +193,29 @@
   };
 
   environment = {
-    systemPackages = with pkgs; [
+    systemPackages =
-      wget
+      import ../../features/common-pkgs.nix { inherit pkgs; }
-      dnsmasq
+      ++ (with pkgs; [
-      guestfs-tools
+        btrfs-assistant
-      unrar
+        kdePackages.kfind
-      p7zip
+        desktop-file-utils
-      btrfs-assistant
+        zathura
-      nil
+        hunspell
-      bash-language-server
+        hunspellDicts.en_US
-      nerd-fonts.hack
+        hyphenDicts.en_US
-      jump
+        affinity-v3
-      weather
+        libreoffice-qt
-      kdePackages.kfind
+        qimgv
-      desktop-file-utils
+        vorta
-      openjdk
+        distrobox
-      openjdk17
+        rtk
-      openjdk25
-      tmux
-      zathura
-      hunspell
-      hunspellDicts.en_US
-      hyphenDicts.en_US
-      affinity-v3
-      libreoffice-qt
-      qimgv
-      vorta
-      distrobox
-      devenv
-      ripgrep
-      rtk
 
-      inputs.appimage-manager.packages.${pkgs.stdenv.hostPlatform.system}.default
+        inputs.appimage-manager.packages.${pkgs.stdenv.hostPlatform.system}.default
-      inputs.gloomberb.packages.${pkgs.stdenv.hostPlatform.system}.default
+        inputs.gloomberb.packages.${pkgs.stdenv.hostPlatform.system}.default
-      inputs.pi.packages.${pkgs.stdenv.hostPlatform.system}.default
+        inputs.pi.packages.${pkgs.stdenv.hostPlatform.system}.default
 
-      (python3.withPackages (
+        (callPackage ../../packages/heidisql/package.nix { })
-        python-pkgs: with python-pkgs; [
+      ]);
-          requests
-          pandas
-        ]
-      ))
-
-      (callPackage ../../packages/heidisql/package.nix { })
-    ];
 
     shellAliases = import ../../features/aliases.nix { inherit pkgs; };
     sessionVariables = import ../../features/xdg.nix { inherit pkgs; };

hosts/shared/nixos-server.nix

@@ -85,29 +85,12 @@
   };
 
   environment = {
-    systemPackages = with pkgs; [
+    systemPackages =
-      wget
+      import ../../features/common-pkgs.nix { inherit pkgs; }
-      dnsmasq
+      ++ (with pkgs; [
-      guestfs-tools
+        guestfs-tools
-      unrar
+        borgbackup
-      nil
+      ]);
-      bash-language-server
-      devenv
-      weather
-      borgbackup
-      openjdk
-      openjdk17
-      openjdk25
-      tmux
-      ripgrep
-
-      (python3.withPackages (
-        python-pkgs: with python-pkgs; [
-          requests
-          pandas
-        ]
-      ))
-    ];
 
     shellAliases = import ../../features/aliases.nix { inherit pkgs; };
     sessionVariables = import ../../features/xdg.nix { inherit pkgs; };