From ca882853ffede22a1520638f60be9ce8418d09f2 Mon Sep 17 00:00:00 2001
From: waveringana <ana@nekomimi.pet>
Date: Sat, 31 May 2025 21:39:42 -0400
Subject: [PATCH] move things out of common into valefar

---
 hosts/valefar/default.nix   | 12 ++++++++++++
 modules/common/services.nix |  9 ---------
 modules/common/system.nix   |  7 +------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/hosts/valefar/default.nix b/hosts/valefar/default.nix
index 91b0fd8..299e3ca 100644
--- a/hosts/valefar/default.nix
+++ b/hosts/valefar/default.nix
@@ -31,7 +31,19 @@
   boot.supportedFilesystems = [ "zfs" ];
   boot.kernelModules = [ "nct6775" "coretemp" ];
 
+  services.zfs.autoScrub.enable = true;
+  services.zfs.trim.enable = true;
+
   environment.systemPackages = with pkgs; [
     lm_sensors
+    code-server
   ];
+
+  virtualisation.docker = {
+    enable = true;
+    enableOnBoot = true;
+    package = pkgs.docker.override {
+      buildGoModule = pkgs.buildGo123Module;
+    };
+  };
 }
diff --git a/modules/common/services.nix b/modules/common/services.nix
index 1c59ff8..a1f504b 100644
--- a/modules/common/services.nix
+++ b/modules/common/services.nix
@@ -14,18 +14,9 @@
     parted
     zfs
 
-    code-server
     sqlite
   ];
 
-  virtualisation.docker = {
-    enable = true;
-    enableOnBoot = true;
-    package = pkgs.docker.override {
-      buildGoModule = pkgs.buildGo123Module;
-    };
-  };
-
   services.openssh.enable         = true;
   services.printing.enable        = true;
   services.tailscale.enable       = true;
diff --git a/modules/common/system.nix b/modules/common/system.nix
index 5277d09..455c98d 100644
--- a/modules/common/system.nix
+++ b/modules/common/system.nix
@@ -4,14 +4,9 @@
   boot.loader.systemd-boot.enable     = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.kernel.sysctl."net.ipv4.ip_forward" = 1;
-  boot.supportedFilesystems = [ "zfs" ];
   fileSystems."/boot".options = [ "umask=0077" ];
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
-  
-
-  services.zfs.autoScrub.enable = true;
-  services.zfs.trim.enable = true;
 
   networking = {
     firewall.enable = false;
@@ -31,7 +26,7 @@
     dnsovertls  = "true";
   };
 
-  environment.variables.EDITOR = "neovim";
+  environment.variables.EDITOR = "vim";
 
   time.timeZone     = "America/New_York";
   i18n.defaultLocale = "en_US.UTF-8";