refactor: additional deduping and fixes

2026-10-21 16:59:52 -04:00
parent 6dc6634649
commit 1d2230e496
5 changed files with 46 additions and 67 deletions
@@ -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; };
@@ -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; };