+1

.gitignore

Reviewed

··· 1 1 result 2 2 secrets/pi_host_key 3 3 *.conf 4 4 + berkely-mono/

+4

flake.nix

Reviewed

··· 39 39 url = "github:seanaye/trmnl-rs"; 40 40 inputs.nixpkgs.follows = "nixpkgs"; 41 41 }; 42 42 + berkeley-mono = { 43 43 + url = "github:seanaye/berkeley-mono"; 44 44 + inputs.nixpkgs.follows = "nixpkgs"; 45 45 + }; 42 46 nixos-raspberrypi.url = "github:nvmd/nixos-raspberrypi/main"; 43 47 }; 44 48

+11 -9

hosts/common/common.nix

Reviewed

··· 1 1 - { pkgs, lib, ... }: 1 1 + { pkgs, lib, inputs, ... }: 2 2 3 3 let 4 4 - berkeley-mono-typeface = pkgs.callPackage ../../berkely-mono/berkeley.nix { }; 4 4 + hasBerkeleyMono = inputs ? berkeley-mono; 5 5 + berkeley-mono-typeface = 6 6 + if hasBerkeleyMono then inputs.berkeley-mono.packages.${pkgs.system}.default else null; 5 7 6 8 # Steam/gamescope calls steamos-session-select when the user presses 7 9 # "Switch to Desktop". Without this script, the button does nothing. ··· 66 68 fontconfig = { 67 69 enable = true; 68 70 defaultFonts = { 69 69 - monospace = [ 70 70 - "BerkeleyMono Nerd Font" 71 71 - "BerkeleyMono" 72 72 - ]; 71 71 + monospace = 72 72 + lib.optionals hasBerkeleyMono [ 73 73 + "BerkeleyMono Nerd Font" 74 74 + "BerkeleyMono" 75 75 + ] 76 76 + ++ [ "JetBrainsMono Nerd Font" ]; 73 77 }; 74 78 }; 75 75 - packages = with pkgs; [ 76 76 - berkeley-mono-typeface 77 77 - ]; 79 79 + packages = lib.optionals hasBerkeleyMono [ berkeley-mono-typeface ]; 78 80 }; 79 81 80 82 programs.niri = {