From 3cd3233f7eaf2a8a715d587820d6d4577a24d958 Mon Sep 17 00:00:00 2001
From: Azat Bahawi <azat@bahawi.net>
Date: Sat, 4 May 2024 16:11:40 +0300
Subject: 2024-05-04

---
 modules/common/nix.nix           |  5 +++-
 modules/common/shell/default.nix |  4 ----
 modules/common/stylix.nix        | 51 ++++++++++++++++++++++------------------
 3 files changed, 32 insertions(+), 28 deletions(-)

(limited to 'modules/common')

diff --git a/modules/common/nix.nix b/modules/common/nix.nix
index d6e8edb..c03c1b1 100644
--- a/modules/common/nix.nix
+++ b/modules/common/nix.nix
@@ -3,6 +3,7 @@
   inputs,
   lib,
   pkgs,
+  pkgsPr,
   this,
   ...
 }:
@@ -125,7 +126,9 @@ in
 
       overlays = with inputs; [
         self.overlays.default
-        (_: _super: { })
+        (_: _super: {
+          inherit (pkgsPr 309018 "sha256-x3ATxjrTVdaX5eo9P6pz+8/W6D2TNYzvjZpOBa3ZRI8=") endlessh-go;
+        })
       ];
     };
 
diff --git a/modules/common/shell/default.nix b/modules/common/shell/default.nix
index 9ef1c22..4ae41d8 100644
--- a/modules/common/shell/default.nix
+++ b/modules/common/shell/default.nix
@@ -1,6 +1,5 @@
 {
   config,
-  inputs,
   lib,
   pkgs,
   this,
@@ -19,8 +18,6 @@ in
 
   config = {
     hm = {
-      imports = [ inputs.nix-index-database.hmModules.nix-index ];
-
       programs = {
         bash = {
           enable = true;
@@ -185,7 +182,6 @@ in
         dircolors.enable = true;
 
         command-not-found.enable = false;
-        nix-index-database.comma.enable = true;
       };
 
       home.packages = with pkgs; [ grc ];
diff --git a/modules/common/stylix.nix b/modules/common/stylix.nix
index 953685e..9a360ad 100644
--- a/modules/common/stylix.nix
+++ b/modules/common/stylix.nix
@@ -3,6 +3,7 @@
   inputs,
   lib,
   pkgs,
+  this,
   ...
 }:
 with lib;
@@ -76,29 +77,33 @@ with lib;
     fonts = {
       packages = mkAfter config.nixfiles.modules.common.stylix.fonts.extraPackages;
 
-      fontconfig.defaultFonts = with config.stylix.fonts; {
-        serif = mkForce [
-          serif.name
-          "Sarasa Gothic"
-          "Source Han Serif"
-          "Noto Serif"
-        ];
-        sansSerif = mkForce [
-          sansSerif.name
-          "Sarasa Gothic"
-          "Source Han Sans"
-          "Noto Sans"
-        ];
-        monospace = mkForce [
-          monospace.name
-          "Sarasa Mono"
-          "Source Han Mono"
-          "Noto Sans Mono"
-        ];
-        emoji = mkForce [
-          "Twitter Color Emoji"
-          "Noto Color Emoji"
-        ];
+      fontconfig = {
+        enable = this.isHeadful;
+
+        defaultFonts = with config.stylix.fonts; {
+          serif = mkForce [
+            serif.name
+            "Sarasa Gothic"
+            "Source Han Serif"
+            "Noto Serif"
+          ];
+          sansSerif = mkForce [
+            sansSerif.name
+            "Sarasa Gothic"
+            "Source Han Sans"
+            "Noto Sans"
+          ];
+          monospace = mkForce [
+            monospace.name
+            "Sarasa Mono"
+            "Source Han Mono"
+            "Noto Sans Mono"
+          ];
+          emoji = mkForce [
+            "Twitter Color Emoji"
+            "Noto Color Emoji"
+          ];
+        };
       };
     };
   };
-- 
cgit v1.2.3