nordwand-mono font and some small bixes

9 files changed, 59 insertions, 22 deletions

diff --git a/common/modules/matugen/templates/matugen-niri.nix b/common/modules/matugen/templates/matugen-niri.nix
index 2bb80ca..9012878 100644
--- a/common/modules/matugen/templates/matugen-niri.nix
+++ b/common/modules/matugen/templates/matugen-niri.nix
@@ -9,8 +9,10 @@
       "matugen/templates/matugen.kdl" = {
         text = ''
           layout {
+          	background-color "{{colors.background.default.hex}}"
+
               focus-ring {
-                  active-color   "{{colors.primary.default.hex}}"
+                  active-color "{{colors.primary.default.hex}}"
                   inactive-color "{{colors.outline.default.hex}}"
                   urgent-color   "{{colors.error.default.hex}}"
               }
@@ -22,7 +24,7 @@
               }
 
               shadow {
-                  color "{{colors.shadow.default.hex}}"
+                  color "{{colors.shadow.default.hex}}70"
               }
 
               tab-indicator {
@@ -36,10 +38,14 @@
               }
           }
 
+          overview {
+          	backdrop-color "{{colors.background.default.hex}}"
+          }
+
           recent-windows {
               highlight {
-                  active-color   "{{colors.primary.default.hex}}"
-                  urgent-color   "{{colors.error.default.hex}}"
+                  active-color "{{colors.primary.default.hex}}"
+                  urgent-color "{{colors.error.default.hex}}"
               }
           }
         '';
