motiejus/e11sync

commit 8909ef3fd5836f66af97e89d5b8045e4aa576407 (tree)
parent 994a4ad18be689aad8571f913a2829c122436375
Author: Motiejus Jakštys <motiejus@jakstys.lt>
Date:   Tue, 16 Jan 2024 11:41:15 +0200

vm: wiggle imports a bit

Diffstat:
M
flake.nix
 | 
1
+
M
vm.nix
 | 
19
++++---------------

2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/flake.nix b/flake.nix
@@ -145,6 +145,7 @@
       nixosConfigurations.vm = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
+          "${nixpkgs}/nixos/modules/virtualisation/qemu-vm.nix"
           ./vm.nix
           e11sync-module
         ];
diff --git a/vm.nix b/vm.nix
@@ -1,22 +1,12 @@
-{
-  pkgs,
-  modulesPath,
-  ...
-}: {
+{pkgs, ...}: {
   e11sync.enable = true;
 
-  imports = [(modulesPath + "/virtualisation/qemu-vm.nix")];
-  virtualisation.graphics = false;
-
   environment.systemPackages = with pkgs; [
     tmux
     htop
   ];
 
-  nix.extraOptions = ''
-    experimental-features = nix-command flakes
-    trusted-users = vm
-  '';
+  nix.extraOptions = ''experimental-features = nix-command flakes'';
   users = {
     mutableUsers = false;
     users.nixos = {
@@ -25,13 +15,12 @@
       hashedPassword = "";
     };
   };
+  virtualisation.graphics = false;
   security.sudo.wheelNeedsPassword = false;
   services.getty.autologinUser = "nixos";
   networking = {
     hostName = "vm";
-    firewall = {
-      allowedTCPPorts = [8001];
-    };
+    firewall.allowedTCPPorts = [22 8001];
   };
   system.stateVersion = "23.11";
 }