simon/nixos-config
simon/nixos-config
1
1
Fork 0
Code Issues 8 Pull requests Actions Projects Activity

Make building without unfree software/assets work

Browse source 
This either removes the packages or replaces them with free packages.
This commit is contained in:
Simon Bruder 2021-01-03 17:07:45 +01:00
parent 131d0cc1a5
commit 3d73519a76
Signed by: simon
GPG key ID: 8D3C82F9F309F8EC
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/fonts.nix
View file

@ -3,13 +3,14 @@
lib.mkIf config.sbruder.gui.enable { lib.mkIf config.sbruder.gui.enable {
fonts = { fonts = {
fonts = with pkgs; [ fonts = with pkgs; [
corefonts # good ol’ microsoft fonts
google-fonts # google font collection (free) google-fonts # google font collection (free)
lmodern # Latin Modern for non-latex applications lmodern # Latin Modern for non-latex applications
(nerdfonts.override { fonts = [ "Iosevka" ]; }) (nerdfonts.override { fonts = [ "Iosevka" ]; })
#roboto # standalone roboto has awful kerning #roboto # standalone roboto has awful kerning
source-han-sans source-han-sans
source-han-serif # CJK fonts source-han-serif # CJK fonts
] ++ lib.optionals config.sbruder.unfree.allowAssets [
corefonts # good ol’ microsoft fonts
vistafonts # newer microsoft fonts vistafonts # newer microsoft fonts
]; ];

2
users/simon/modules/programs.nix
View file

@ -62,7 +62,7 @@ in
# file format tools # file format tools
imagemagick # image conversion imagemagick # image conversion
(p7zip.override { enableUnfree = true; }) # 7z cli (with rar support) (p7zip.override { enableUnfree = config.sbruder.unfree.allowSoftware; }) # 7z cli (with optional rar support)
pdftk # pdf multitool pdftk # pdf multitool
sqlite-interactive # cli for sqlite databses sqlite-interactive # cli for sqlite databses
upx # executable packer upx # executable packer

9
users/simon/modules/sway.nix
View file

@ -3,7 +3,7 @@ let
common = import ./common.nix; common = import ./common.nix;
solarized = common.colorschemes.solarized; solarized = common.colorschemes.solarized;
wallpaper = pkgs.stdenvNoCC.mkDerivation { wallpaperUnfree = pkgs.stdenvNoCC.mkDerivation {
name = "wallpaper-unfree"; name = "wallpaper-unfree";
src = pkgs.fetchurl { src = pkgs.fetchurl {
@ -32,6 +32,13 @@ let
# Source: “境目” by 3211 on Pixiv: https://www.pixiv.net/en/artworks/39266182 # Source: “境目” by 3211 on Pixiv: https://www.pixiv.net/en/artworks/39266182
meta.license = lib.licenses.unfree; meta.license = lib.licenses.unfree;
}; };
wallpaperFree = pkgs.fetchurl {
url = "https://raw.githubusercontent.com/swaywm/sway/3b2bc894a5ebbcbbd6707d45a25d171779c2e874/assets/Sway_Wallpaper_Blue_1920x1080.png";
sha256 = "1rkqd0h7w64plibn7k3krk5vdc3pnv3fc7m2xc2mxnwrbsgngwsz";
meta.license = lib.licenses.cc0;
};
wallpaper = if config.sbruder.unfree.allowAssets then wallpaperUnfree else wallpaperFree;
cfg = config.wayland.windowManager.sway.config; cfg = config.wayland.windowManager.sway.config;
thinsp = " "; thinsp = " ";