2024-05-04

8 files changed, 47 insertions, 39 deletions

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"
+          ];
+        };
       };
     };
   };
diff --git a/modules/emacs/default.nix b/modules/emacs/default.nix
index 2230ee0..8a6707c 100644
--- a/modules/emacs/default.nix
+++ b/modules/emacs/default.nix
@@ -60,11 +60,11 @@ in
 
                 if [[ -x "$EMACSDIR/bin/doom" ]]; then
                   if [[ ! -d "$EMACSDIR/.local" ]]; then
-                    PATH="''${PATH:-/bin:/usr/bin:/usr/local/bin}:${emacs.package}/bin:${git.package}/bin" \
+                    PATH="''${PATH:-/bin}:${emacs.package}/bin:${git.package}/bin" \
                       "$EMACSDIR/bin/doom" install --force --verbose
                   fi
 
-                  PATH="''${PATH:-/bin:/usr/bin:/usr/local/bin}:${emacs.package}/bin:${git.package}/bin" \
+                  PATH="''${PATH:-/bin:}:${emacs.package}/bin:${git.package}/bin" \
                     "$EMACSDIR/bin/doom" sync -e --gc --force --verbose
                 fi
               '';
diff --git a/modules/endlessh-go.nix b/modules/endlessh-go.nix
index efaaa8f..2919534 100644
--- a/modules/endlessh-go.nix
+++ b/modules/endlessh-go.nix
@@ -25,10 +25,7 @@ in
           listenAddress = this.wireguard.ipv4.address;
           port = 9229;
         };
-        extraOptions = [
-          "-geoip_supplier=ip-api"
-          "-v=1"
-        ];
+        extraOptions = [ "-geoip_supplier=ip-api" ];
       };
 
       networking.firewall.allowedTCPPorts = [ port ];
diff --git a/modules/firefox/addons.nix b/modules/firefox/addons.nix
index 54e67ee..1845701 100644
--- a/modules/firefox/addons.nix
+++ b/modules/firefox/addons.nix
@@ -50,10 +50,10 @@
   };
   "darkreader" = buildFirefoxXpiAddon {
     pname = "darkreader";
-    version = "4.9.83";
+    version = "4.9.84";
     addonId = "addon@darkreader.org";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4262984/darkreader-4.9.83.xpi";
-    sha256 = "a43cca2449de202d17040b0d91b2fb3ed4dd58ac81ec5d3fde4c9940d326c822";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4278339/darkreader-4.9.84.xpi";
+    sha256 = "d418b40fc2cb69cfffabf6cc291f2cc5ca4c9d6a99e46562b44f4e2c0148374c";
     meta = with lib; {
       homepage = "https://darkreader.org/";
       description = "Dark mode for every website. Take care of your eyes, use dark theme for night and daily browsing.";
diff --git a/modules/profiles/default.nix b/modules/profiles/default.nix
index e3002b0..5edfd7a 100644
--- a/modules/profiles/default.nix
+++ b/modules/profiles/default.nix
@@ -55,7 +55,6 @@ in
       psmisc
       sysstat
       tree
-      usbutils
       util-linux
     ];
   };
diff --git a/modules/profiles/headful.nix b/modules/profiles/headful.nix
index 6e58dae..7060e49 100644
--- a/modules/profiles/headful.nix
+++ b/modules/profiles/headful.nix
@@ -1,5 +1,6 @@
 {
   config,
+  inputs,
   lib,
   pkgs,
   this,
@@ -40,6 +41,8 @@ in
     };
 
     hm = {
+      imports = [ inputs.nix-index-database.hmModules.nix-index ];
+
       home = {
         file.".digrc".text = ''
           +answer
@@ -62,7 +65,11 @@ in
         ];
       };
 
-      programs.bash.shellAliases.open = "xdg-open";
+      programs = {
+        bash.shellAliases.open = "xdg-open";
+
+        nix-index-database.comma.enable = true;
+      };
     };
 
     boot = {
@@ -113,6 +120,7 @@ in
       lm_sensors
       socat
       tcpdump
+      usbutils
     ];
 
     my.extraGroups = [