8 files changed, 42 insertions, 52 deletions

diff --git a/flake.lock b/flake.lock
index 32b6b825..48d48e92 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1633733120,
-        "narHash": "sha256-IdUgCn7eud2he4LWZpzFPf1D2u+mjZC09mvo3oSNoss=",
+        "lastModified": 1637010045,
+        "narHash": "sha256-EzA+Iu2c8N1i3K8jouZSuyMOOeR1glFZSW9ZgqmPH54=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "32285d8fe64138a41f1caed23d94f28529ea4eb4",
+        "rev": "a7c5b00d44f65efd1e8ace2c02243f179e72283a",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1633888814,
-        "narHash": "sha256-5toxku+055gGxzmvUIUOM7jtRC8N41FjWzFyBA1lG9E=",
+        "lastModified": 1637072800,
+        "narHash": "sha256-Q7MDJG+DG/gXnZ1dBPuQBNrGUy1R5GD4xnIbKOu8/Mw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f52699bc713545e32b5aaa1290e03c4ebf0d4110",
+        "rev": "57c90b8956cd00b35c56b92fcb857116631d5d5d",
         "type": "github"
       },
       "original": {
@@ -51,11 +51,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1633273832,
-        "narHash": "sha256-oOjpMVYpkIUpiML61PeqTk+sg4juRvF7P6jroI/YvTw=",
+        "lastModified": 1637050424,
+        "narHash": "sha256-8IaY0/Y5g3jJiQzPN0PflKFcFEE1C29DZZ0dF1NIJ6s=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "2e86e1698d53e5bd71d9de5f8b7e8f2f5458633c",
+        "rev": "3c53d012ac77d4bd8428f9c847709e287c897ad9",
         "type": "github"
       },
       "original": {
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 4d83ee11..bdd6653a 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -271,8 +271,8 @@
 
     nix = {
       autoOptimiseStore = true;
-      daemonNiceLevel = 10;
-      daemonIONiceLevel = 3;
+      daemonCPUSchedPolicy = "idle";
+      daemonIOSchedClass = "idle";
 
       buildServers.vidhar = {
         address = "vidhar.yggdrasil";
diff --git a/hosts/vidhar/default.nix b/hosts/vidhar/default.nix
index 1d8f4c3c..0bad0f8c 100644
--- a/hosts/vidhar/default.nix
+++ b/hosts/vidhar/default.nix
@@ -254,9 +254,14 @@
       Defaults lecture = never
     '';
 
-    nix.gc = {
-      automatic = true;
-      options = "--delete-older-than 30d";
+    nix = {
+      daemonCPUSchedPolicy = "batch";
+      daemonIOSchedClass = "idle";
+
+      gc = {
+        automatic = true;
+        options = "--delete-older-than 30d";
+      };
     };
 
     powerManagement = {
diff --git a/overlays/pidgin.nix b/overlays/pidgin.nix
index d346c7a1..3c9fb93c 100644
--- a/overlays/pidgin.nix
+++ b/overlays/pidgin.nix
@@ -4,8 +4,29 @@ let
     url = "https://developer.pidgin.im/raw-attachment/ticket/16524/0001-only-request-unseed-chat-history-from-jabber-group-c.patch";
     sha256 = "083wvmq7417xz55fxxhllqwql1hgjvin2sak08844121yw1jvc44";
   };
+
+  pidginWrapper = { symlinkJoin, pidgin, makeWrapper, plugins }:
+    let
+      extraArgs = map (x: x.wrapArgs or "") plugins;
+      majorVersion = prev.lib.versions.major pidgin.version;
+    in symlinkJoin {
+      name = "pidgin-with-plugins-${pidgin.version}";
+
+      paths = [ pidgin ] ++ plugins;
+
+      buildInputs = [ makeWrapper ];
+
+      postBuild = ''
+        wrapProgram $out/bin/pidgin \
+          --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${majorVersion} $out/lib/pidgin" \
+          ${toString extraArgs}
+        wrapProgram $out/bin/finch \
+          --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${majorVersion}" \
+          ${toString extraArgs}
+      '';
+    };
 in {
-  pidgin-with-plugins = import (/. + prev.path + "/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix") {
+  pidgin-with-plugins = pidginWrapper {
     inherit (prev) makeWrapper symlinkJoin;
     plugins = with final; [ purple-lurch pidgin-carbons pidgin-opensteamworks pidgin-xmpp-receipts ];
     pidgin = prev.pidgin.overrideAttrs (oldAttrs: {
diff --git a/overlays/udp2raw/default.nix b/overlays/udp2raw/default.nix
deleted file mode 100644
index b08bdf4b..00000000
--- a/overlays/udp2raw/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-final: prev: {
-  udp2raw = final.callPackage ./package.nix {};
-}
diff --git a/overlays/udp2raw/package.nix b/overlays/udp2raw/package.nix
deleted file mode 100644
index 6612ac3e..00000000
--- a/overlays/udp2raw/package.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgsMusl, fetchFromGitHub }:
-pkgsMusl.stdenv.mkDerivation rec {
-  pname = "udp2raw";
-  version = "20200818.0";
-
-  src = fetchFromGitHub {
-    repo = "udp2raw-tunnel";
-    owner = "wangyu-";
-    rev = version;
-    hash = "sha256-TkTOfF1RfHJzt80q0mN4Fek3XSFY/8jdeAVtyluZBt8=";
-  };
-  patches = [ ./udp2raw-makefile.patch ];
-  configurePhase = "";
-  buildPhase = ''
-    make cc_amd64=''${CXX} amd64_hw_aes
-  '';
-  installPhase = ''
-    install -Dm755 udp2raw_amd64_hw_aes $out/bin/udp2raw
-  '';
-}
diff --git a/overlays/udp2raw/udp2raw-makefile.patch b/overlays/udp2raw/udp2raw-makefile.patch
deleted file mode 100644
index 264f5cf4..00000000
--- a/overlays/udp2raw/udp2raw-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff --git a/makefile b/makefile
-index 22c07ae..ddcfbc4 100755
---- a/makefile
-+++ b/makefile
-@@ -131,4 +131,4 @@ clean:
-        rm -f git_version.h
- 
- git_version:
--           echo "const char *gitversion = \"$(shell git rev-parse HEAD)\";" > git_version.h
-+           echo "const char *gitversion = \"cc6ea766c495cf4c69d1c7485728ba022b0f19de\";" > git_version.h
diff --git a/user-profiles/direnv.nix b/user-profiles/direnv.nix
index 53706b6a..7887d765 100644
--- a/user-profiles/direnv.nix
+++ b/user-profiles/direnv.nix
@@ -3,10 +3,7 @@
   home-manager.users.${userName} = {
     programs.direnv = {
       enable = true;
-      nix-direnv = {
-        enable = true;
-        enableFlakes = true;
-      };
+      nix-direnv.enable = true;
     };
   };
 }