From 3d73519a76b18091085bc50ac344b771b3667fb2 Mon Sep 17 00:00:00 2001
From: Simon Bruder <simon@sbruder.de>
Date: Sun, 3 Jan 2021 17:07:45 +0100
Subject: [PATCH] Make building without unfree software/assets work

This either removes the packages or replaces them with free packages.
---
 modules/fonts.nix                | 3 ++-
 users/simon/modules/programs.nix | 2 +-
 users/simon/modules/sway.nix     | 9 ++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/fonts.nix b/modules/fonts.nix
index 00b2004..186b247 100644
--- a/modules/fonts.nix
+++ b/modules/fonts.nix
@@ -3,13 +3,14 @@
 lib.mkIf config.sbruder.gui.enable {
   fonts = {
     fonts = with pkgs; [
-      corefonts # good ol’ microsoft fonts
       google-fonts # google font collection (free)
       lmodern # Latin Modern for non-latex applications
       (nerdfonts.override { fonts = [ "Iosevka" ]; })
       #roboto # standalone roboto has awful kerning
       source-han-sans
       source-han-serif # CJK fonts
+    ] ++ lib.optionals config.sbruder.unfree.allowAssets [
+      corefonts # good ol’ microsoft fonts
       vistafonts # newer microsoft fonts
     ];
 
diff --git a/users/simon/modules/programs.nix b/users/simon/modules/programs.nix
index 4bbec41..35aa9be 100644
--- a/users/simon/modules/programs.nix
+++ b/users/simon/modules/programs.nix
@@ -62,7 +62,7 @@ in
 
     # file format tools
     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
     sqlite-interactive # cli for sqlite databses
     upx # executable packer
diff --git a/users/simon/modules/sway.nix b/users/simon/modules/sway.nix
index 7d77be0..8c87752 100644
--- a/users/simon/modules/sway.nix
+++ b/users/simon/modules/sway.nix
@@ -3,7 +3,7 @@ let
   common = import ./common.nix;
   solarized = common.colorschemes.solarized;
 
-  wallpaper = pkgs.stdenvNoCC.mkDerivation {
+  wallpaperUnfree = pkgs.stdenvNoCC.mkDerivation {
     name = "wallpaper-unfree";
 
     src = pkgs.fetchurl {
@@ -32,6 +32,13 @@ let
     # Source: “境目” by 3211 on Pixiv: https://www.pixiv.net/en/artworks/39266182
     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;
   thinsp = " ";