From 203af3bc029bf30a36c7d036b884b84b42e26660 Mon Sep 17 00:00:00 2001
From: larstvei <larstvei@ifi.uio.no>
Date: Sun, 28 Dec 2025 20:30:26 +0100
Subject: [PATCH] Disable graphical environment for vm

---
 machines/thinkpad/default.nix       |  1 +
 machines/vm-aarch64/default.nix     |  3 ++-
 modules/fonts/default.nix           | 23 ++++++++++++-----
 modules/nixos/default.nix           | 38 -----------------------------
 modules/nixos/graphical/default.nix | 29 ++++++++++++++++++++++
 5 files changed, 49 insertions(+), 45 deletions(-)
 create mode 100644 modules/nixos/graphical/default.nix

diff --git a/machines/thinkpad/default.nix b/machines/thinkpad/default.nix
index a530fe8..89bbf92 100644
--- a/machines/thinkpad/default.nix
+++ b/machines/thinkpad/default.nix
@@ -4,6 +4,7 @@
     ./hardware
     ../../modules/base
     ../../modules/nixos
+    ../../modules/nixos/graphical
   ];
 
   home-manager.users.larstvei.imports = [
diff --git a/machines/vm-aarch64/default.nix b/machines/vm-aarch64/default.nix
index 6fa8eeb..aea656f 100644
--- a/machines/vm-aarch64/default.nix
+++ b/machines/vm-aarch64/default.nix
@@ -3,11 +3,12 @@
     ./hardware
     ../../modules/base
     ../../modules/nixos
+    # ../../modules/nixos-graphical
   ];
 
   home-manager.users.larstvei.imports = [
     ../../modules/home/minimal
-    ../../modules/desktop
+    # ../../modules/desktop
   ];
 
   networking.hostName = "larstvei-vm";
diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix
index 22c64eb..d935e42 100644
--- a/modules/fonts/default.nix
+++ b/modules/fonts/default.nix
@@ -1,9 +1,20 @@
 { pkgs, ... }:
 {
-  fonts.packages = with pkgs; [
-    iosevka
-    source-code-pro
-    source-sans
-    source-serif
-  ];
+  fonts = {
+    packages = with pkgs; [
+      iosevka
+      source-code-pro
+      source-sans
+      source-serif
+    ];
+    fontconfig = {
+      enable = true;
+      defaultFonts = {
+        serif = [ "Source Serif 4" ];
+        sansSerif = [ "Source Sans 3" ];
+        monospace = [ "Source Code Pro" ];
+      };
+    };
+  };
+
 }
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 0a34696..ca71bde 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -24,49 +24,11 @@
 
   console.keyMap = "us";
 
-  services.greetd = {
-    enable = true;
-    settings = rec {
-      initial_session = {
-        command = "hyprland > /dev/null 2>&1";
-        user = "larstvei";
-      };
-      default_session = initial_session;
-    };
-  };
-
-  fonts = {
-    fontconfig = {
-      enable = true;
-      defaultFonts = {
-        serif = [ "Source Serif 4" ];
-        sansSerif = [ "Source Sans 3" ];
-        monospace = [ "Source Code Pro" ];
-      };
-    };
-  };
-
   nixpkgs.config.allowUnfree = true;
 
   programs._1password.enable = true;
   programs._1password-gui.enable = true;
 
-  programs.hyprland = {
-    enable = true;
-    withUWSM = true;
-    package = pkgs.hyprland;
-    portalPackage = pkgs.xdg-desktop-portal-hyprland;
-  };
-
-  xdg.portal = {
-    enable = true;
-    extraPortals = [
-      pkgs.xdg-desktop-portal-hyprland
-      pkgs.xdg-desktop-portal-gtk
-    ];
-    config.hyprland."org.freedesktop.impl.portal.Settings" = "darkman";
-  };
-
   i18n.defaultLocale = "en_US.UTF-8";
 
   networking.networkmanager.enable = true;
diff --git a/modules/nixos/graphical/default.nix b/modules/nixos/graphical/default.nix
new file mode 100644
index 0000000..dd3be2b
--- /dev/null
+++ b/modules/nixos/graphical/default.nix
@@ -0,0 +1,29 @@
+{ pkgs, ... }:
+{
+  services.greetd = {
+    enable = true;
+    settings = rec {
+      initial_session = {
+        command = "hyprland > /dev/null 2>&1";
+        user = "larstvei";
+      };
+      default_session = initial_session;
+    };
+  };
+
+  programs.hyprland = {
+    enable = true;
+    withUWSM = true;
+    package = pkgs.hyprland;
+    portalPackage = pkgs.xdg-desktop-portal-hyprland;
+  };
+
+  xdg.portal = {
+    enable = true;
+    extraPortals = [
+      pkgs.xdg-desktop-portal-hyprland
+      pkgs.xdg-desktop-portal-gtk
+    ];
+    config.hyprland."org.freedesktop.impl.portal.Settings" = "darkman";
+  };
+}