Skip to content

Commit

Permalink
Use Iosevka instead of the nerd font
Browse files Browse the repository at this point in the history
This commit uses Iosevka instead of the nerd font. It also adds
hardcoded values to the fastfetch config, such as terminal, multiplexer,
font and more.

Signed-off-by: Nick Gerace <[email protected]>
  • Loading branch information
nickgerace committed Jan 2, 2025
1 parent 1fc47e8 commit f3bccdd
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 44 deletions.
27 changes: 0 additions & 27 deletions bin/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,19 +148,6 @@ elif [ "$INSTALL_PLATFORM" = "pop" ]; then
log "Installing base packages..."
xargs sudo apt install -y <"$INSTALL_DOTFILES_REPO/os/pop-os/pkgs/core.lst"

if [ ! -f "$HOME/.local/share/fonts/IosevkaNerdFont-Regular.ttf" ]; then
log "Installing iosevka nerd font..."
mkdir -p "$HOME/.local/share/fonts"
pushd "$HOME/.local/share/fonts"
curl -OL https://github.com/ryanoasis/nerd-fonts/releases/latest/download/Iosevka.tar.xz
tar -xf Iosevka.tar.xz
[[ -f LICENSE ]] && rm LICENSE
[[ -f README.md ]] && rm README.md
rm Iosevka.tar.xz
popd
fc-cache
fi

log "Checking for nix installation..."
if ! command -v nix && [ -f /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh ]; then
. /nix/var/nix/profiles/default/etc/profile.d/nix-daemon.sh
Expand Down Expand Up @@ -464,20 +451,6 @@ elif [ "$INSTALL_PLATFORM" = "fedora-workstation" ]; then
log "Installing flatpaks..."
xargs flatpak install flathub -y <"$INSTALL_DOTFILES_REPO/os/fedora/pkgs/flatpak.lst"

log "Checking for Iosevka Nerd Font..."
if [ ! -f "$HOME/.local/share/fonts/IosevkaNerdFont-Regular.ttf" ]; then
log "Installing Iosevka Nerd Font..."
mkdir -p "$HOME/.local/share/fonts"
pushd "$HOME/.local/share/fonts"
curl -OL https://github.com/ryanoasis/nerd-fonts/releases/latest/download/Iosevka.tar.xz
tar -xf Iosevka.tar.xz
[[ -f LICENSE ]] && rm LICENSE
[[ -f README.md ]] && rm README.md
rm Iosevka.tar.xz
popd
fc-cache
fi

log "Running final update and cleanup commands..."
sudo -i nix upgrade-nix
npm up -g
Expand Down
33 changes: 27 additions & 6 deletions fastfetch/config.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@
"key": "Shell",
"type": "shell"
},
{
"key": "Terminal",
"type": "terminal"
},
{
"key": "DE",
"type": "de",
Expand All @@ -67,7 +63,7 @@
"format": "{9} {11} {6} {1} - {14}:{18} {22} ({21})"
},
{
"key": "Version",
"key": "Fastfetch",
"type": "version",
"format": "{2}",
},
Expand All @@ -79,6 +75,31 @@
{
"type": "custom",
"format": "―――――――――――――――――――――――"
}
},
{
"type": "custom",
"key": "Font",
"format": "Iosevka",
},
{
"type": "custom",
"key": "Multiplexer",
"format": "Zellij",
},
{
"type": "custom",
"key": "Terminal",
"format": "Ghostty",
},
{
"type": "custom",
"key": "Editor",
"format": "Helix",
},
{
"type": "custom",
"key": "Theme",
"format": "Catppuccin Frappé",
},
]
}
2 changes: 1 addition & 1 deletion ghostty/config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
theme = catppuccin-frappe
font-family = "Iosevka Nerd Font"
font-family = "Iosevka"
font-size = 15
macos-option-as-alt = true
title = Ghostty
Expand Down
8 changes: 4 additions & 4 deletions inactive/alacritty/main.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@ dynamic_title = false
# decorations = "None"

[font.normal]
family = "Iosevka Nerd Font"
family = "Iosevka"
style = "Regular"

[font.bold]
family = "Iosevka Nerd Font"
family = "Iosevka"
style = "Bold"

[font.italic]
family = "Iosevka Nerd Font"
family = "Iosevka"
style = "Italic"

[font.bold_italic]
family = "Iosevka Nerd Font"
family = "Iosevka"
style = "Bold Italic"

[window.padding]
Expand Down
2 changes: 1 addition & 1 deletion inactive/wezterm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if wezterm.config_builder then
config = wezterm.config_builder()
end

config.font = wezterm.font 'Iosevka Nerd Font'
config.font = wezterm.font 'Iosevka'
config.enable_tab_bar = false
config.color_scheme = 'OneHalfLight'
config.audible_bell = 'Disabled'
Expand Down
1 change: 0 additions & 1 deletion os/arch-linux/pkgs/core.lst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ rustup
sed
speedtest-cli
tree
ttf-iosevka-nerd
wget
yq
zellij
Expand Down
4 changes: 1 addition & 3 deletions os/nix-darwin/common.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@
direnv
];

fonts.packages = with pkgs; [
nerd-fonts.iosevka
];
fonts.packages = [pkgs.iosevka];

programs.zsh.enable = true;
environment.shells = [pkgs.zsh];
Expand Down
1 change: 0 additions & 1 deletion os/nixos/desktop/configuration.nix
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
zoxide
zsh
];
fonts.packages = with pkgs-unstable; [(nerdfonts.override {fonts = ["Iosevka"];})];

nix = {
gc = {
Expand Down

0 comments on commit f3bccdd

Please sign in to comment.