Rename NixOS to NixVM

home/NixVM.nix

@@ -0,0 +1,7 @@
+{ inputs, config, pkgs, ... }:
+
+{
+  imports = [
+    (import ./utils/common.nix { inherit inputs config pkgs; })
+  ];
+}

home/nixos.nix

@@ -1,18 +0,0 @@
-{ inputs, config, pkgs, ... }:
-
-{
-  imports = [
-    (import ./common.nix { inherit inputs config pkgs; })
-    (import ./hyprland { inherit inputs pkgs; })
-    (import ./waybar { inherit inputs pkgs; })
-    ./rofi
-  ];
-
-  services.hyprpaper = {
-    settings = {
-      wallpaper = [ "Virtual-1,${./hyprland/files/wallpaper.png}" ];
-    };
-  };
-
-  programs.waybar = { settings = { mainBar = { output = "Virtual-1"; }; }; };
-}

home/utils/desktop.nix

@@ -20,4 +20,64 @@
     evince
     loupe
   ];
+
+  services.greetd = {
+    enable = true;
+    settings = rec {
+      initial_session = {
+        command = "Hyprland";
+        user = "user";
+      };
+      default_session = initial_session;
+    };
+  };
+
+  fonts.packages = with pkgs; [
+    noto-fonts
+    noto-fonts-cjk
+    noto-fonts-emoji
+    iosevka
+    nerdfonts
+    roboto
+    font-awesome
+  ];
+
+  hardware.opengl = {
+    enable = true;
+    driSupport = true;
+    driSupport32Bit = true;
+  };
+
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+
+  hardware.bluetooth.settings = {
+    General = {
+      Experimental = true;
+    };
+  };
+
+  # Calendar
+  # Add the server using gnome-online-accounts:
+  # nix-shell -p gnome.gnome-control-center --run "gnome-control-center"
+  # Just add the main webdav server and gnome-calendar will automatically pick up all available calendars.
+  programs.dconf.enable = true;
+  services.gnome.evolution-data-server.enable = true;
+  services.gnome.gnome-online-accounts.enable = true;
+  services.gnome.gnome-keyring.enable = true;
+
+  hardware.bluetooth.enable = true;
+  hardware.bluetooth.powerOnBoot = true;
+  services.blueman.enable = true;
+  systemd.user.services.mpris-proxy = {
+    description = "Mpris proxy";
+    after = [ "network.target" "sound.target" ];
+    wantedBy = [ "default.target" ];
+    serviceConfig.ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
+  };
 }

hosts/Common/default.nix

@@ -12,12 +12,6 @@
   services.fwupd.enable = true;
   services.gvfs.enable = true;
   services.fstrim.enable = true;
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
-  };
-
   programs.zsh.enable = true;
 
   services.openssh = {
@@ -28,37 +22,9 @@
     };
   };
 
-  fonts.packages = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk
-    noto-fonts-emoji
-    iosevka
-    nerdfonts
-    roboto
-    font-awesome
-  ];
-
   networking.firewall.enable = false;
 
-  services.greetd = {
-    enable = true;
-    settings = rec {
-      initial_session = {
-        command = "Hyprland";
-        user = "user";
-      };
-      default_session = initial_session;
-    };
-  };
-
   security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    jack.enable = true;
-  };
   environment.systemPackages = with pkgs; [
     wget
     curl
@@ -82,35 +48,11 @@
     };
   };
 
-  # Calendar
-  # Add the server using gnome-online-accounts:
-  # nix-shell -p gnome.gnome-control-center --run "gnome-control-center"
-  # Just add the main webdav server and gnome-calendar will automatically pick up all available calendars.
-  programs.dconf.enable = true;
-  services.gnome.evolution-data-server.enable = true;
-  services.gnome.gnome-online-accounts.enable = true;
-  services.gnome.gnome-keyring.enable = true;
-
   services.resolved = {
     enable = true;
     fallbackDns = [ "1.1.1.1" "1.0.0.1" ];
   };
 
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.powerOnBoot = true;
-  services.blueman.enable = true;
-  systemd.user.services.mpris-proxy = {
-    description = "Mpris proxy";
-    after = [ "network.target" "sound.target" ];
-    wantedBy = [ "default.target" ];
-    serviceConfig.ExecStart = "${pkgs.bluez}/bin/mpris-proxy";
-  };
-  hardware.bluetooth.settings = {
-    General = {
-      Experimental = true;
-    };
-  };
-
   fileSystems."/home/server" = {
     device = "10.1:/home/server";
     fsType = "nfs";

hosts/NixVM/default.nix

@@ -0,0 +1,8 @@
+{ inputs, config, pkgs, ... }:
+{
+  imports = [
+    (import ./common.nix { inherit inputs config pkgs; })
+    ../ssh
+  ];
+  programs.ssh.matchBlocks."*".identityFile = "/home/user/.secrets/SSH/NixVM/id_ed25519";
+}

hosts/nixos/default.nix

@@ -1 +0,0 @@
-{ }