2022-08-17

1 files changed, 14 insertions, 10 deletions

diff --git a/modules/nixfiles/common/nix.nix b/modules/nixfiles/common/nix.nix
index 586f354..5cb77e9 100644
--- a/modules/nixfiles/common/nix.nix
+++ b/modules/nixfiles/common/nix.nix
@@ -3,7 +3,7 @@
   inputs,
   lib,
   pkgs,
-  pkgsRev,
+  pkgsPR,
   this,
   ...
 }:
@@ -78,6 +78,13 @@ in {
       self.overlays.default
       (_: super:
         {
+          # Splitting this into a separate package could be a good PR.
+          logcli = super.grafana-loki.overrideAttrs (_: _: {
+            subPackages = ["cmd/logcli"];
+            preFixup = "";
+            doCheck = false;
+          });
+
           nix-bash-completions =
             super.nix-bash-completions.overrideAttrs
             (_: _: {
@@ -85,20 +92,16 @@ in {
                 substituteInPlace _nix --replace 'nix nixos-option' 'nixos-option'
               '';
             });
-          nix-index = super.nix-index.override {nix = config.nix.package;};
-          logcli = super.grafana-loki.overrideAttrs (_: _: {
-            subPackages = ["cmd/logcli"];
-            preFixup = "";
-            doCheck = false;
-          });
+
           helm = super.kubernetes-helm-wrapped.override {
             plugins = with super.kubernetes-helmPlugins; [
               helm-diff
               helm-secrets
             ];
           };
-          # https://github.com/NixOS/nixpkgs/pull/185824
-          inherit (pkgsRev "c9c10940da779db387b8d6326c8c0bee598a0a87" "sha256-r08/Z8EYTNyyZW6lYQyq521OpgUH6ewZPpvDAiCkQaA=") iosevka;
+
+          # https://github.com/NixOS/nixpkgs/pull/187039
+          inherit (pkgsPR "187039" "sha256-xyYK1M1FF8e9UDziyqTiWe3XRkRVNdWUyzqG1/Rjry8=") biber;
         }
         // (with super; let
           np = nodePackages;
@@ -112,13 +115,14 @@ in {
           k3d = kube3d;
           lua-language-server = sumneko-lua-language-server;
           nix-language-server = rnix-lsp;
+          omnisharp = omnisharp-roslyn;
           telepresence = telepresence2;
           tor-browser = tor-browser-bundle-bin;
         }))
       agenix.overlay
       emacs-overlay.overlay
       nur.overlay
-      xmonad-ng.overlay
+      xmonad-ng.overlays.default
     ];
 
     config.allowUnfree = true;