Switch to DejaVu font family as main fonts

Regular Sans and Serif for proportional fonts, DejaVuSansM Nerd Font
for monospace
This commit is contained in:
Evie Litherland-Smith 2024-12-12 08:19:16 +00:00
parent 327e0716f6
commit 1b126963ed
4 changed files with 84 additions and 129 deletions

View file

@ -157,41 +157,7 @@
"type": "github" "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": { "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": { "locked": {
"lastModified": 1733412085, "lastModified": 1733412085,
"narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=",
@ -207,7 +173,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1733097829, "lastModified": 1733097829,
"narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=", "narHash": "sha256-9hbb1rqGelllb4kVUCZ307G2k3/UhmA8PPGBoyuWaSw=",
@ -226,8 +192,7 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"iosevka-custom": "iosevka-custom", "nixpkgs": "nixpkgs",
"nixpkgs": "nixpkgs_2",
"stylix": "stylix", "stylix": "stylix",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
} }
@ -334,7 +299,7 @@
}, },
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1733761991, "lastModified": 1733761991,

View file

@ -9,7 +9,6 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.url = "github:numtide/treefmt-nix";
iosevka-custom.url = "git+https://git.xenia.me.uk/pixelifytica/iosevka.git";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.11"; url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View file

@ -217,28 +217,19 @@
size = 32; size = 32;
}; };
fonts = { 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 = { monospace = {
package = pkgs.nerdfonts.override { fonts = [ "Iosevka" ]; }; package = pkgs.nerdfonts.override { fonts = [ "DejaVuSansMono" ]; };
name = "Iosevka Nerd Font"; name = "DejaVuSansM Nerd Font";
}; };
sizes = { sizes = {
applications = 12; applications = 10;
desktop = 14; desktop = 12;
popups = 16; popups = 14;
terminal = 12; terminal = 10;
}; };
}; };
}; };
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
dejavu_fonts # General compatibility
liberation_ttf # Documents liberation_ttf # Documents
lmodern # LaTeX lmodern # LaTeX
(nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; }) (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })

View file

