mirror of
https://github.com/alyraffauf/nixcfg.git
synced 2024-11-21 20:33:55 -05:00
home: fixed font inconsistency
This commit is contained in:
parent
8d4c870999
commit
ac9f812f25
5
aly.nix
5
aly.nix
|
@ -70,12 +70,12 @@
|
|||
package = pkgs.catppuccin-cursors.frappeDark;
|
||||
};
|
||||
font = {
|
||||
name = "NotoSansNerdFont";
|
||||
name = "NotoSans Nerd Font";
|
||||
size = 11;
|
||||
package = pkgs.nerdfonts.override {fonts = ["Noto"];};
|
||||
};
|
||||
terminalFont = {
|
||||
name = "NotoSansMNerdFont";
|
||||
name = "NotoSansM Nerd Font";
|
||||
size = 11;
|
||||
package = pkgs.nerdfonts.override {fonts = ["Noto"];};
|
||||
};
|
||||
|
@ -125,6 +125,7 @@
|
|||
"workspace 4: work" = [{app_id = "google-chrome";} {app_id = "chromium-browser";}];
|
||||
"workspace 10: zoom" = [{class = "zoom";} {app_id = "Zoom";}];
|
||||
};
|
||||
|
||||
wayland.windowManager.hyprland.extraConfig = ''
|
||||
# Workspace - Browser
|
||||
workspace = 1,defaultName:web
|
||||
|
|
|
@ -57,12 +57,12 @@
|
|||
package = pkgs.catppuccin-cursors.frappeDark;
|
||||
};
|
||||
font = {
|
||||
name = "NotoSansNerdFont";
|
||||
name = "NotoSans Nerd Font";
|
||||
size = 11;
|
||||
package = pkgs.nerdfonts.override {fonts = ["Noto"];};
|
||||
};
|
||||
terminalFont = {
|
||||
name = "NotoSansMNerdFont";
|
||||
name = "NotoSansM Nerd Font";
|
||||
size = 11;
|
||||
package = pkgs.nerdfonts.override {fonts = ["Noto"];};
|
||||
};
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
enable = true;
|
||||
settings = {
|
||||
main = {
|
||||
font = "${config.alyraffauf.desktop.theme.terminalFont.name}-Regular";
|
||||
font = "${config.alyraffauf.desktop.theme.terminalFont.name} Regular";
|
||||
icon-theme = "${config.alyraffauf.desktop.theme.iconTheme.name}";
|
||||
layer = "overlay";
|
||||
width = 36;
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
"org/cinnamon/desktop/background".picture-uri = "file://${config.alyraffauf.desktop.theme.wallpaper}";
|
||||
"org/cinnamon/desktop/interface".cursor-size = config.alyraffauf.desktop.theme.cursorTheme.size;
|
||||
"org/cinnamon/desktop/interface".cursor-theme = config.alyraffauf.desktop.theme.cursorTheme.name;
|
||||
"org/cinnamon/desktop/interface".font-name = "${config.alyraffauf.desktop.theme.font.name}-Regular ${toString config.alyraffauf.desktop.theme.font.size}";
|
||||
"org/cinnamon/desktop/interface".font-name = "${config.alyraffauf.desktop.theme.font.name} Regular ${toString config.alyraffauf.desktop.theme.font.size}";
|
||||
"org/cinnamon/desktop/interface".gtk-theme = config.alyraffauf.desktop.theme.gtk.name;
|
||||
"org/cinnamon/desktop/interface".icon-theme = config.alyraffauf.desktop.theme.iconTheme.name;
|
||||
"org/cinnamon/desktop/wm/preferences".titlebar-font = "${config.alyraffauf.desktop.theme.font.name} ${toString config.alyraffauf.desktop.theme.font.size}";
|
||||
|
@ -23,11 +23,12 @@
|
|||
"org/cinnamon/muffin".workspace-cycle = true;
|
||||
"org/cinnamon/muffin".workspaces-only-on-primary = true;
|
||||
"org/cinnamon/settings-daemon/peripherals/touchscreen".orientation-lock = false;
|
||||
"org/cinnamon/theme".name = config.alyraffauf.desktop.theme.gtk.name; "org/gnome/desktop/interface".gtk-theme = config.alyraffauf.desktop.theme.gtk.name;
|
||||
"org/cinnamon/theme".name = config.alyraffauf.desktop.theme.gtk.name;
|
||||
"org/gnome/desktop/interface".gtk-theme = config.alyraffauf.desktop.theme.gtk.name;
|
||||
"org/gnome/desktop/interface".cursor-size = config.alyraffauf.desktop.theme.cursorTheme.size;
|
||||
"org/gnome/desktop/interface".cursor-theme = config.alyraffauf.desktop.theme.cursorTheme.name;
|
||||
"org/gnome/desktop/interface".icon-theme = config.alyraffauf.desktop.theme.iconTheme.name;
|
||||
"org/gnome/desktop/interface".monospace-font-name = "${config.alyraffauf.desktop.theme.terminalFont.name} ${toString config.alyraffauf.desktop.theme.terminalFont.size}";
|
||||
"org/gnome/desktop/interface".monospace-font-name = "${config.alyraffauf.desktop.theme.terminalFont.name} Regular ${toString config.alyraffauf.desktop.theme.terminalFont.size}";
|
||||
"org/gnome/desktop/peripherals/touchpad".natural-scroll = true;
|
||||
"org/gnome/desktop/peripherals/touchpad".tap-to-click = true;
|
||||
"org/gnome/desktop/wm/preferences".titlebar-font = "${config.alyraffauf.desktop.theme.font.name} ${toString config.alyraffauf.desktop.theme.font.size}";
|
||||
|
|
|
@ -59,7 +59,7 @@
|
|||
alyraffauf.desktop.theme.font = {
|
||||
name = lib.mkOption {
|
||||
description = "Font name.";
|
||||
default = "NotoSansNerdFont";
|
||||
default = "NotoSans Nerd Font";
|
||||
type = lib.types.str;
|
||||
};
|
||||
size = lib.mkOption {
|
||||
|
@ -76,7 +76,7 @@
|
|||
alyraffauf.desktop.theme.terminalFont = {
|
||||
name = lib.mkOption {
|
||||
description = "Font name.";
|
||||
default = "NotoSansMNerdFont";
|
||||
default = "NotoSansM Nerd Font";
|
||||
type = lib.types.str;
|
||||
};
|
||||
size = lib.mkOption {
|
||||
|
@ -153,7 +153,7 @@
|
|||
enable = true;
|
||||
defaultFonts = {
|
||||
monospace = [config.alyraffauf.desktop.theme.terminalFont.name];
|
||||
serif = ["NotoSerifNerdFont"];
|
||||
serif = ["NotoSerif Nerd Font"];
|
||||
sansSerif = [config.alyraffauf.desktop.theme.font.name];
|
||||
};
|
||||
};
|
||||
|
@ -172,7 +172,7 @@
|
|||
};
|
||||
|
||||
font = {
|
||||
name = "${config.alyraffauf.desktop.theme.font.name}";
|
||||
name = "${config.alyraffauf.desktop.theme.font.name} Regular";
|
||||
package = config.alyraffauf.desktop.theme.font.package;
|
||||
size = config.alyraffauf.desktop.theme.font.size;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue