Compare commits
No commits in common. "e6d6e08621655aed31c59ba7be7e43e22ef880b9" and "5dd853afa36172fcad15bf2dc7c44a711bbc9d21" have entirely different histories.
e6d6e08621
...
5dd853afa3
|
@ -18,12 +18,12 @@ in with lib; {
|
||||||
ALACRITTY = "1";
|
ALACRITTY = "1";
|
||||||
};
|
};
|
||||||
font = {
|
font = {
|
||||||
normal.family = "Iosevka Term";
|
normal.family = "FiraCode Nerd Font";
|
||||||
bold.family = "Iosevka Term";
|
bold.family = "FiraCode Nerd Font";
|
||||||
italic.family = "Iosevka Term";
|
italic.family = "FiraCode Nerd Font";
|
||||||
bold_italic.family = "Iosevka Term";
|
bold_italic.family = "FiraCode Nerd Font";
|
||||||
# Bigger on darwin
|
# 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 = {
|
colors = {
|
||||||
primary = {
|
primary = {
|
||||||
|
|
|
@ -6,8 +6,7 @@
|
||||||
config = lib.mkIf config.nathan.programs.emacs.enable {
|
config = lib.mkIf config.nathan.programs.emacs.enable {
|
||||||
# Setup service
|
# Setup service
|
||||||
services.emacs = {
|
services.emacs = {
|
||||||
# enable = config.nathan.programs.emacs.service;
|
enable = config.nathan.programs.emacs.service;
|
||||||
enable = false;
|
|
||||||
client.enable = true;
|
client.enable = true;
|
||||||
defaultEditor = true;
|
defaultEditor = true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -96,7 +96,7 @@ in with lib; {
|
||||||
terminal = "alacritty";
|
terminal = "alacritty";
|
||||||
# Use krunner (from kde) as our launcher
|
# Use krunner (from kde) as our launcher
|
||||||
menu = ''
|
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
|
# Use waybar, but through systemd
|
||||||
bars = [
|
bars = [
|
||||||
|
@ -104,9 +104,9 @@ in with lib; {
|
||||||
# command = "waybar";
|
# command = "waybar";
|
||||||
# }
|
# }
|
||||||
];
|
];
|
||||||
# Use Iosevka
|
# Use fira
|
||||||
fonts = {
|
fonts = {
|
||||||
names = [ "Iosevka Sans Quasi" ];
|
names = [ "Fira Sans" ];
|
||||||
size = 10.0;
|
size = 10.0;
|
||||||
};
|
};
|
||||||
# Selenize it
|
# Selenize it
|
||||||
|
@ -194,8 +194,8 @@ in with lib; {
|
||||||
textColor = "#adbcbc";
|
textColor = "#adbcbc";
|
||||||
# Border configuration
|
# Border configuration
|
||||||
borderSize = 3;
|
borderSize = 3;
|
||||||
# Use Iosevka for font
|
# Use Fira Code for font
|
||||||
font = "Iosevka Sans Quasi 10";
|
font = "Fira Sans 10";
|
||||||
# Group by application
|
# Group by application
|
||||||
groupBy = "app-name";
|
groupBy = "app-name";
|
||||||
# Bottom right corner
|
# Bottom right corner
|
||||||
|
@ -266,7 +266,7 @@ in with lib; {
|
||||||
style = ''
|
style = ''
|
||||||
* {
|
* {
|
||||||
/* `otf-font-awesome` is required to be installed for icons */
|
/* `otf-font-awesome` is required to be installed for icons */
|
||||||
font-family: FontAwesome, Iosevka Sans Quasi;
|
font-family: FontAwesome, Fira;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,23 +6,13 @@ in with lib; {
|
||||||
fonts.fonts = with pkgs; [
|
fonts.fonts = with pkgs; [
|
||||||
## Monospace Fonts
|
## Monospace Fonts
|
||||||
# FiraCode with nerd-fonts patch, as well as fira-code symbols for emacs
|
# 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-code-symbols
|
||||||
fira
|
fira
|
||||||
# Proportional
|
# Proportional
|
||||||
roboto
|
roboto
|
||||||
liberation_ttf
|
liberation_ttf
|
||||||
noto-fonts
|
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";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,23 +65,13 @@ in with lib; {
|
||||||
fonts.fonts = with pkgs; [
|
fonts.fonts = with pkgs; [
|
||||||
## Monospace Fonts
|
## Monospace Fonts
|
||||||
# FiraCode with nerd-fonts patch, as well as fira-code symbols for emacs
|
# 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-code-symbols
|
||||||
fira
|
fira
|
||||||
## Proportional
|
# Proportional
|
||||||
roboto
|
roboto
|
||||||
liberation_ttf
|
liberation_ttf
|
||||||
noto-fonts
|
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";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in New Issue