From 245ec7a31076896795e5313d76c4a23a0cb2377e Mon Sep 17 00:00:00 2001 From: Daniel Olsen Date: Sat, 12 Dec 2020 15:26:49 +0100 Subject: [PATCH] ree --- overlays/av1client.nix | 24 ------------------------ profiles/base/default.nix | 8 +++++--- 2 files changed, 5 insertions(+), 27 deletions(-) delete mode 100644 overlays/av1client.nix diff --git a/overlays/av1client.nix b/overlays/av1client.nix deleted file mode 100644 index 423b043..0000000 --- a/overlays/av1client.nix +++ /dev/null @@ -1,24 +0,0 @@ -self: super: -{ - av1client = super.stdenv.mkDerivation rec { - name = "av1client-${version}"; - version = "0.5.0"; - - src = ~/Documents/av1master/src/static; - - installPhase = '' - mkdir -p $out/bin - cp client.sh $out/bin/av1client - - sed -i 's,sleep,${super.coreutils}/bin/sleep,' $out/bin/av1client - sed -i 's,rm,${super.coreutils}/bin/rm,' $out/bin/av1client - sed -i 's,curl,${super.curl}/bin/curl --cacert ${super.cacert}/etc/ssl/certs/ca-bundle.crt,' $out/bin/av1client - sed -i 's,jq,${super.jq}/bin/jq,' $out/bin/av1client - sed -i 's,ffmpeg ,${self.myffmpeg}/bin/ffmpeg ,' $out/bin/av1client - sed -i 's,aomenc ,${self.mylibaom}/bin/aomenc ,' $out/bin/av1client - - chmod +x $out/bin/av1client - ''; - - }; -} diff --git a/profiles/base/default.nix b/profiles/base/default.nix index 662f6e8..1190ee1 100644 --- a/profiles/base/default.nix +++ b/profiles/base/default.nix @@ -65,7 +65,7 @@ in { kdeFrameworks.kio kdeApplications.kio-extras - dan.rank_photos + #dan.rank_photos # ***REMOVED*** @@ -87,7 +87,7 @@ in { kdenlive frei0r - geogebra + #geogebra ]; programs.firefox = { @@ -105,7 +105,9 @@ in { enable = true; userEmail = "daniel.olsen99@gmail.com"; userName = "Daniel Olsen"; - + extraConfig = { + pull.rebase = true; + }; # delta.enable = true; };