From eddaf3c010943efe91e6f6bb1c9e965d9adfb491 Mon Sep 17 00:00:00 2001
From: baduhai <baduhai@pm.me>
Date: Thu, 19 Jan 2023 18:31:54 -0300
Subject: [PATCH] finished configuring greetd

---
 hosts/common/console.nix           | 61 +++++++++++++++++++++---------
 hosts/desktops/common/services.nix | 21 +++++-----
 2 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/hosts/common/console.nix b/hosts/common/console.nix
index 36f6fba..64794f5 100644
--- a/hosts/common/console.nix
+++ b/hosts/common/console.nix
@@ -1,22 +1,47 @@
 { specialArgs, inputs, config, pkgs, lib, ... }:
 
 {
-  console.colors = [
-    "002b36"
-    "dc322f"
-    "859900"
-    "b58900"
-    "268bd2"
-    "d33682"
-    "2aa198"
-    "eee8d5"
-    "002b36"
-    "cb4b16"
-    "586e75"
-    "657b83"
-    "839496"
-    "6c71c4"
-    "93a1a1"
-    "fdf6e3"
-  ];
+  console = {
+    keyMap = "us";
+    earlySetup = true;
+    colors = [
+      "2E3440"
+      "3B4252"
+      "434C5E"
+      "4C566A"
+      "D8DEE9"
+      "E5E9F0"
+      "ECEFF4"
+      "8FBCBB"
+      "88C0D0"
+      "81A1C1"
+      "5E81AC"
+      "BF616A"
+      "D08770"
+      "EBCB8B"
+      "A3BE8C"
+      "B48EAD"
+    ];
+  };
+
+  i18n = {
+    consoleColors = [
+      "2E3440"
+      "3B4252"
+      "434C5E"
+      "4C566A"
+      "D8DEE9"
+      "E5E9F0"
+      "ECEFF4"
+      "8FBCBB"
+      "88C0D0"
+      "81A1C1"
+      "5E81AC"
+      "BF616A"
+      "D08770"
+      "EBCB8B"
+      "A3BE8C"
+      "B48EAD"
+    ];
+  };
 }
diff --git a/hosts/desktops/common/services.nix b/hosts/desktops/common/services.nix
index c2de6b5..0ca1a48 100644
--- a/hosts/desktops/common/services.nix
+++ b/hosts/desktops/common/services.nix
@@ -1,5 +1,11 @@
 { specialArgs, inputs, config, pkgs, lib, ... }:
 
+let
+  plasma = pkgs.writeScriptBin "plasma" ''
+    ${pkgs.plasma-workspace}/bin/startplasma-wayland &> /dev/null
+  '';
+in
+
 {
   services = {
     printing.enable = true;
@@ -40,17 +46,12 @@
     greetd = {
       enable = true;
       settings = {
-        default_session.command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember  --asterisks --time --greeting \"Welcome to Nix\" --cmd ${pkgs.plasma-workspace}/bin/startplasma-wayland";
-#         initial_session = {
-#           command = "${pkgs.plasma-workspace}/bin/startplasma-wayland";
-#           user = "user";
-#         };
+        default_session.command = "${pkgs.greetd.tuigreet}/bin/tuigreet --remember --user-menu --asterisks --time --greeting \"Welcome to NixOS\" --cmd ${plasma}/bin/plasma";
+        initial_session = {
+          command = "${plasma}/bin/plasma";
+          user = "user";
+        };
       };
     };
   };
-
-  environment.etc."greetd/environments".text = ''
-    startplasma-wayland
-    fish
-  '';
 }