diff --git a/nixos/common.nix b/nixos/common.nix index 6bd0994e..dfb2319e 100644 --- a/nixos/common.nix +++ b/nixos/common.nix @@ -1,12 +1,10 @@ -{ config, pkgs, lib, inputs, nixpkgs-nixos-unstable-and-unfree, ... }: -{ - imports = - [ - ./common-hardware.nix - ./common-services.nix - ./security.nix - ./syncthing.nix - ]; +{ config, pkgs, lib, inputs, nixpkgs-nixos-unstable-and-unfree, ... }: { + imports = [ + ./common-hardware.nix + ./common-services.nix + ./security.nix + ./syncthing.nix + ]; security.allowUserNamespaces = true; @@ -33,15 +31,26 @@ users.users.cyryl = { isNormalUser = true; - extraGroups = [ "wheel" "networkmanager" "video" "scanner" "lp" "docker" "vboxusers" "adbusers" "libvirtd" "dialout" "wireshark" ]; + extraGroups = [ + "wheel" + "networkmanager" + "video" + "scanner" + "lp" + "docker" + "vboxusers" + "adbusers" + "libvirtd" + "dialout" + "wireshark" + ]; shell = pkgs.zsh; }; - networking.nameservers = [ "91.239.100.100" "89.233.43.71" "1.1.1.1" "8.8.8.8" ]; + networking.nameservers = + [ "91.239.100.100" "89.233.43.71" "1.1.1.1" "8.8.8.8" ]; - networking.hosts = { - "10.11.99.1" = [ "remarkable" ]; - }; + networking.hosts = { "10.11.99.1" = [ "remarkable" ]; }; programs.light.enable = true; programs.adb.enable = true; @@ -53,7 +62,29 @@ }; fonts.fontconfig.enable = true; - fonts.fonts = with pkgs; [ powerline-fonts weather-icons material-icons source-code-pro fira-code noto-fonts-emoji emojione iosevka font-awesome nerdfonts ]; + fonts.fonts = with pkgs; [ + (fetchzip { + name = "berkeley-mono-fonts"; + url = "file:///" + ./fonts.zip; + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; + sha256 = "sha256-K6G82xaDnyzo6eAuW8hnbVZCoEyNYI4l0d5RPHkqNFM="; + }) + + emojione + fira-code + font-awesome + iosevka + material-icons + nerdfonts + noto-fonts-emoji + powerline-fonts + source-code-pro + weather-icons + ]; nix = { autoOptimiseStore = true; @@ -65,7 +96,5 @@ ''; }; - system = { - stateVersion = "20.03"; - }; + system = { stateVersion = "20.03"; }; } diff --git a/nixos/fonts.zip b/nixos/fonts.zip new file mode 100644 index 00000000..5dc4ab2d --- /dev/null +++ b/nixos/fonts.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8d70eaef9239f27ed9c3b018bcdff67919434c8583670eea67eff28ce253672 +size 623547