diff --git a/common/modules/terminal/alacritty.nix b/common/modules/terminal/alacritty.nix
index 57ff494..5254c0b 100644
--- a/common/modules/terminal/alacritty.nix
+++ b/common/modules/terminal/alacritty.nix
@@ -10,6 +10,9 @@ in
     programs.alacritty = {
       enable = true;
       settings = {
+        cursor = {
+          thickness = 0.1;
+        };
         colors = {
           draw_bold_text_with_bright_colors = cfg.font.bright_color_is_bold;
 
@@ -33,7 +36,7 @@ in
               [ "~/.config/alacritty/themes/noctalia.toml" ];
         };
         window = {
-          dynamic_padding = false;
+          # dynamic_padding = false;
           padding = {
             y = cfg.window.padding-y;
             x = cfg.window.padding-x;
@@ -42,6 +45,7 @@ in
         font = {
           normal.family = cfg.font.family;
           size = cfg.font.size;
+          offset.y = -1;
         };
       };
     };
diff --git a/common/modules/terminal/foot.nix b/common/modules/terminal/foot.nix
index 3317bf0..add250b 100644
--- a/common/modules/terminal/foot.nix
+++ b/common/modules/terminal/foot.nix
@@ -20,11 +20,11 @@ in
               [ "~/.config/foot/themes/matugen" ]
             else
               [ "~/.config/foot/themes/noctalia" ];
-          line-height = 13;
-          letter-spacing = 0;
-          vertical-letter-offset = 0;
-          horizontal-letter-offset = 0;
-          underline-offset = 2;
+          # line-height = 13;
+          # letter-spacing = 0;
+          # vertical-letter-offset = 0;
+          # horizontal-letter-offset = 0;
+          # underline-offset = 2;
 
           pad = "${toString cfg.window.padding-x}x${toString cfg.window.padding-y}";
           font = "${cfg.font.family}:size=${toString cfg.font.size}";
diff --git a/common/modules/terminal/ghostty.nix b/common/modules/terminal/ghostty.nix
index a53a74f..4c13452 100644
--- a/common/modules/terminal/ghostty.nix
+++ b/common/modules/terminal/ghostty.nix
@@ -30,10 +30,11 @@ in
         window-decoration = "none";
         window-inherit-working-directory = false;
         cursor-style-blink = false;
-        cursor-style = "block";
-        shell-integration-features = "no-cursor";
+        # bold-color = "default";
+        # cursor-style = "block";
+        # shell-integration-features = "no-cursor";
 
-        adjust-underline-position = "7%";
+        # adjust-underline-position = "7%";
         # adjust-cell-width = "";
         # adjust-cell-height = "";
         # adjust-font-baseline = "";
diff --git a/common/packages/default.nix b/common/packages/default.nix
index d2b5ce6..0a6257e 100644
--- a/common/packages/default.nix
+++ b/common/packages/default.nix
@@ -1,5 +1,6 @@
 { ... }: {
   perSystem = { pkgs, ... }: {
     packages.iosevka-input = import ./iosevka-input.nix { inherit pkgs; };
+    packages.nordwandMono = import ./nordwand-mono.nix { inherit pkgs; };
   };
 }
diff --git a/common/packages/nordwand-mono.nix b/common/packages/nordwand-mono.nix
new file mode 100644
index 0000000..ec0c1f3
--- /dev/null
+++ b/common/packages/nordwand-mono.nix
@@ -0,0 +1,23 @@
+{ pkgs }:
+
+pkgs.stdenv.mkDerivation {
+  pname = "Nordwand-Mono";
+  version = "1.1.1";
+
+  src = pkgs.fetchzip {
+    url = "https://github.com/tywr/Nordwand-Mono/releases/download/1.1.1/NordwandMono-TTF.zip";
+    hash = "sha256-Mg6UW/+4A2b2PSjL3nTtpF/3BNm24zA4N3uWtvrDIdM=";
+    stripRoot = false;
+  };
+
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/fonts/truetype
+    find $src -name "*.ttf" -exec cp {} $out/share/fonts/truetype/ \;
+
+    runHook postInstall
+  '';
+}
diff --git a/flake.lock b/flake.lock
index ae036a8..00f2942 100644
--- a/flake.lock
+++ b/flake.lock
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1787540599,
-        "narHash": "sha256-MHwk52ty3NsLhq9a1IbIfBJZlCUJIdiUYFo52JLK9hY=",
+        "lastModified": 1787680808,
+        "narHash": "sha256-9168tNt0NZdtlx5RM5huEuc9NCWMLACJA9O4UK/l2Zc=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "03f4cd46bc1dd4f3a96da778d2ce9f7ce39dd450",
+        "rev": "6840c9a8f50722944eb106ce8bb237c138584f2a",
         "type": "github"
       },
       "original": {
diff --git a/hosts/common.nix b/hosts/common.nix
index f0b3797..bb92ba9 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -181,18 +181,20 @@
 
   fonts.fontDir.enable = true;
   fonts.packages = with pkgs; [
-    # nerd-fonts.iosevka
-    nerd-fonts.jetbrains-mono
-    # inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.iosevka-input
-    # nerd-fonts.symbols-only
     noto-fonts
+    # nerd-fonts.iosevka
+    nerd-fonts.symbols-only
     noto-fonts-cjk-sans-static
+    # nerd-fonts.jetbrains-mono
+    inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.nordwandMono
+    # inputs.self.packages.${pkgs.stdenv.hostPlatform.system}.iosevka-input
   ];
 
   fonts.fontconfig.defaultFonts.monospace = [
+    "Nordwand Mono"
+    "IosevkaInput"
     "JetBrainsMono NF"
     "Iosevka Nerd Font"
-    "IosevkaInput"
     "Symbols Nerd Font"
   ];
 
diff --git a/users/beeb5k/default.nix b/users/beeb5k/default.nix
index 143492f..c51fbfd 100644
--- a/users/beeb5k/default.nix
+++ b/users/beeb5k/default.nix
@@ -42,7 +42,7 @@
       default = "alacritty";
       alacritty = true;
       font.family = "monospace"; # change default font from ../../hosts/common.nix
-      font.size = 11.0;
+      font.size = 12.0;
     };
   };