From 6ce7625c13349b1e4ee24c2cddb88f13a068cfa3 Mon Sep 17 00:00:00 2001
From: Smaug123 <patrick+github@patrickstevens.co.uk>
Date: Sun, 14 Nov 2021 09:57:08 +0000
Subject: [PATCH] Add Pijul and upgrade .NET

---
 darwin-configuration.nix | 2 +-
 home.nix                 | 6 ++++--
 rider/default.nix        | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/darwin-configuration.nix b/darwin-configuration.nix
index f56c1d6..3b748be 100644
--- a/darwin-configuration.nix
+++ b/darwin-configuration.nix
@@ -26,7 +26,7 @@ let gmp =
       pkgs.rustc
       pkgs.cargo
       pkgs.clang
-      gmp
+      #gmp
       #pkgs.keepassxc
       python
     ];
diff --git a/home.nix b/home.nix
index 362bcfb..887d00e 100644
--- a/home.nix
+++ b/home.nix
@@ -1,11 +1,12 @@
 { config, pkgs, ... }:
 
 let username = "Patrick"; in
+let dotnet = pkgs.dotnet-sdk_6; in
 
 {
   imports = [ ./rider ];
 
-  rider = { enable = true; username = username; };
+  rider = { enable = true; username = username; dotnet = dotnet; };
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
@@ -35,7 +36,7 @@ let username = "Patrick"; in
       pkgs.gdb
       pkgs.hledger
       pkgs.hledger-web
-      pkgs.dotnet-sdk_5
+      dotnet
       pkgs.docker
       pkgs.jitsi-meet
       pkgs.protonmail-bridge
@@ -47,6 +48,7 @@ let username = "Patrick"; in
       pkgs.html-tidy
       pkgs.hugo
       pkgs.agda
+      pkgs.pijul
       #pkgs.anki-bin
     ];
 
diff --git a/rider/default.nix b/rider/default.nix
index c25f6ab..b67915d 100644
--- a/rider/default.nix
+++ b/rider/default.nix
@@ -15,7 +15,7 @@ let riderconfig =
         cp ${src} "$out/GlobalSettingsStorage.DotSettings"
         cp ${link} "$out/link.sh"
         chmod u+x "$out/link.sh"
-        sed -i 's_NIX-DOTNET-SDK_${pkgs.dotnet-sdk}_' "$out/GlobalSettingsStorage.DotSettings"
+        sed -i 's_NIX-DOTNET-SDK_${config.rider.dotnet}_' "$out/GlobalSettingsStorage.DotSettings"
         sed -i "s!NIX-RIDER-CONFIG!$out!" "$out/link.sh"
         '';
 
@@ -28,6 +28,7 @@ in
   options = {
     rider.enable = lib.mkOption { default = false; };
     rider.username = lib.mkOption { type = lib.types.str; example = "Patrick"; };
+    rider.dotnet = lib.mkOption { default = pkgs.dotnet-sdk; };
   };
 
   config = lib.mkIf config.rider.enable {