refactor(nix): cleanup

Author: isabelroses

flake.nix

@@ -17,8 +17,8 @@
         function: nixpkgs.lib.genAttrs systems (system: function nixpkgs.legacyPackages.${system});
     in
     {
-      packages = forAllSystems (pkgs: rec {
-        default = izrss;
+      packages = forAllSystems (pkgs: {
+        default = self.packages.${pkgs.stdenv.hostPlatform.system}.izrss;
         izrss = pkgs.callPackage ./nix/default.nix { version = self.shortRev or "unstable"; };
       });
 
@@ -30,6 +30,6 @@
         default = pkgs.callPackage ./nix/shell.nix { };
       });
 
-      homeManagerModules.default = import ./nix/hm-module.nix self;
+      homeManagerModules.default = ./nix/hm-module.nix;
     };
 }

nix/default.nix

@@ -19,6 +19,7 @@ buildGoModule {
       ]
     );
   };
+
   vendorHash = "sha256-2L/EUoPbz6AZqv84XPhiZhImOL4wyBOzx6Od4+nTJeY=";
 
   ldflags = [
@@ -32,6 +33,6 @@ buildGoModule {
     homepage = "https://github.com/isabelroses/izrss";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ isabelroses ];
-    mainPackage = "izrss";
+    mainProgram = "izrss";
   };
 }

nix/hm-module.nix

@@ -1,4 +1,3 @@
-self:
 {
   lib,
   pkgs,
@@ -10,18 +9,25 @@ let
     mkIf
     mkOption
     mkEnableOption
-    mkPackageOption
     ;
 
   settingsFormat = pkgs.formats.toml { };
+
+  cfg = config.programs.izrss;
 in
 {
+  _class = "homeManager";
+
   meta.maintainers = [ lib.maintainers.isabelroses ];
 
   options.programs.izrss = {
     enable = mkEnableOption "A fast and once simple cli todo tool";
 
-    package = mkPackageOption self.packages.${pkgs.stdenv.hostPlatform.system} "izrss" { };
+    package = mkOption {
+      type = lib.types.package;
+      default = pkgs.callPackage ./default.nix { };
+      description = "The izrss package";
+    };
 
     settings = mkOption {
       inherit (settingsFormat) type;
@@ -65,15 +71,11 @@ in
     )
   ];
 
-  config =
-    let
-      cfg = config.programs.izrss;
-    in
-    mkIf cfg.enable {
-      home.packages = [ cfg.package ];
+  config = mkIf cfg.enable {
+    home.packages = [ cfg.package ];
 
-      xdg.configFile."izrss/config.toml" = mkIf (cfg.settings != { }) {
-        source = (settingsFormat.generate "izrss-config.toml" cfg.settings);
-      };
+    xdg.configFile."izrss/config.toml" = mkIf (cfg.settings != { }) {
+      source = settingsFormat.generate "izrss-config.toml" cfg.settings;
     };
+  };
 }