Refactor

Move more stuff into home manager as appropriate.  Use 'personal'
instead of 'home' for non-work stuff.

alex/core.nix

@@ -35,25 +35,19 @@
     nnn # terminal file manager
 
     # archives
-    zip
     xz
-    unzip
     # p7zip
 
     # utils
-    ripgrep # recursively searches directories for a regex pattern
-    bat
     jq # A lightweight and flexible command-line JSON processor
     # yq-go # yaml processor https://github.com/mikefarah/yq
     eza # A modern replacement for ‘ls’
     fzf # A command-line fuzzy finder
-    fd
     xclip
     trash-cli
 
     # networking tools
     dig
-    mtr # A network diagnostic tool
     # iperf3
     # dnsutils  # `dig` + `nslookup`
     # ldns # replacement of `dig`, it provide the command `drill`

alex/personal.nix

@@ -1,16 +1,11 @@
 { config, pkgs, inputs, ... }:
-{
-  # Mullvad vpn
-  services.mullvad-vpn = {
-    enable = true;
-  };
 
-  environment.systemPackages = with pkgs; [
+{
+  home.packages = with pkgs; [
     foliate
     inputs.locutus.packages.${pkgs.system}.default
     jrnl
     mullvad-browser
-    mullvad-vpn
     tor-browser
     exiftool
     digikam

flake.nix

@@ -35,7 +35,7 @@
         modules = [
           ./hosts/case/configuration.nix
           home-manager.nixosModules.home-manager
-          (mkHomeManagerConfig { extraModules = [ ./alex/desktop.nix ]; })
+          (mkHomeManagerConfig { extraModules = [ ./alex/desktop.nix ./alex/personal.nix ]; })
         ];
       };
 
@@ -45,7 +45,7 @@
         modules = [
           ./hosts/count/configuration.nix
           home-manager.nixosModules.home-manager
-          (mkHomeManagerConfig { extraModules = [ ./alex/desktop.nix ]; })
+          (mkHomeManagerConfig { extraModules = [ ./alex/desktop.nix ./alex/personal.nix ]; })
         ];
       };
 
@@ -81,4 +81,4 @@
       # other hosts...
     };
   };
-}
+}

hosts/case/configuration.nix

@@ -10,7 +10,7 @@
       ./hardware-configuration.nix
       ../modules/base.nix
       ../modules/desktop.nix
-      ../modules/home.nix
+      ../modules/personal.nix
       ../modules/laptop.nix
       ../modules/sway.nix
     ];

hosts/count/configuration.nix

@@ -11,7 +11,7 @@
       ../modules/base.nix
       ../modules/desktop.nix
       ../modules/brother-printer.nix
-      ../modules/home.nix
+      ../modules/personal.nix
       ../modules/sway.nix
       ../modules/syncthing.nix
     ];

hosts/modules/desktop.nix

@@ -40,7 +40,6 @@
   };
 
   environment.systemPackages = with pkgs; [
-    bitwarden-desktop
     libreoffice-fresh
 	meld
   ];

hosts/modules/personal.nix

@@ -0,0 +1,8 @@
+{ config, pkgs, inputs, ... }:
+{
+  # Mullvad vpn
+  services.mullvad-vpn = {
+    enable = true;
+    package = pkgs.mullvad-vpn;
+  };
+}