tidying pkgs

modules/browsers.nix

@@ -1,5 +1,14 @@
-{inputs,...}: {
+{
-	flake.nixosModules.browsers = {pkgs,...}: {
+  inputs,
-		programs.firefox.enable = true;
+  self,
-	};
+  ...
+}: {
+  flake.nixosModules.browsers = {pkgs, ...}: {
+    programs.firefox.enable = true;
+
+    environment.systemPackages = [
+      inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default
+      self.packages.${pkgs.stdenv.hostPlatform.system}.helium
+    ];
+  };
 }

modules/configurations.nix

@@ -13,6 +13,7 @@
       self.nixosModules.shell
       self.nixosModules.gaming
       self.nixosModules.development
+      self.nixosModules.browsers
     ];
   };
 }

modules/packages.nix

@@ -1,5 +1,9 @@
-{inputs, ...}: {
+{
-  flake.nixosModules.packages = {pkgs, ...}: {
+  inputs,
+  self,
+  ...
+}: {
+  flake.nixosModules.packages = { pkgs, ... }: {
     environment.systemPackages = with pkgs; [
       fd
       ripgrep
@@ -8,7 +12,6 @@
       alacritty
       fzf
       autojump
-      inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default
       pulseaudio
       legcord
       quickshell
@@ -16,7 +19,6 @@
       slack
       feishin
       obsidian
-      (pkgs.callPackage ../pkgs/helium.nix {})
     ];
   };
 }

modules/pkgs/helium.nix

@@ -0,0 +1,22 @@
+{ ... }: {
+  perSystem = { pkgs, ... }: {
+    packages.helium = pkgs.appimageTools.wrapType2 rec {
+      pname = "helium";
+      version = "0.9.4.1";
+
+      src = pkgs.fetchurl {
+        url = "https://github.com/imputnet/helium-linux/releases/download/${version}/${pname}-${version}-x86_64.AppImage";
+        hash = "sha256-N5gdWuxOrIudJx/4nYo4/SKSxakpTFvL4zzByv6Cnug=";
+      };
+
+      extraInstallCommands = let
+        contents = pkgs.appimageTools.extract { inherit pname version src; };
+      in ''
+        install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications
+        substituteInPlace $out/share/applications/${pname}.desktop \
+          --replace 'Exec=AppRun' 'Exec=${pname}'
+        cp -r ${contents}/usr/share/icons $out/share
+      '';
+    };
+  };
+}

pkgs/helium.nix

@@ -1,22 +0,0 @@
-{ pkgs, ... }:
-
-pkgs.appimageTools.wrapType2 rec {
-  pname = "helium";
-  version = "0.9.4.1";
-
-  src = pkgs.fetchurl {
-    url = "https://github.com/imputnet/helium-linux/releases/download/${version}/${pname}-${version}-x86_64.AppImage";
-    hash = "sha256-N5gdWuxOrIudJx/4nYo4/SKSxakpTFvL4zzByv6Cnug=";
-  };
-
-  extraInstallCommands =
-    let
-      contents = pkgs.appimageTools.extract { inherit pname version src; };
-    in
-    ''
-      install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications
-      substituteInPlace $out/share/applications/${pname}.desktop \
-        --replace 'Exec=AppRun' 'Exec=${pname}'
-      cp -r ${contents}/usr/share/icons $out/share
-    '';
-}