home-manager/cli: move non-nix/nixpkgs, unify them

home-manager/cli/default.nix

@@ -5,6 +5,7 @@
     ./git.nix
     ./htop.nix
     ./irssi.nix
+    ./nixpkgs.nix
     ./nnn.nix
     ./ssh.nix
     ./tmux.nix

home-manager/cli/nixpkgs.nix

@@ -0,0 +1,34 @@
+{ flake, config, pkgs, lib, ... }:
+
+
+let
+  nixpkgs-review =
+    if (pkgs.stdenv.isLinux) then
+      pkgs.nixpkgs-review.override { withSandboxSupport = true; withNom = true; }
+    else
+      pkgs.nixpkgs-review.override { withNon = true; };
+in
+{
+  imports = [ flake.inputs.nix-index-database.hmModules.nix-index ];
+
+  options.home-manager.cli.nixpkgs.enable = lib.mkDefaultOption "nixpkgs tools config" // {
+    default = config.home-manager.cli.enable;
+  };
+
+  config = lib.mkIf config.home-manager.cli.nixpkgs.enable {
+    programs = {
+      nix-index = {
+        enable = true;
+        symlinkToCacheHome = true;
+      };
+      nix-index-database.comma.enable = true;
+    };
+
+    home.packages = with pkgs; [
+      nix-output-monitor
+      nixpkgs-review
+    ] ++ lib.optionals stdenv.isLinux [
+      flake.inputs.nix-alien.packages.${pkgs.system}.nix-alien
+    ];
+  };
+}

home-manager/default.nix

@@ -5,8 +5,6 @@
     ./desktop
     ./i3
     ./minimal.nix
-    ./nixpkgs.nix
-    ./non-nix.nix
     ./sway
     ./theme
   ];