programs: Remove nonvm

hosts/ayame.nix

@@ -13,7 +13,7 @@ in mkHost {
   overlays = [ "nur" "unstable" ];
   hardwareImports = [ "intel" "wifi" "mobile" ];
   programImports = [
-    "zsh" "mpv" "git" "tmux" "firefox" "gnome-terminal" "gnome" "nonvm"
+    "zsh" "mpv" "git" "tmux" "firefox" "gnome-terminal" "gnome"
   ];
   extraImports = [ "distributed-build/offload.nix" ];
   extraPackages = pkgs: with pkgs; [

hosts/miku.nix

@@ -12,7 +12,7 @@ in mkHost {
   overlays = [ "nur" "steam" "unstable" "simple" "custom" "emacs" ];
   hardwareImports = [ "amdgpu" "amd" ];
   programImports = [
-    "zsh" "git" "mpv" "tmux" "emacs" "firefox" "gnome-terminal" "gnome" "i18n" "gamemode" "nonvm"
+    "zsh" "git" "mpv" "tmux" "emacs" "firefox" "gnome-terminal" "gnome" "i18n" "gamemode"
     "distributed-build/builder.nix"
     "music"
   ];

modules/host.nix

@@ -8,6 +8,7 @@
 , hardwareImports ? [ "generic" ]
 , programImports ? []
 , extraImports ? []
+, isVM ? false
 , fileSystems
 , swapDevices ? []
 , extraPackages ? pkgs: []
@@ -16,6 +17,7 @@
 
 let
   overlaysSet = import ../overlays { pkgs = pkgs; lib = lib; };
+  network = import ./network.nix;
   home-manager = builtins.fetchGit {
     url = "https://github.com/nix-community/home-manager.git";
     rev = "35a24648d155843a4d162de98c17b1afd5db51e4";
@@ -43,6 +45,13 @@ let
       
       hostName = hostName;
       wireless.enable = (if wireless then true else lib.mkForce false);
+
+      hosts = lib.mkIf (!isVM) {
+        "${network.miku}" = [ "miku.local" ];
+        "${network.nishimiya}" = [ "nishimiya.local" ];
+        "${network.ayame}" = [ "ayame.local" ];
+        "${network.tamaki}" = [ "tamaki.local" ];
+      };
     };
 
     i18n.defaultLocale = "en_GB.UTF-8";
@@ -73,10 +82,11 @@ let
 
         # CJK fonts
         source-han-sans source-han-serif
-
+        
         # RT scheduling
         rtkit
-      ] ++ extraPackages pkgs;
+      ] ++ extraPackages pkgs
+        ++ lib.optionals (!isVM) (with pkgs; [ gopass ]);
 
       sessionVariables = {
         # Prevent us from having to always type it out

modules/programs/nonvm/default.nix

@@ -1,24 +0,0 @@
-{ pkgs, ... }:
-
-let
-  network = import ../../network.nix;
-in {
-  environment = {
-    systemPackages = with pkgs; [ gopass home-manager ];
-
-    sessionVariables = {
-      # Prevent us from having to always type it out
-      #NIXOS_CONFIG = "\${HOME}/Development/Personal/nixos-config/mikulinux.nix";
-    }; 
-    
-    shells = [ pkgs.zsh ];
-    pathsToLink = [ "/share/zsh" ];
-  };
-
-  networking.hosts = {
-    "${network.miku}" = [ "miku.local" ];
-    "${network.nishimiya}" = [ "nishimiya.local" ];
-    "${network.ayame}" = [ "ayame.local" ];
-    "${network.tamaki}" = [ "tamaki.local" ];
-  };
-}