diff options
| -rw-r--r-- | dotfiles/alacritty.toml | 12 | ||||
| -rw-r--r-- | dotfiles/xmobar.hs | 3 | ||||
| -rw-r--r-- | modules/fonts/berkeley-mono.nix (renamed from modules/fonts/berkeley-mono/default.nix) | 3 | ||||
| -rw-r--r-- | modules/fonts/default.nix | 6 | ||||
| -rw-r--r-- | modules/fonts/monolisa.nix | 35 | ||||
| -rw-r--r-- | modules/fonts/tx-02.nix | 35 | ||||
| -rw-r--r-- | secrets/monolisa.zip | bin | 0 -> 519925 bytes | |||
| -rw-r--r-- | secrets/tx-02.zip | bin | 0 -> 1122504 bytes |
8 files changed, 83 insertions, 11 deletions
diff --git a/dotfiles/alacritty.toml b/dotfiles/alacritty.toml index aff5951..3561737 100644 --- a/dotfiles/alacritty.toml +++ b/dotfiles/alacritty.toml @@ -43,19 +43,19 @@ TERM = "xterm-256color" size = 12.0 [font.bold] -family = "Berkeley Mono" +family = "TX-02" style = "Bold" [font.bold_italic] -family = "Berkeley Mono" -style = "Bold Italic" +family = "TX-02" +style = "Bold Oblique" [font.italic] -family = "Berkeley Mono" -style = "Italic" +family = "TX-02" +style = "Oblique" [font.normal] -family = "Berkeley Mono" +family = "TX-02" style = "Regular" [[keyboard.bindings]] diff --git a/dotfiles/xmobar.hs b/dotfiles/xmobar.hs index 9ffe08e..c0abc8e 100644 --- a/dotfiles/xmobar.hs +++ b/dotfiles/xmobar.hs @@ -1,7 +1,8 @@ Config { -- appearance - font = "xft:Berkeley Mono:size=10,Inconsolata LGC Nerd Font:size=10,DejaVu Sans Mono Nerd Font:size=10,Noto Sans Mono CJK JP:size=10,Noto Color Emoji:size=10,Noto Sans Hebrew:size=10" + font = "TX-02 10" + , additionalFonts = ["Inconsolata LGC Nerd Font 10"] , bgColor = "#222222" , fgColor = "#bbbbbb" , position = Top diff --git a/modules/fonts/berkeley-mono/default.nix b/modules/fonts/berkeley-mono.nix index 3375217..8625abd 100644 --- a/modules/fonts/berkeley-mono/default.nix +++ b/modules/fonts/berkeley-mono.nix @@ -8,7 +8,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "berkeley-mono"; version = "1"; - src = ../../../secrets/berkeley-mono.zip; + src = ../../secrets/berkeley-mono.zip; outputs = [ "out" @@ -35,7 +35,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Berkeley Mono Typeface"; - longDescription = "…"; homepage = "https://berkeleygraphics.com/typefaces/berkeley-mono"; license = lib.licenses.unfree; platforms = lib.platforms.all; diff --git a/modules/fonts/default.nix b/modules/fonts/default.nix index 9c4cf45..e3a7086 100644 --- a/modules/fonts/default.nix +++ b/modules/fonts/default.nix @@ -6,11 +6,13 @@ noto-fonts-emoji nerd-fonts.inconsolata-lgc nerd-fonts.noto - (pkgs.callPackage ./berkeley-mono {}) + (pkgs.callPackage ./berkeley-mono.nix {}) + (pkgs.callPackage ./tx-02.nix {}) + (pkgs.callPackage ./monolisa.nix {}) ]; fontconfig = { defaultFonts = { - monospace = [ "Berkeley Mono" "Inconsolata LGC" ]; + monospace = [ "TX-02" "Inconsolata LGC" ]; }; # localConf = '' # <?xml version="1.0"?> diff --git a/modules/fonts/monolisa.nix b/modules/fonts/monolisa.nix new file mode 100644 index 0000000..9ba1917 --- /dev/null +++ b/modules/fonts/monolisa.nix @@ -0,0 +1,35 @@ +{ + lib, + requireFile, + unzip, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "monolisa"; + version = "1"; + + src = ../../secrets/monolisa.zip; + + outputs = [ + "out" + ]; + + nativeBuildInputs = [ + unzip + ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + install -m444 -Dt $out/share/fonts/opentype/monolisa monolisa/*.ttf + ''; + + meta = { + description = "Monolisa Typeface"; + homepage = "https://monolisa.dev"; + license = lib.licenses.unfree; + platforms = lib.platforms.all; + }; +}) diff --git a/modules/fonts/tx-02.nix b/modules/fonts/tx-02.nix new file mode 100644 index 0000000..53bceb6 --- /dev/null +++ b/modules/fonts/tx-02.nix @@ -0,0 +1,35 @@ +{ + lib, + requireFile, + unzip, + stdenvNoCC, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "tx-02"; + version = "1"; + + src = ../../secrets/tx-02.zip; + + outputs = [ + "out" + ]; + + nativeBuildInputs = [ + unzip + ]; + + unpackPhase = '' + unzip $src + ''; + + installPhase = '' + install -m444 -Dt $out/share/fonts/opentype/tx-02 TX-02/*.otf + ''; + + meta = { + description = "Berkeley Mono TX-02 Typeface"; + homepage = "https://berkeleygraphics.com/typefaces/berkeley-mono"; + license = lib.licenses.unfree; + platforms = lib.platforms.all; + }; +}) diff --git a/secrets/monolisa.zip b/secrets/monolisa.zip new file mode 100644 index 0000000..4a0109c --- /dev/null +++ b/secrets/monolisa.zip Binary files differdiff --git a/secrets/tx-02.zip b/secrets/tx-02.zip new file mode 100644 index 0000000..4d64987 --- /dev/null +++ b/secrets/tx-02.zip Binary files differ |