1
1
Fork 0

Compare commits

..

No commits in common. "ddc8927436dce67ca0d23214b7e03b784a4a5d04" and "0a9abef2af93407280b8e2ab5b1671bb069114a1" have entirely different histories.

21 changed files with 58 additions and 90 deletions

View file

@ -140,6 +140,7 @@
inputs.arion.nixosModules.arion
inputs.disko.nixosModules.disko
inputs.fw-fanctrl.nixosModules.default
inputs.nix-flatpak.nixosModules.nix-flatpak
];
home-manager.users.${config.custom.username}.imports = [

View file

@ -34,12 +34,5 @@ in {
### Misc
wallpaper = mkOption {default = false;};
font = {
emoji = mkOption {default = "Noto Color Emoji";};
monospace = mkOption {default = "Iosevka NFP SemiBold";};
sans-serif = mkOption {default = "Lexend";};
serif = mkOption {default = "Liberation Serif";};
};
};
}

View file

@ -40,7 +40,7 @@ in {
bar_padding = 10;
bar_precedence_over_border = true; # Render borders around hyprbars
bar_text_align = "left";
bar_text_font = config.custom.font.monospace;
bar_text_font = "monospace";
bar_text_size = 11;
#// bar_title_enabled = false;
"col.text" = "rgb(93a1a1)";

View file

@ -156,7 +156,7 @@ in {
disable_hyprland_logo = true;
disable_splash_rendering = true;
focus_on_activate = true;
font_family = config.custom.font.monospace;
font_family = "monospace";
force_default_wallpaper = 0;
key_press_enables_dpms = true;
middle_click_paste = false;

View file

@ -2,6 +2,6 @@
***/
.bar {
/* font: 18px monospace; */
font: 18px monospace;
color: #eee8d5;
}

View file

@ -47,7 +47,7 @@ in {
*:focus { outline: none; }
#window {
font: 16px ${config.custom.font.monospace};
font: 16px monospace;
background: none;
}

View file

@ -72,15 +72,15 @@ in {
"gnomeTheme.bookmarksToolbarUnderTabs" = true;
"gnomeTheme.systemIcons" = true;
"font.default.x-unicode" = config.custom.font.sans-serif;
"font.default.x-western" = config.custom.font.sans-serif;
"font.name-list.emoji" = config.custom.font.emoji; # System emoji
"font.name.monospace.x-unicode" = config.custom.font.monospace;
"font.name.monospace.x-western" = config.custom.font.monospace;
"font.name.sans-serif.x-unicode" = config.custom.font.sans-serif;
"font.name.sans-serif.x-western" = config.custom.font.sans-serif;
"font.name.serif.x-unicode" = config.custom.font.sans-serif;
"font.name.serif.x-western" = config.custom.font.sans-serif;
"font.default.x-unicode" = "sans-serif";
"font.default.x-western" = "sans-serif";
"font.name-list.emoji" = "emoji"; # System emoji
"font.name.monospace.x-unicode" = "monospace";
"font.name.monospace.x-western" = "monospace";
"font.name.sans-serif.x-unicode" = "sans-serif";
"font.name.sans-serif.x-western" = "sans-serif";
"font.name.serif.x-unicode" = "sans-serif";
"font.name.serif.x-western" = "sans-serif";
"full-screen-api.ignore-widgets" = false; # Fake fullscreen
"full-screen-api.warning.delay" = -1;
"full-screen-api.warning.timeout" = 0;

View file

@ -15,7 +15,7 @@ in {
# https://codeberg.org/dnkl/foot/src/branch/master/foot.ini
settings = {
main.font = "${config.custom.font.monospace}:size=12";
main.font = "monospace:size=12";
scrollback.lines = 10000; # Default 1000
# Solarized Dark

View file

@ -49,7 +49,7 @@ in {
label = {
color = "rgb(fdf6e3)";
font_family = config.custom.font.monospace;
font_family = "monospace";
font_size = 48;
halign = "center";
position = "0, 200";

View file

@ -15,7 +15,7 @@ in {
enable = true;
font = {
name = config.custom.font.monospace;
name = "monospace";
size = 14;
};

View file

@ -32,7 +32,7 @@ in {
#?? rofi-theme-selector
theme = "custom";
font = "${config.custom.font.monospace} 16";
font = "monospace 16";
# https://github.com/davatorium/rofi/blob/next/CONFIG.md
extraConfig = {

View file

@ -31,7 +31,7 @@ in {
indicator-idle-visible = true;
indicator-radius = 150;
font-size = 48 * config.custom.scale;
font = config.custom.font.monospace;
font = "monospace";
image = mkIf config.custom.wallpaper "/tmp/altered.png";
bs-hl-color = "93a1a1";
color = "073642";

View file

@ -74,13 +74,7 @@ in {
# https://github.com/abenz1267/walker/wiki/Theming
theme = {
style = ''
#box {
font: larger ${config.custom.font.sans-serif};
}
${builtins.readFile ./style.css}
'';
style = builtins.readFile ./style.css;
# https://github.com/abenz1267/walker/blob/master/internal/config/layout.default.json
layout.ui.window.box = rec {

View file

@ -14,6 +14,7 @@ https://docs.gtk.org/gtk4/css-properties.html
background: #002b36;
border: 2px #073642 solid;
border-radius: 25px;
font: larger sans-serif;
padding: 4px;
}

View file

@ -9,6 +9,10 @@ config.enable_wayland = false
-- # BUG: Font weight does not render properly with WebGpu
-- https://github.com/wez/wezterm/issues/3032
-- # BUG: fontconfig is broken in unstable
-- https://github.com/NixOS/nixpkgs/pull/338815
-- config.font = wezterm.font('monospace')
config.font = wezterm.font('Iosevka NFP SemiBold')
config.force_reverse_video_cursor = true -- Invert colors

View file

@ -21,8 +21,6 @@ in {
local act = wezterm.action
local config = wezterm.config_builder()
config.font = wezterm.font('${config.custom.font.monospace}')
-- # TODO: Remove when using Wayland
config.font_size = ${toString (14 * config.custom.scale)}

View file

@ -11,21 +11,6 @@ in {
options.custom.services.flatpak.enable = mkOption {default = false;};
config = mkIf cfg.enable {
services.flatpak.enable = true;
#!! Only takes effect if /usr/* shares do not exist
# Nixpkgs workaround requires packages in the global environment
# https://github.com/NixOS/nixpkgs/pull/262462
environment.systemPackages =
config.fonts.packages
++ [
config.home-manager.users.${config.custom.username}.gtk.cursorTheme.package
config.home-manager.users.${config.custom.username}.gtk.iconTheme.package
];
home-manager.users.${config.custom.username} = {
imports = [inputs.nix-flatpak.homeManagerModules.nix-flatpak];
# https://wiki.nixos.org/wiki/Flatpak
# https://github.com/gmodena/nix-flatpak
services.flatpak = {
@ -33,7 +18,7 @@ in {
uninstallUnmanaged = true; # Immutable flatpaks
update.auto.enable = true; # Auto update flatpaks weekly
#!! Installation occurs during activation
#!! Installation occurs in background as a oneshot service
#?? flatpak search NAME
packages =
optionals config.custom.default [
@ -45,18 +30,13 @@ in {
++ optionals config.custom.full [
"app.drey.Biblioteca"
];
};
# https://github.com/gmodena/nix-flatpak?tab=readme-ov-file#overrides
overrides.global = {
Context.filesystems = [
"xdg-config/gtk-3.0:ro"
"xdg-config/gtk-4.0:ro"
# HACK: Globally allow access to /nix/store for symlinked themes
"/nix/store:ro"
# Theme packages must be installed system-wide for flatpaks
environment.systemPackages = with pkgs; [
adw-gtk3
google-cursor
papirus-icon-theme
];
};
};
};
};
}

View file

@ -21,7 +21,7 @@ in {
anchor = "top-center";
backgroundColor = "#073642";
borderColor = "#002b36";
font = "${config.custom.font.sans-serif} 12";
font = "sans-serif 12";
layer = "overlay";
margin = "20";
padding = "10";

View file

@ -25,7 +25,7 @@ in {
fill-tabs = mkBoolean true;
floating-controls = mkBoolean true;
floating-controls-hover-area = mkUint32 10;
font = mkString "${config.custom.font.monospace} 14";
font = mkString "monospace 14";
headerbar-drag-area = mkBoolean false;
notify-process-completion = mkBoolean false;
opacity = mkUint32 100;
@ -71,7 +71,7 @@ in {
cursor-blink = mkBoolean false;
gtk-enable-primary-paste = mkBoolean false;
color-scheme = mkString "prefer-dark";
monospace-font-name = mkString "${config.custom.font.monospace} 14";
monospace-font-name = mkString "monospace 14";
};
# GNOME Files

View file

@ -37,10 +37,10 @@ in {
#?? fc-list --brief | grep family: | sort
fontconfig.defaultFonts = {
emoji = [config.custom.font.emoji];
monospace = [config.custom.font.monospace];
sansSerif = [config.custom.font.sans-serif];
serif = [config.custom.font.serif];
emoji = ["Noto Color Emoji"];
monospace = ["Iosevka NFP SemiBold"];
sansSerif = ["Outfit"];
serif = ["Liberation Serif"];
};
};

View file

@ -27,7 +27,7 @@ in {
};
font = {
name = config.custom.font.sans-serif;
name = "sans-serif";
size = 12;
};
@ -38,9 +38,6 @@ in {
theme = {
name = "adw-gtk3-dark";
# BUG: Forces theme on GTK 4
# https://github.com/nix-community/home-manager/issues/5133
#// package = pkgs.adw-gtk3;
};
};