home: disable most path packages in namespaced shenvs

3 files changed, 46 insertions, 42 deletions

diff --git a/home/default.nix b/home/default.nix
index 7047634..355291d 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -4,6 +4,7 @@ with lib; {
   imports = [
     hm-isolation.homeManagerModule
     ./isolation.nix
+    ./path.nix
     ./unfree.nix
   ];
 
@@ -55,8 +56,6 @@ with lib; {
         ".calc_history" = devNull;
         ".units_history" = devNull;
       };
-
-      packages = import ./path.nix pkgs;
     };
 
     fonts.fontconfig.enable = true;
diff --git a/home/path.nix b/home/path.nix
index 9f3657f..83eef58 100644
--- a/home/path.nix
+++ b/home/path.nix
@@ -1,39 +1,45 @@
-pkgs: let
-  py = pkgs.python39Packages;
-in [
-  pkgs.calc
-  pkgs.cloc
-  pkgs.file
-  pkgs.gcc
-  pkgs.gnome.gnome-screenshot
-  pkgs.gpicview
-  pkgs.hack-font
-  pkgs.i3-gaps
-  py.ipython
-  pkgs.jq
-  pkgs.keepassxc
-  pkgs.killall
-  pkgs.libreoffice-fresh
-  pkgs.man-pages
-  pkgs.man-pages-posix
-  pkgs.mosh
-  pkgs.mpv
-  pkgs.nmap
-  pkgs.libsForQt5.okular
-  pkgs.pavucontrol
-  py.python
-  pkgs.rustup
-  pkgs.local.scripts
-  pkgs.signal-desktop
-  pkgs.socat
-  pkgs.local.st
-  pkgs.tdesktop
-  pkgs.local.tmux-lift
-  pkgs.tree
-  pkgs.units
-  pkgs.unzip
-  pkgs.wget
-  pkgs.xsel
-  pkgs.zip
-  pkgs.gruvbox-dark-icons-gtk
-]
+{ config, lib, pkgs, ... }:
+with lib; {
+  home.packages = let
+    py = pkgs.python39Packages;
+  in [
+    pkgs.file
+    pkgs.killall
+    pkgs.man-pages
+    pkgs.man-pages-posix
+    pkgs.tree
+    pkgs.unzip
+    pkgs.wget
+    pkgs.zip
+  ] ++ optionals (!config.home.isolation.active) [
+    pkgs.calc
+    pkgs.cloc
+    pkgs.gcc
+    pkgs.gnome.gnome-screenshot
+    pkgs.gpicview
+    pkgs.gruvbox-dark-icons-gtk
+    pkgs.hack-font
+    pkgs.i3-gaps
+    py.ipython
+    pkgs.jq
+    pkgs.keepassxc
+    pkgs.libreoffice-fresh
+    pkgs.mosh
+    pkgs.mpv
+    pkgs.nmap
+    pkgs.libsForQt5.okular
+    pkgs.pavucontrol
+    py.python
+    pkgs.rustup
+    pkgs.local.scripts
+    pkgs.signal-desktop
+    pkgs.socat
+    pkgs.local.st
+    pkgs.tdesktop
+    pkgs.local.tmux-lift
+    pkgs.teams
+    pkgs.units
+    pkgs.xsel
+    pkgs.zoom-us
+  ];
+}
diff --git a/home/unfree.nix b/home/unfree.nix
deleted file mode 100644
index 1bb3788..0000000
--- a/home/unfree.nix
+++ /dev/null
@@ -1 +0,0 @@
-# This file has been lustrated.