From 1b126963edd4941c7a6d8e85b7f1cf2263797896 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Thu, 12 Dec 2024 08:19:16 +0000 Subject: [PATCH] Switch to DejaVu font family as main fonts Regular Sans and Serif for proportional fonts, DejaVuSansM Nerd Font for monospace --- flake.lock | 41 +---------- flake.nix | 1 - system/default.nix | 21 ++---- system/home/waybar.nix | 150 ++++++++++++++++++++--------------------- 4 files changed, 84 insertions(+), 129 deletions(-) diff --git a/flake.lock b/flake.lock index 9881c4d6..c53fcd83 100644 --- a/flake.lock +++ b/flake.lock @@ -157,41 +157,7 @@ "type": "github" } }, - "iosevka-custom": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1730274547, - "narHash": "sha256-34sNwbLNuE6l7jsBkBRUMRahoZc63lCsCa+PoZd/8W8=", - "ref": "refs/heads/main", - "rev": "49828459e58b6987d2738b74c085cecb963355ab", - "revCount": 19, - "type": "git", - "url": "https://git.xenia.me.uk/pixelifytica/iosevka.git" - }, - "original": { - "type": "git", - "url": "https://git.xenia.me.uk/pixelifytica/iosevka.git" - } - }, "nixpkgs": { - "locked": { - "lastModified": 1728888510, - "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1733412085, "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", @@ -207,7 +173,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1733097829, "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", @@ -226,8 +192,7 @@ "root": { "inputs": { "home-manager": "home-manager", - "iosevka-custom": "iosevka-custom", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "stylix": "stylix", "treefmt-nix": "treefmt-nix" } @@ -334,7 +299,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1733761991, diff --git a/flake.nix b/flake.nix index 76ccff3a..259e4aa0 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,6 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; treefmt-nix.url = "github:numtide/treefmt-nix"; - iosevka-custom.url = "git+https://git.xenia.me.uk/pixelifytica/iosevka.git"; home-manager = { url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/system/default.nix b/system/default.nix index 4dba29e3..bb1c489e 100644 --- a/system/default.nix +++ b/system/default.nix @@ -217,28 +217,19 @@ size = 32; }; fonts = { - serif = { - package = inputs.iosevka-custom.outputs.packages.${pkgs.system}.iosevka-custom-etoile; - name = inputs.iosevka-custom.outputs.names.iosevka-custom-etoile; - }; - sansSerif = { - package = inputs.iosevka-custom.outputs.packages.${pkgs.system}.iosevka-custom-aile; - name = inputs.iosevka-custom.outputs.names.iosevka-custom-aile; - }; monospace = { - package = pkgs.nerdfonts.override { fonts = [ "Iosevka" ]; }; - name = "Iosevka Nerd Font"; + package = pkgs.nerdfonts.override { fonts = [ "DejaVuSansMono" ]; }; + name = "DejaVuSansM Nerd Font"; }; sizes = { - applications = 12; - desktop = 14; - popups = 16; - terminal = 12; + applications = 10; + desktop = 12; + popups = 14; + terminal = 10; }; }; }; fonts.packages = with pkgs; [ - dejavu_fonts # General compatibility liberation_ttf # Documents lmodern # LaTeX (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) diff --git a/system/home/waybar.nix b/system/home/waybar.nix index 1f94e79c..3ee96762 100644 --- a/system/home/waybar.nix +++ b/system/home/waybar.nix @@ -37,13 +37,13 @@ "hyprland/workspaces" = { format = "{icon}"; format-icons = { - "1" = "󰆍 "; - "2" = "󰖟 "; - "3" = "󰭹 "; - "4" = "󱧶 "; - "5" = "󰢹 "; - "6" = "󰐫 "; - "7" = "󰊴 "; + "1" = "󰆍"; + "2" = "󰖟"; + "3" = "󰭹"; + "4" = "󱧶"; + "5" = "󰢹"; + "6" = "󰐫"; + "7" = "󰊴"; default = "󰀻 "; }; all-outputs = false; @@ -61,29 +61,29 @@ "format" = "{title}"; "max-length" = 50; "rewrite" = { - "(.*) - GNU Emacs at (.*)" = " $1 [$2]"; - "(alacritty.*)" = " $1"; - "(.*) - mpv" = "󰦟 $1"; - "swayimg: (.*)" = "󰋩 $1"; - "swappy" = "󰹑 swappy"; - "(?:/nix/.*)(btm)" = " Resource Usage [$1]"; - "(?:/nix/.*)(cava)" = "󰝚 Music Visualiser [$1]"; - "Mozilla Firefox" = "󰈹 $1"; - "(.*) — Mozilla Firefox" = "󰈹 $1"; - "Nyxt - (.*)" = "󰀹 $1"; - "(.*) - Chromium" = "󰊯 $1"; - "(Signal.*)" = "󰭹 $1"; - "(WhatsApp for Linux.*)" = "󰖣 $1"; - "((?:.*)WebCord.*)" = "󰙯 $1"; - "(Cartridges.*)" = "󰊗 $1"; - "([Ss]team.*)" = "󰓓 $1"; - "(Prism Launcher.*)" = "󰍳 Minecraft ($1)"; - "(.*)(?: *)PrusaSlicer-(.*)" = "󰐫 $1 PrusaSlicer ($2)"; - "(.*)(?: *)PrusaSlicer G-code Viewer-(.*)" = "󰹛 $1 G-code Viewer ($2)"; - "FreeCAD (.*)" = "󰻬 FreeCAD $1"; - "(.*) - Blender.* " = "󰂫 $1"; - "(Remmina Remote Desktop Client)" = "󰢹 $1"; - "(NoMachine|Nxplayer.bin)(?: *)(.*)" = "󰢹 $1 $2"; + "(.*) - GNU Emacs at (.*)" = " $1 [$2]"; + "(alacritty.*)" = " $1"; + "(.*) - mpv" = "󰦟 $1"; + "swayimg: (.*)" = "󰋩 $1"; + "swappy" = "󰹑 swappy"; + "(?:/nix/.*)(btm)" = " Resource Usage [$1]"; + "(?:/nix/.*)(cava)" = "󰝚 Music Visualiser [$1]"; + "Mozilla Firefox" = "󰈹 $1"; + "(.*) — Mozilla Firefox" = "󰈹 $1"; + "Nyxt - (.*)" = "󰀹 $1"; + "(.*) - Chromium" = "󰊯 $1"; + "(Signal.*)" = "󰭹 $1"; + "(WhatsApp for Linux.*)" = "󰖣 $1"; + "((?:.*)WebCord.*)" = "󰙯 $1"; + "(Cartridges.*)" = "󰊗 $1"; + "([Ss]team.*)" = "󰓓 $1"; + "(Prism Launcher.*)" = "󰍳 Minecraft ($1)"; + "(.*)(?: *)PrusaSlicer-(.*)" = "󰐫 $1 PrusaSlicer ($2)"; + "(.*)(?: *)PrusaSlicer G-code Viewer-(.*)" = "󰹛 $1 G-code Viewer ($2)"; + "FreeCAD (.*)" = "󰻬 FreeCAD $1"; + "(.*) - Blender.* " = "󰂫 $1"; + "(Remmina Remote Desktop Client)" = "󰢹 $1"; + "(NoMachine|Nxplayer.bin)(?: *)(.*)" = "󰢹 $1 $2"; }; }; mpris = { @@ -99,7 +99,7 @@ "length" ]; "player-icons" = { - "default" = "󰲸 "; + "default" = "󰲸"; }; "status-icons" = { "playing" = "󰐊"; @@ -110,22 +110,22 @@ }; pulseaudio = { scroll-step = 5; - format = "{format_source}{icon}{volume}%"; - format-muted = "{format_source} 󰝟 "; - format-source = "󰍬 "; - format-source-muted = "󰍭 "; + format = "{format_source} {icon} {volume}%"; + format-muted = "{format_source} 󰝟"; + format-source = "󰍬"; + format-source-muted = "󰍭"; format-icons = { - car = "󰄍 "; + car = "󰄍"; default = [ - "󰕿 " - "󰖀 " - "󰕾 " + "󰕿" + "󰖀" + "󰕾" ]; - hands-free = "󰥰 "; - headset = "󰋎 "; - phone = "󰏲 "; - portable = "󰏳 "; - headphone = "󰋋 "; + hands-free = "󰥰"; + headset = "󰋎"; + phone = "󰏲"; + portable = "󰏳"; + headphone = "󰋋"; }; on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; on-click-right = "${pkgs.pamixer}/bin/pamixer -t"; @@ -154,15 +154,15 @@ }; network = { format-icons = [ - "󰤟 " - "󰤢 " - "󰤥 " - "󰤨 " + "󰤟" + "󰤢" + "󰤥" + "󰤨" ]; format-wifi = "{icon}"; format-ethernet = "󰈁"; - format-linked = "󰈂 "; - format-disconnected = "󰈂 "; + format-linked = "󰈂"; + format-disconnected = "󰈂"; tooltip-format = "{essid} ({signalStrength}%)"; on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; }; @@ -208,23 +208,23 @@ capslock = true; format.capslock = "󰪛 :{icon}"; format-icons = { - locked = "󰌾 "; - unlocked = "󰌿 "; + locked = "󰌾"; + unlocked = "󰌿"; }; }; backlight = { format = "{icon}"; tooltip-format = "{percent}%"; format-icons = [ - " " - " " - " " - " " - " " - " " - " " - " " - " " + "" + "" + "" + "" + "" + "" + "" + "" + "" ]; }; battery = { @@ -235,27 +235,27 @@ format = "{icon}"; format-time = "{H}:{m}"; format-charging = "󰂄 ({time})"; - format-plugged = "󰚥 "; + format-plugged = "󰚥"; format-warning = "{icon}{capacity}%"; format-critical = "{icon}{capacity}% ({time})"; tooltip-format = "{capacity}% | {power}W | {time}"; format-icons = [ - "󱃍 " - "󰁺 " - "󰁻 " - "󰁼 " - "󰁽 " - "󰁾 " - "󰁿 " - "󰂀 " - "󰂁 " - "󰂂 " - "󰁹 " + "󱃍" + "󰁺" + "󰁻" + "󰁼" + "󰁽" + "󰁾" + "󰁿" + "󰂀" + "󰂁" + "󰂂" + "󰁹" ]; }; "systemd-failed-units" = { hide-on-ok = false; - format = "󰀦 S:{nr_failed_system} U:{nr_failed_user}"; + format = "󰀦 S:{nr_failed_system} U:{nr_failed_user}"; format-ok = "󰄬 "; system = true; user = true; @@ -266,7 +266,7 @@ jq = "${pkgs.jq}/bin/jq"; in { - exec = "( ${makoctl} list | ${jq} -e '.data[] | length > 0' >/dev/null && echo '󱅫 ' ) || echo '󰂚 ' "; + exec = "( ${makoctl} list | ${jq} -e '.data[] | length > 0' >/dev/null && echo '󱅫' ) || echo '󰂚' "; format = "{}"; on-click = "${makoctl} dismiss -a"; interval = 3;