diff --git a/custom/unlisted-fonts/flake.nix b/custom/unlisted-fonts/flake.nix index 23bc09d..d02b7fb 100644 --- a/custom/unlisted-fonts/flake.nix +++ b/custom/unlisted-fonts/flake.nix @@ -1,61 +1,66 @@ { - description = - "A flake giving access to fonts that I use, outside of nixpkgs."; + description = "A flake giving access to fonts that I use, outside of nixpkgs."; inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; inputs.flake-utils.url = "github:numtide/flake-utils"; - outputs = { self, nixpkgs, flake-utils }: - flake-utils.lib.eachDefaultSystem (system: - let pkgs = nixpkgs.legacyPackages.${system}; - in { - defaultPackage = pkgs.symlinkJoin { - name = "myfonts-0.1.4"; - paths = builtins.attrValues - self.packages.${system}; # Add font derivation names here - }; + outputs = { + self, + nixpkgs, + flake-utils, + }: + flake-utils.lib.eachDefaultSystem (system: let + pkgs = nixpkgs.legacyPackages.${system}; + in { + defaultPackage = pkgs.symlinkJoin { + name = "myfonts-0.1.4"; + paths = + builtins.attrValues + self.packages.${system}; # Add font derivation names here + }; - packages.gillsans = pkgs.stdenvNoCC.mkDerivation { - name = "gillsans-font"; - dontConfigue = true; - src = pkgs.fetchzip { - url = - "https://freefontsvault.s3.amazonaws.com/2020/02/Gill-Sans-Font-Family.zip"; - sha256 = "sha256-YcZUKzRskiqmEqVcbK/XL6ypsNMbY49qJYFG3yZVF78="; - stripRoot = false; - }; - installPhase = '' - mkdir -p $out/share/fonts - cp -R $src $out/share/fonts/opentype/ - ''; - meta = { description = "A Gill Sans Font Family derivation."; }; + packages.gillsans = pkgs.stdenvNoCC.mkDerivation { + name = "gillsans-font"; + dontConfigue = true; + src = pkgs.fetchzip { + url = "https://freefontsvault.s3.amazonaws.com/2020/02/Gill-Sans-Font-Family.zip"; + sha256 = "sha256-YcZUKzRskiqmEqVcbK/XL6ypsNMbY49qJYFG3yZVF78="; + stripRoot = false; }; + installPhase = '' + mkdir -p $out/share/fonts + cp -R $src $out/share/fonts/opentype/ + ''; + meta = {description = "A Gill Sans Font Family derivation.";}; + }; - packages.palatino = pkgs.stdenvNoCC.mkDerivation { - name = "palatino-font"; - dontConfigue = true; - src = pkgs.fetchzip { - url = - "https://www.dfonts.org/wp-content/uploads/fonts/Palatino.zip"; - sha256 = "sha256-FBA8Lj2yJzrBQnazylwUwsFGbCBp1MJ1mdgifaYches="; - stripRoot = false; - }; - installPhase = '' - mkdir -p $out/share/fonts - cp -R $src/Palatino $out/share/fonts/truetype/ - ''; - meta = { description = "The Palatino Font Family derivation."; }; + packages.palatino = pkgs.stdenvNoCC.mkDerivation { + name = "palatino-font"; + dontConfigue = true; + src = pkgs.fetchzip { + url = "https://www.dfonts.org/wp-content/uploads/fonts/Palatino.zip"; + sha256 = "sha256-FBA8Lj2yJzrBQnazylwUwsFGbCBp1MJ1mdgifaYches="; + stripRoot = false; }; - packages.monolisa = pkgs.stdenvNoCC.mkDerivation { - name = "monolisa-font"; - dontConfigue = true; - src = ./.; - - installPhase = '' - mkdir -p $out/share/fonts - cp -R $src/fonts/Monolisa $out/share/fonts/truetype - ''; - meta = { description = "The Monolisa Font Family derivation."; }; + installPhase = '' + mkdir -p $out/share/fonts + cp -R $src/Palatino $out/share/fonts/truetype/ + ''; + meta = {description = "The Palatino Font Family derivation.";}; + }; + packages.monolisa = pkgs.stdenvNoCC.mkDerivation { + name = "monolisa-font"; + dontConfigue = true; + src = ./.; + + installPhase = '' + mkdir -p $out/share/fonts + cp -R $src/fonts/Monolisa $out/share/fonts/truetype + ''; + meta = { + description = "The Monolisa Font Family derivation."; + licenses.free = false; }; - }); + }; + }); } diff --git a/info.nix b/info.nix index 1c9ef3f..b1dad22 100644 --- a/info.nix +++ b/info.nix @@ -4,5 +4,8 @@ timezone = "America/Chicago"; # VPN - vpn_enable = true; + vpnEnable = true; + + # Unfree Softwares + allowUnfree = true; } diff --git a/modules/system.nix b/modules/system.nix index 438a83f..be5fc80 100644 --- a/modules/system.nix +++ b/modules/system.nix @@ -1,5 +1,5 @@ { - vpn_enable, + vpnEnable, lib, ... }: { @@ -19,7 +19,7 @@ ../system/users.nix ../system/tools.nix ] - ++ lib.optionals (vpn_enable == true) [ + ++ lib.optionals (vpnEnable == true) [ ../system/vpn.nix ]; } diff --git a/nixos/biscuit/configuration.nix b/nixos/biscuit/configuration.nix index 63e700f..87d1c1b 100644 --- a/nixos/biscuit/configuration.nix +++ b/nixos/biscuit/configuration.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + allowUnfree, ... }: { imports = [ @@ -18,6 +19,8 @@ wl-clipboard ]; + nixpkgs.config.allowUnfree = allowUnfree; + nix.settings.experimental-features = ["nix-command" "flakes"]; system.stateVersion = "25.05"; }