diff --git a/dotfiles/alacritty.yml b/dotfiles/alacritty.yml index 6fa9a64..eac8077 100644 --- a/dotfiles/alacritty.yml +++ b/dotfiles/alacritty.yml @@ -1,6 +1,6 @@ font: normal: - family: Cascadia Code + family: CaskaydiaCove Nerd Font size: 12 background_opacity: 0.9 diff --git a/dotfiles/sway/config b/dotfiles/sway/config index 2e6775e..74e9834 100644 --- a/dotfiles/sway/config +++ b/dotfiles/sway/config @@ -53,7 +53,7 @@ for_window [title="pyCalc"] floating enable for_window [title="insect"] floating enable # font -font Cascadia Code 10 +#font pango:CaskaydiaCove Nerd Font Mono 10 # colors set $black #2d2a2e diff --git a/dotfiles/sway/status.toml b/dotfiles/sway/status.toml index 0e3b587..4a04ddd 100644 --- a/dotfiles/sway/status.toml +++ b/dotfiles/sway/status.toml @@ -18,28 +18,31 @@ separator = "|" [icons] name = "none" [icons.overrides] -bat = "  " -bat_full = "  " -bat_charging = "   " -bat_discharging = "  " -backlight_empty = "  " -backlight_partial1 = "  " -backlight_partial2 = "  " -backlight_partial3 = "  " -backlight_full = "  " -volume_full = "  " -volume_half = "  " -volume_empty = "  " -volume_muted= "MUTE" -cogs = "  " -memory_mem = "  " +backlight_empty = "" +backlight_full = "" +backlight_partial1 = "" +backlight_partial2 = "" +backlight_partial3 = "" +bat = "" +bat_charging = " " +bat_discharging = "" +bat_empty = "" +bat_full = "" +cogs = "" +disk_space = "" headphones = "  " -net_wireless = " " +memory_mem = "" +net_down = "DOWN" +net_up = "UP" net_vpn = " " net_wired = "" -net_up = "UP" -net_down = "DOWN" +net_wireless = " " thermometer = "  " +time = "" +volume_empty = "" +volume_full = "" +volume_half = "" +volume_muted= " MUTE" [[block]] @@ -72,6 +75,7 @@ alert = 10.0 block = "memory" display_type = "memory" format_mem = "{mem_total_used_percents}" +icons_format = " {icon}" clickable = false [[block]] @@ -90,7 +94,15 @@ block = "backlight" block = "battery" device = "BAT0" interval = 10 -format = "{percentage}% {time}" +format = "{percentage} ({time})" +icons_format = " {icon} " + +[[block]] +block = "battery" +device = "BAT1" +interval = 10 +format = "{percentage} ({time})" +icons_format = " {icon} " [[block]] block = "time" diff --git a/roles/desktop.nix b/roles/desktop.nix index b6f1955..2151945 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -72,14 +72,14 @@ in { fonts.enableDefaultFonts = true; fonts.fontconfig.antialias = true; fonts.fonts = with pkgs; [ - cascadia-code + corefonts emacs-all-the-icons-fonts fira-code - fira-code-symbols - font-awesome - meslo-lg noto-fonts noto-fonts-emoji + (nerdfonts.override { + fonts = [ "CascadiaCode" "Meslo" ]; + }) ]; nixpkgs.config.allowUnfree = true;