diff options
| -rw-r--r-- | home/profiles/gtk.nix | 7 | ||||
| -rw-r--r-- | home/profiles/sway.nix | 17 | ||||
| -rw-r--r-- | home/profiles/waybar.nix | 42 | ||||
| -rw-r--r-- | home/profiles/workstation.nix | 2 | ||||
| -rw-r--r-- | profiles/workstation.nix | 28 |
5 files changed, 30 insertions, 66 deletions
diff --git a/home/profiles/gtk.nix b/home/profiles/gtk.nix index 0be2475..bc68d97 100644 --- a/home/profiles/gtk.nix +++ b/home/profiles/gtk.nix @@ -1,7 +1,10 @@ -{ config, lib, pkgs, ... }: -{ +{ config, lib, pkgs, ... }: { gtk = { enable = true; + font = { + package = pkgs.roboto; + name = "Roboto Medium 11"; + }; cursorTheme = { name = "Numix-Cursor"; package = pkgs.numix-cursor-theme; diff --git a/home/profiles/sway.nix b/home/profiles/sway.nix index dc3999c..193ecd5 100644 --- a/home/profiles/sway.nix +++ b/home/profiles/sway.nix @@ -1,6 +1,12 @@ { config, lib, pkgs, ... }: let modifier = "Mod4"; # `Super` key + fonts = { + names = [ "Roboto" "Font Awesome 5 Free" "Font Awesome 5 Brands" "Arial" "sans-serif" ]; + style = "Bold"; + size = 10.0; + }; + in { imports = [ @@ -59,15 +65,11 @@ in # dbus-update-activation-environment systemdIntegration = true; config = { + inherit fonts modifier; # FIXME: this should be a variable terminal = "kitty"; - modifier = modifier; menu = ''${pkgs.wofi}/bin/wofi -S drun -p "app:" -L 10''; bars = [ ]; - fonts = { - names = [ "Source Code Pro" ]; - size = 10.0; - }; keybindings = lib.mkOptionDefault { # control the volume "XF86AudioRaiseVolume" = @@ -139,10 +141,11 @@ in }; xdg.configFile."swaylock/config".source = pkgs.writeText "config" '' - color=2E3440 daemonize - indicator-caps-lock hide-keyboard-layout + indicator-caps-lock + color=2E3440 + font=Roboto ''; services.swayidle = { diff --git a/home/profiles/waybar.nix b/home/profiles/waybar.nix index 12ad6fb..a7e1ff0 100644 --- a/home/profiles/waybar.nix +++ b/home/profiles/waybar.nix @@ -1,32 +1,4 @@ { config, lib, pkgs, ... }: -let - # waybar-systemd = pkgs.writeShellApplication { - # name = "waybar-systemd.sh"; - # runtimeInputs = [ ]; - # text = '' - # failed_user="$(systemctl --plain --no-legend --user list-units --state=failed | awk '{ print $1 }')" - # failed_system="$(systemctl --plain --no-legend list-units --state=failed | awk '{ print $1 }')" - - # failed_systemd_count="$(echo -n "$failed_system" | grep -c '^')" - # failed_user_count="$(echo -n "$failed_user" | grep -c '^')" - - # text=$(( failed_systemd_count + failed_user_count )) - - # if [ "$text" -eq 0 ]; then - # printf '{"text": ""}\n' - # else - # tooltip="" - - # [ -n "$failed_system" ] && tooltip="Failed system services:\n\n${failed_system}\n\n${tooltip}" - # [ -n "$failed_user" ] && tooltip="Failed user services:\n\n${failed_user}\n\n${tooltip}" - - # tooltip="$(printf "%s" "$tooltip" | perl -pe 's/\n/\\n/g' | perl -pe 's/(?:\\n)+$//')" - - # printf '{"text": "%s", "tooltip": "%s" }\n' "$text" "$tooltip" - # fi - # ''; - # }; -in { programs.waybar = { enable = true; @@ -54,15 +26,10 @@ in warning = 30; critical = 15; }; - format = "ac:{capacity}%"; + format = "bat:{capacity}%"; tooltip = true; tooltip-format = "{timeTo} ({capacity}%)"; }; - # "custom/systemd" = { - # exec = "${waybarSystemd}/bin/waybar-systemd"; - # return-type = "json"; - # interval = 10; - # }; pulseaudio = { format = "vol:{volume}%"; format-bluetooth = "bt:{volume}%"; @@ -85,7 +52,7 @@ in * { border-radius: 0; border: none; - font-family: Source Code Pro; + font-family: "Roboto Mono, Font Awesome 5 Free, Font Awesome 5 Brands, Arial, sans-serif"; font-size: 15px; color: #C5C8C6; min-height: 24px; @@ -96,7 +63,7 @@ in } #window { font-weight: bold; - font-family: Source Code Pro; + font-family: "Roboto Mono, Font Awesome 5 Free, Font Awesome 5 Brands, Arial, sans-serif"; } #workspaces button { padding: 0 5px; @@ -116,9 +83,6 @@ in padding: 0 6px; margin: 0 3px; } - #battery.discharging { - color: #f0c674; - } #battery.warning { border-bottom: 2px solid #efc673; } diff --git a/home/profiles/workstation.nix b/home/profiles/workstation.nix index 8bca5b1..032ad6b 100644 --- a/home/profiles/workstation.nix +++ b/home/profiles/workstation.nix @@ -71,7 +71,7 @@ in programs.kitty = { enable = true; font = { - name = "Source Code Pro"; + name = "JetBrain Mono"; size = 13; }; theme = "Modus Operandi"; diff --git a/profiles/workstation.nix b/profiles/workstation.nix index acc04c5..e607c0d 100644 --- a/profiles/workstation.nix +++ b/profiles/workstation.nix @@ -43,34 +43,28 @@ hardware.pulseaudio.enable = false; + # This is a good source of information about fonts: + # https://github.com/system-fonts/modern-font-stacks fonts = { enableDefaultFonts = true; fontDir.enable = true; fontconfig = { enable = true; defaultFonts = { - serif = [ "Bitstream Vera Serif" ]; - sansSerif = [ "Bitstream Vera Sans" ]; - monospace = [ "Bitstream Vera Sans Mono" ]; + serif = [ "DejaVu Serif" ]; + sansSerif = [ "Roboto" ]; + monospace = [ "JetBrain Mono" ]; }; }; fonts = with pkgs; [ + cantarell-fonts dejavu_fonts - ttf_bitstream_vera - + etBook font-awesome_5 - - noto-fonts - noto-fonts-cjk # Chinese, Japanese, Korean - noto-fonts-emoji - noto-fonts-emoji - noto-fonts-extra - - cantarell-fonts - - source-code-pro - source-sans-pro - source-serif-pro + google-fonts + jetbrains-mono + powerline-fonts + roboto ]; }; |