@ -37,13 +37,13 @@
"hyprland/workspaces" = { "hyprland/workspaces" = {
format = "{icon}"; format = "{icon}";
format-icons = { format-icons = {
"1" = "󰆍 "; "1" = "󰆍";
"2" = "󰖟 "; "2" = "󰖟";
"3" = "󰭹 "; "3" = "󰭹";
"4" = "󱧶 "; "4" = "󱧶";
"5" = "󰢹 "; "5" = "󰢹";
"6" = "󰐫 "; "6" = "󰐫";
"7" = "󰊴 "; "7" = "󰊴";
default = "󰀻 "; default = "󰀻 ";
}; };
all-outputs = false; all-outputs = false;
@ -61,29 +61,29 @@
"format" = "{title}"; "format" = "{title}";
"max-length" = 50; "max-length" = 50;
"rewrite" = { "rewrite" = {
"(.*) - GNU Emacs at (.*)" = " $1 [$2]"; "(.*) - GNU Emacs at (.*)" = " $1 [$2]";
"(alacritty.*)" = " $1"; "(alacritty.*)" = " $1";
"(.*) - mpv" = "󰦟 $1"; "(.*) - mpv" = "󰦟 $1";
"swayimg: (.*)" = "󰋩 $1"; "swayimg: (.*)" = "󰋩 $1";
"swappy" = "󰹑 swappy"; "swappy" = "󰹑 swappy";
"(?:/nix/.*)(btm)" = " Resource Usage [$1]"; "(?:/nix/.*)(btm)" = " Resource Usage [$1]";
"(?:/nix/.*)(cava)" = "󰝚 Music Visualiser [$1]"; "(?:/nix/.*)(cava)" = "󰝚 Music Visualiser [$1]";
"Mozilla Firefox" = "󰈹 $1"; "Mozilla Firefox" = "󰈹 $1";
"(.*) Mozilla Firefox" = "󰈹 $1"; "(.*) Mozilla Firefox" = "󰈹 $1";
"Nyxt - (.*)" = "󰀹 $1"; "Nyxt - (.*)" = "󰀹 $1";
"(.*) - Chromium" = "󰊯 $1"; "(.*) - Chromium" = "󰊯 $1";
"(Signal.*)" = "󰭹 $1"; "(Signal.*)" = "󰭹 $1";
"(WhatsApp for Linux.*)" = "󰖣 $1"; "(WhatsApp for Linux.*)" = "󰖣 $1";
"((?:.*)WebCord.*)" = "󰙯 $1"; "((?:.*)WebCord.*)" = "󰙯 $1";
"(Cartridges.*)" = "󰊗 $1"; "(Cartridges.*)" = "󰊗 $1";
"([Ss]team.*)" = "󰓓 $1"; "([Ss]team.*)" = "󰓓 $1";
"(Prism Launcher.*)" = "󰍳 Minecraft ($1)"; "(Prism Launcher.*)" = "󰍳 Minecraft ($1)";
"(.*)(?: *)PrusaSlicer-(.*)" = "󰐫 $1 PrusaSlicer ($2)"; "(.*)(?: *)PrusaSlicer-(.*)" = "󰐫 $1 PrusaSlicer ($2)";
"(.*)(?: *)PrusaSlicer G-code Viewer-(.*)" = "󰹛 $1 G-code Viewer ($2)"; "(.*)(?: *)PrusaSlicer G-code Viewer-(.*)" = "󰹛 $1 G-code Viewer ($2)";
"FreeCAD (.*)" = "󰻬 FreeCAD $1"; "FreeCAD (.*)" = "󰻬 FreeCAD $1";
"(.*) - Blender.* " = "󰂫 $1"; "(.*) - Blender.* " = "󰂫 $1";
"(Remmina Remote Desktop Client)" = "󰢹 $1"; "(Remmina Remote Desktop Client)" = "󰢹 $1";
"(NoMachine|Nxplayer.bin)(?: *)(.*)" = "󰢹 $1 $2"; "(NoMachine|Nxplayer.bin)(?: *)(.*)" = "󰢹 $1 $2";
}; };
}; };
mpris = { mpris = {
@ -99,7 +99,7 @@
"length" "length"
]; ];
"player-icons" = { "player-icons" = {
"default" = "󰲸 "; "default" = "󰲸";
}; };
"status-icons" = { "status-icons" = {
"playing" = "󰐊"; "playing" = "󰐊";
@ -110,22 +110,22 @@
}; };
pulseaudio = { pulseaudio = {
scroll-step = 5; scroll-step = 5;
format = "{format_source}{icon}{volume}%"; format = "{format_source} {icon} {volume}%";
format-muted = "{format_source} 󰝟 "; format-muted = "{format_source} 󰝟";
format-source = "󰍬 "; format-source = "󰍬";
format-source-muted = "󰍭 "; format-source-muted = "󰍭";
format-icons = { format-icons = {
car = "󰄍 "; car = "󰄍";
default = [ default = [
"󰕿 " "󰕿"
"󰖀 " "󰖀"
"󰕾 " "󰕾"
]; ];
hands-free = "󰥰 "; hands-free = "󰥰";
headset = "󰋎 "; headset = "󰋎";
phone = "󰏲 "; phone = "󰏲";
portable = "󰏳 "; portable = "󰏳";
headphone = "󰋋 "; headphone = "󰋋";
}; };
on-click = "${pkgs.pavucontrol}/bin/pavucontrol"; on-click = "${pkgs.pavucontrol}/bin/pavucontrol";
on-click-right = "${pkgs.pamixer}/bin/pamixer -t"; on-click-right = "${pkgs.pamixer}/bin/pamixer -t";
@ -154,15 +154,15 @@
}; };
network = { network = {
format-icons = [ format-icons = [
"󰤟 " "󰤟"
"󰤢 " "󰤢"
"󰤥 " "󰤥"
"󰤨 " "󰤨"
]; ];
format-wifi = "{icon}"; format-wifi = "{icon}";
format-ethernet = "󰈁"; format-ethernet = "󰈁";
format-linked = "󰈂 "; format-linked = "󰈂";
format-disconnected = "󰈂 "; format-disconnected = "󰈂";
tooltip-format = "{essid} ({signalStrength}%)"; tooltip-format = "{essid} ({signalStrength}%)";
on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor"; on-click = "${pkgs.networkmanagerapplet}/bin/nm-connection-editor";
}; };
@ -208,23 +208,23 @@
capslock = true; capslock = true;
format.capslock = "󰪛 :{icon}"; format.capslock = "󰪛 :{icon}";
format-icons = { format-icons = {
locked = "󰌾 "; locked = "󰌾";
unlocked = "󰌿 "; unlocked = "󰌿";
}; };
}; };
backlight = { backlight = {
format = "{icon}"; format = "{icon}";
tooltip-format = "{percent}%"; tooltip-format = "{percent}%";
format-icons = [ format-icons = [
" " ""
" " ""
" " ""
" " ""
" " ""
" " ""
" " ""
" " ""
" " ""
]; ];
}; };
battery = { battery = {
@ -235,27 +235,27 @@
format = "{icon}"; format = "{icon}";
format-time = "{H}:{m}"; format-time = "{H}:{m}";
format-charging = "󰂄 ({time})"; format-charging = "󰂄 ({time})";
format-plugged = "󰚥 "; format-plugged = "󰚥";
format-warning = "{icon}{capacity}%"; format-warning = "{icon}{capacity}%";
format-critical = "{icon}{capacity}% ({time})"; format-critical = "{icon}{capacity}% ({time})";
tooltip-format = "{capacity}% | {power}W | {time}"; tooltip-format = "{capacity}% | {power}W | {time}";
format-icons = [ format-icons = [
"󱃍 " "󱃍"
"󰁺 " "󰁺"
"󰁻 " "󰁻"
"󰁼 " "󰁼"
"󰁽 " "󰁽"
"󰁾 " "󰁾"
"󰁿 " "󰁿"
"󰂀 " "󰂀"
"󰂁 " "󰂁"
"󰂂 " "󰂂"
"󰁹 " "󰁹"
]; ];
}; };
"systemd-failed-units" = { "systemd-failed-units" = {
hide-on-ok = false; hide-on-ok = false;
format = "󰀦 S:{nr_failed_system} U:{nr_failed_user}"; format = "󰀦 S:{nr_failed_system} U:{nr_failed_user}";
format-ok = "󰄬 "; format-ok = "󰄬 ";
system = true; system = true;
user = true; user = true;
@ -266,7 +266,7 @@
jq = "${pkgs.jq}/bin/jq"; jq = "${pkgs.jq}/bin/jq";
in 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 = "{}"; format = "{}";
on-click = "${makoctl} dismiss -a"; on-click = "${makoctl} dismiss -a";
interval = 3; interval = 3;