Add Pijul and upgrade .NET

This commit is contained in:
Smaug123
2021-11-14 09:57:08 +00:00
parent 488e07af2e
commit 6ce7625c13
3 changed files with 7 additions and 4 deletions

View File

@@ -26,7 +26,7 @@ let gmp =
pkgs.rustc pkgs.rustc
pkgs.cargo pkgs.cargo
pkgs.clang pkgs.clang
gmp #gmp
#pkgs.keepassxc #pkgs.keepassxc
python python
]; ];

View File

@@ -1,11 +1,12 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let username = "Patrick"; in let username = "Patrick"; in
let dotnet = pkgs.dotnet-sdk_6; in
{ {
imports = [ ./rider ]; imports = [ ./rider ];
rider = { enable = true; username = username; }; rider = { enable = true; username = username; dotnet = dotnet; };
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;
@@ -35,7 +36,7 @@ let username = "Patrick"; in
pkgs.gdb pkgs.gdb
pkgs.hledger pkgs.hledger
pkgs.hledger-web pkgs.hledger-web
pkgs.dotnet-sdk_5 dotnet
pkgs.docker pkgs.docker
pkgs.jitsi-meet pkgs.jitsi-meet
pkgs.protonmail-bridge pkgs.protonmail-bridge
@@ -47,6 +48,7 @@ let username = "Patrick"; in
pkgs.html-tidy pkgs.html-tidy
pkgs.hugo pkgs.hugo
pkgs.agda pkgs.agda
pkgs.pijul
#pkgs.anki-bin #pkgs.anki-bin
]; ];

View File

@@ -15,7 +15,7 @@ let riderconfig =
cp ${src} "$out/GlobalSettingsStorage.DotSettings" cp ${src} "$out/GlobalSettingsStorage.DotSettings"
cp ${link} "$out/link.sh" cp ${link} "$out/link.sh"
chmod u+x "$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" sed -i "s!NIX-RIDER-CONFIG!$out!" "$out/link.sh"
''; '';
@@ -28,6 +28,7 @@ in
options = { options = {
rider.enable = lib.mkOption { default = false; }; rider.enable = lib.mkOption { default = false; };
rider.username = lib.mkOption { type = lib.types.str; example = "Patrick"; }; rider.username = lib.mkOption { type = lib.types.str; example = "Patrick"; };
rider.dotnet = lib.mkOption { default = pkgs.dotnet-sdk; };
}; };
config = lib.mkIf config.rider.enable { config = lib.mkIf config.rider.enable {