work, work, work

4 files changed, 15 insertions, 4 deletions

diff --git a/modules/user/desktop/apps/foot.nix b/modules/user/desktop/apps/foot.nix
index bbefc11..8673032 100644
--- a/modules/user/desktop/apps/foot.nix
+++ b/modules/user/desktop/apps/foot.nix
@@ -39,7 +39,11 @@
     };
 
     main = {
-      font = "Fira Code:size=${(builtins.toString config.desktop.defaultFontSize)}";
+      font =
+        let
+          fontSize = (builtins.toString config.desktop.defaultFontSize);
+        in
+        "Fira Code:size=${fontSize}, FiraCode Nerd Font Mono:size=${fontSize}";
       selection-target = "none";
     };
 
diff --git a/modules/user/desktop/apps/waybar/default.nix b/modules/user/desktop/apps/waybar/default.nix
index 85c89e2..869f6be 100644
--- a/modules/user/desktop/apps/waybar/default.nix
+++ b/modules/user/desktop/apps/waybar/default.nix
@@ -16,7 +16,7 @@
 
       "sway/language" = {
         on-click = "swaymsg input type:keyboard xkb_switch_layout next";
-        tooltip-format = "{long}";
+        tooltip-format = " {long}";
       };
 
       "sway/workspaces" = {
diff --git a/modules/user/desktop/apps/waybar/style.css b/modules/user/desktop/apps/waybar/style.css
index 10f7787..16039d2 100644
--- a/modules/user/desktop/apps/waybar/style.css
+++ b/modules/user/desktop/apps/waybar/style.css
@@ -1,7 +1,7 @@
 * {
     border: none;
     border-radius: 0;
-    font-family: 'Fira Code', monospace;
+    font-family: 'FiraCode Nerd Font', monospace;
     font-size: 10pt;
     min-height: 0;
 }
@@ -23,7 +23,7 @@ tooltip label {
     background: rgba(0, 0, 0, 0.33);
     border-bottom-left-radius: 5px;
     border-bottom-right-radius: 5px;
-    margin: 0 6px;
+    margin: 0 6px; /* don't ask. the outer gaps are set to 4px but they're actually 6px */
     padding: 0 2px;
 }
 
diff --git a/modules/user/desktop/default.nix b/modules/user/desktop/default.nix
index b915bbe..96bcbd9 100644
--- a/modules/user/desktop/default.nix
+++ b/modules/user/desktop/default.nix
@@ -30,6 +30,13 @@
       };
     };
 
+    fonts.fontconfig.enable = true;
+    home.packages = with pkgs; [
+      fira-code # monospace
+      ipaexfont # JP
+      nerd-fonts.fira-code # nerdfonts icons
+    ];
+
     xdg.dataFile."wallpaper.png" = {
       enable = lib.mkDefault false;
       source = ./freeen.jpg;