diff --git a/modules/programs/nix.nix b/modules/programs/nix.nix index 9435552..bc4eba8 100644 --- a/modules/programs/nix.nix +++ b/modules/programs/nix.nix @@ -6,26 +6,16 @@ , ... }: -with lib; let + inherit (lib) mkEnableOption mkOption types; + cfg = config.my.programs.nix; - - mkSuper = system: nix: - if cfg.useSuper - then inputs.nix-super.packages.${system}.default - else nix; - mkNom = system: nix: - if cfg.useNom - then - inputs.nix-monitored.packages.${system}.default.override - { - withNotify = false; - nix = nix; - } - else nix; - - mkNix = system: nix: mkNom system (mkSuper system nix); + inputs.nix-monitored.packages.${system}.default.override + { + withNotify = false; + nix = nix; + }; in { options.my.programs.nix = { @@ -38,8 +28,6 @@ in }; }; optimise.enable = mkEnableOption "nix-optimise"; - useSuper = mkEnableOption "use nix super"; - useNom = mkEnableOption "use nix output monitor" // { default = true; }; }; config = { @@ -59,7 +47,7 @@ in nix = { nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; - package = mkNix pkgs.system pkgs.nix; + package = pkgs.nix; extraOptions = "experimental-features = nix-command flakes";