From 7829fcd0ce98759b8f50ee91182e3151cb9d8289 Mon Sep 17 00:00:00 2001
From: Schrottkatze <git@schrottkatze.de>
Date: Tue, 5 Mar 2024 13:38:05 +0100
Subject: [PATCH] merge kmscon and tty configs

---
 common.nix                            | 19 -------------------
 modules/default.nix                   |  1 -
 modules/shell/default.nix             |  1 +
 modules/{kmscon.nix => shell/tty.nix} | 20 ++++++++++++++++++++
 4 files changed, 21 insertions(+), 20 deletions(-)
 rename modules/{kmscon.nix => shell/tty.nix} (88%)

diff --git a/common.nix b/common.nix
index 29b73ee..774f65f 100644
--- a/common.nix
+++ b/common.nix
@@ -90,25 +90,6 @@ with builtins; {
     };
   };
 
-  console.colors = [
-    "282828"
-    "cc241d"
-    "98971a"
-    "d79921"
-    "458588"
-    "b16286"
-    "689d6a"
-    "a89984"
-    "928374"
-    "fb4934"
-    "b8bb26"
-    "fabd2f"
-    "83a598"
-    "d3869b"
-    "8ec07c"
-    "ebdbb2"
-  ];
-
   # nitrokey
   services.udev.packages = [pkgs.nitrokey-udev-rules];
   services.pcscd.enable = true;
diff --git a/modules/default.nix b/modules/default.nix
index eb9042c..50424f2 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -6,7 +6,6 @@
     ./flatpak.nix
     ./firewall.nix
     ./git.nix
-    ./kmscon.nix
     ./mprocs.nix
   ];
 }
diff --git a/modules/shell/default.nix b/modules/shell/default.nix
index 4134bbc..a78c9fa 100644
--- a/modules/shell/default.nix
+++ b/modules/shell/default.nix
@@ -6,6 +6,7 @@
     ./zellij.nix
     ./carapace.nix
     ./direnv.nix
+    ./tty.nix
   ];
   programs.mosh.enable = true;
 }
diff --git a/modules/kmscon.nix b/modules/shell/tty.nix
similarity index 88%
rename from modules/kmscon.nix
rename to modules/shell/tty.nix
index 4c859bd..3070907 100644
--- a/modules/kmscon.nix
+++ b/modules/shell/tty.nix
@@ -34,6 +34,26 @@
       (getAttr (substring 5 2 (toUpper color)) hexLookupTable)
     ]);
 in {
+  # TODO: global colorscheme vars for everything
+  console.colors = [
+    "282828"
+    "cc241d"
+    "98971a"
+    "d79921"
+    "458588"
+    "b16286"
+    "689d6a"
+    "a89984"
+    "928374"
+    "fb4934"
+    "b8bb26"
+    "fabd2f"
+    "83a598"
+    "d3869b"
+    "8ec07c"
+    "ebdbb2"
+  ];
+
   services.kmscon = {
     enable = true;
     fonts = [