From 6c0ada6f07c25dc8bb3d4e0d9a171f82fb02a732 Mon Sep 17 00:00:00 2001
From: cnst <adam@cnst.dev>
Date: Sat, 16 Aug 2025 10:51:47 +0200
Subject: [PATCH] removing hm from server 3

---
 hosts/bunk/settings.nix               |  1 +
 hosts/default.nix                     | 12 ------------
 hosts/kima/settings.nix               |  1 +
 hosts/sobotka/settings.nix            |  1 +
 hosts/toothpc/settings.nix            |  1 +
 hosts/ziggy/settings.nix              |  1 +
 modules/settings/accounts/default.nix |  5 +++++
 nix/default.nix                       |  2 +-
 users/cnst/modules/default.nix        |  6 +-----
 users/cnst/variables/default.nix      |  7 +------
 10 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/hosts/bunk/settings.nix b/hosts/bunk/settings.nix
index 5712b2d4..e62c79d8 100644
--- a/hosts/bunk/settings.nix
+++ b/hosts/bunk/settings.nix
@@ -4,6 +4,7 @@
       username = "cnst";
       mail = "adam@cnst.dev";
       sshUser = "bunk";
+      role = "desktop";
     };
     monitors = [
       {
diff --git a/hosts/default.nix b/hosts/default.nix
index 503b5dad..cbce303c 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -62,12 +62,6 @@
       modules = [
         ./sobotka
         "${self}/nix"
-        # {
-        #   home-manager = {
-        #     users.cnst.imports = homeImports."cnst@sobotka";
-        # extraSpecialArgs = specialArgs;
-        #   };
-        # }
         self.nixosModules.nixos
         self.nixosModules.settings
         self.nixosModules.server
@@ -79,12 +73,6 @@
       modules = [
         ./ziggy
         "${self}/nix"
-        {
-          home-manager = {
-            users.cnst.imports = homeImports."cnst@ziggy";
-            extraSpecialArgs = specialArgs;
-          };
-        }
         self.nixosModules.nixos
         self.nixosModules.settings
         self.nixosModules.server
diff --git a/hosts/kima/settings.nix b/hosts/kima/settings.nix
index 290f2060..c8f4051f 100644
--- a/hosts/kima/settings.nix
+++ b/hosts/kima/settings.nix
@@ -4,6 +4,7 @@
       username = "cnst";
       mail = "adam@cnst.dev";
       sshUser = "kima";
+      role = "desktop";
     };
     monitors = [
       {
diff --git a/hosts/sobotka/settings.nix b/hosts/sobotka/settings.nix
index 3c42b75d..83bcfac9 100644
--- a/hosts/sobotka/settings.nix
+++ b/hosts/sobotka/settings.nix
@@ -4,6 +4,7 @@
       username = "cnst";
       mail = "adam@cnst.dev";
       sshUser = "sobotka";
+      role = "server";
     };
   };
 }
diff --git a/hosts/toothpc/settings.nix b/hosts/toothpc/settings.nix
index 3ee99687..4ec34f48 100644
--- a/hosts/toothpc/settings.nix
+++ b/hosts/toothpc/settings.nix
@@ -4,6 +4,7 @@
       username = "toothpick";
       mail = "place@holder";
       sshUser = "toothpc";
+      role = "desktop";
     };
     monitors = [
       {
diff --git a/hosts/ziggy/settings.nix b/hosts/ziggy/settings.nix
index ea1c6831..435f6580 100644
--- a/hosts/ziggy/settings.nix
+++ b/hosts/ziggy/settings.nix
@@ -4,6 +4,7 @@
       username = "cnst";
       mail = "adam@cnst.dev";
       sshUser = "ziggy";
+      role = "server";
     };
   };
 }
diff --git a/modules/settings/accounts/default.nix b/modules/settings/accounts/default.nix
index fbd59e9d..3ac3715d 100644
--- a/modules/settings/accounts/default.nix
+++ b/modules/settings/accounts/default.nix
@@ -45,5 +45,10 @@ in {
       default = null;
       description = "Optional override for selecting an SSH key by name";
     };
+    role = mkOption {
+      type = types.enum ["desktop" "server"];
+      default = "desktop";
+      description = "Defines the system role (desktop or server).";
+    };
   };
 }
diff --git a/nix/default.nix b/nix/default.nix
index d554a9ca..7c7afed5 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -33,7 +33,7 @@
       warn-dirty = false;
       accept-flake-config = false;
       # allow-import-from-derivation = true;
-      experimental-features = ["nix-command" "flakes" "repl-flake"];
+      experimental-features = ["nix-command" "flakes"];
       flake-registry = "/etc/nix/registry.json";
 
       # # for direnv GC roots
diff --git a/users/cnst/modules/default.nix b/users/cnst/modules/default.nix
index ddd2d1ee..2180179b 100644
--- a/users/cnst/modules/default.nix
+++ b/users/cnst/modules/default.nix
@@ -1,10 +1,6 @@
 {osConfig, ...}: let
   hostSpecificImports =
-    if osConfig.networking.hostName == "sobotka"
-    then [
-      ./sobotkamod.nix
-    ]
-    else if osConfig.networking.hostName == "bunk"
+    if osConfig.networking.hostName == "bunk"
     then [
       ./bunkmod.nix
     ]
diff --git a/users/cnst/variables/default.nix b/users/cnst/variables/default.nix
index 3af18aab..68266565 100644
--- a/users/cnst/variables/default.nix
+++ b/users/cnst/variables/default.nix
@@ -1,11 +1,6 @@
 {osConfig, ...}: let
   hostSpecificVariables =
-    if osConfig.networking.hostName == "sobotka"
-    then {
-      EDITOR = "hx";
-      TERM = "xterm-256color";
-    }
-    else if osConfig.networking.hostName == "bunk"
+    if osConfig.networking.hostName == "bunk"
     then {
       BROWSER = "zen";
       EDITOR = "hx";