Compare commits

..

No commits in common. "e6d6e08621655aed31c59ba7be7e43e22ef880b9" and "5dd853afa36172fcad15bf2dc7c44a711bbc9d21" have entirely different histories.

5 changed files with 15 additions and 36 deletions

View File

@ -18,12 +18,12 @@ in with lib; {
ALACRITTY = "1";
};
font = {
normal.family = "Iosevka Term";
bold.family = "Iosevka Term";
italic.family = "Iosevka Term";
bold_italic.family = "Iosevka Term";
normal.family = "FiraCode Nerd Font";
bold.family = "FiraCode Nerd Font";
italic.family = "FiraCode Nerd Font";
bold_italic.family = "FiraCode Nerd Font";
# Bigger on darwin
size = if pkgs.stdenv.isLinux then 10.0 else 12.0;
size = if pkgs.stdenv.isLinux then 9.0 else 11.0;
};
colors = {
primary = {

View File

@ -6,8 +6,7 @@
config = lib.mkIf config.nathan.programs.emacs.enable {
# Setup service
services.emacs = {
# enable = config.nathan.programs.emacs.service;
enable = false;
enable = config.nathan.programs.emacs.service;
client.enable = true;
defaultEditor = true;
};

View File

@ -96,7 +96,7 @@ in with lib; {
terminal = "alacritty";
# Use krunner (from kde) as our launcher
menu = ''
fuzzel -f "Iosevka Sans Quasi" -b "103c48ff" -S "adbcbcff" -s "184956ff" -t "72898fff" -B 5 -r 5 -C "ed8649ff"
fuzzel -f "Fira Sans" -b "103c48ff" -S "adbcbcff" -s "184956ff" -t "72898fff" -B 5 -r 5 -C "ed8649ff"
'';
# Use waybar, but through systemd
bars = [
@ -104,9 +104,9 @@ in with lib; {
# command = "waybar";
# }
];
# Use Iosevka
# Use fira
fonts = {
names = [ "Iosevka Sans Quasi" ];
names = [ "Fira Sans" ];
size = 10.0;
};
# Selenize it
@ -194,8 +194,8 @@ in with lib; {
textColor = "#adbcbc";
# Border configuration
borderSize = 3;
# Use Iosevka for font
font = "Iosevka Sans Quasi 10";
# Use Fira Code for font
font = "Fira Sans 10";
# Group by application
groupBy = "app-name";
# Bottom right corner
@ -266,7 +266,7 @@ in with lib; {
style = ''
* {
/* `otf-font-awesome` is required to be installed for icons */
font-family: FontAwesome, Iosevka Sans Quasi;
font-family: FontAwesome, Fira;
font-size: 14px;
}

View File

@ -6,23 +6,13 @@ in with lib; {
fonts.fonts = with pkgs; [
## Monospace Fonts
# FiraCode with nerd-fonts patch, as well as fira-code symbols for emacs
(nerdfonts.override { fonts = [ "FiraCode" "Iosevka" ]; })
(nerdfonts.override { fonts = [ "FiraCode" ]; })
fira-code-symbols
fira
# Proportional
roboto
liberation_ttf
noto-fonts
(iosevka.override {
privateBuildPlan = ''
[buildPlans.iosevka-sans-quasi]
family = "Iosevka Sans Quasi"
spacing = "quasi-proportional"
serifs = "sans"
no-cv-ss = true
export-glyph-names = false'';
set = "sans-quasi";
})
];
};
}

View File

@ -65,23 +65,13 @@ in with lib; {
fonts.fonts = with pkgs; [
## Monospace Fonts
# FiraCode with nerd-fonts patch, as well as fira-code symbols for emacs
(nerdfonts.override { fonts = [ "FiraCode" "Iosevka" ]; })
(nerdfonts.override { fonts = [ "FiraCode" ]; })
fira-code-symbols
fira
## Proportional
# Proportional
roboto
liberation_ttf
noto-fonts
(iosevka.override {
privateBuildPlan = ''
[buildPlans.iosevka-sans-quasi]
family = "Iosevka Sans Quasi"
spacing = "quasi-proportional"
serifs = "sans"
no-cv-ss = true
export-glyph-names = false'';
set = "sans-quasi";
})
];
})
];