2023-12-10

6 files changed, 80 insertions, 73 deletions

diff --git a/flake.lock b/flake.lock
index 60fd9cb..b1ad15d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -224,11 +224,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1694529238,
-        "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
         "type": "github"
       },
       "original": {
@@ -266,11 +266,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701071203,
-        "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=",
+        "lastModified": 1701728041,
+        "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86",
+        "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf",
         "type": "github"
       },
       "original": {
@@ -309,11 +309,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701220839,
-        "narHash": "sha256-mD8SYyQ47zvHcHWe2TfPgSDZhrh+rd7o1Qxc012ikaQ=",
+        "lastModified": 1701739256,
+        "narHash": "sha256-18huXq/fGUwrP22Qrits4+hBYNnfFmoULyDR3E59Z0A=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "0fa82d954e4f9a2f14b43f9301232447b90184e9",
+        "rev": "16eafd7c8003ba32f4be5f5b0d0f69edbcc5771e",
         "type": "github"
       },
       "original": {
@@ -336,11 +336,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701220899,
-        "narHash": "sha256-esWkfkEM5P78BKtVIf5qbgcD3L4CdXpkkWv+LhPr6PE=",
+        "lastModified": 1701739320,
+        "narHash": "sha256-OsL6DBP/Hdy7HGcIrNB6JDsprgQuJXaFmGPGkZE4ebU=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "f9d2a701aabc5ce2f109f9154fa26eb8d3d785b3",
+        "rev": "f0be3d039fd7500d927b7584ddd632e5e5dce45f",
         "type": "github"
       },
       "original": {
@@ -352,11 +352,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1701250978,
-        "narHash": "sha256-ohu3cz4edjpGxs2qUTgbs0WrnewOX4crnUJNEB6Jox4=",
+        "lastModified": 1701656485,
+        "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "8772491ed75f150f02552c60694e1beff9f46013",
+        "rev": "fa194fc484fd7270ab324bb985593f71102e84d1",
         "type": "github"
       },
       "original": {
@@ -368,11 +368,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701174899,
-        "narHash": "sha256-1W+FMe8mWsJKXoBc+QgKmEeRj33kTFnPq7XCjU+bfnA=",
+        "lastModified": 1701626906,
+        "narHash": "sha256-ugr1QyzzwNk505ICE4VMQzonHQ9QS5W33xF2FXzFQ00=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "010c7296f3b19a58b206fdf7d68d75a5b0a09e9e",
+        "rev": "0c6d8c783336a59f4c59d4a6daed6ab269c4b361",
         "type": "github"
       },
       "original": {
@@ -384,11 +384,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1701282011,
-        "narHash": "sha256-8VA8Dgir7gxye7SGJtnkA0s3CokCDDNsKu8miAbRqT8=",
+        "lastModified": 1701806076,
+        "narHash": "sha256-gT8QjpAccrRortO21EOnPBzou4vADkeobnkGl0heRkM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f6a06211e6018028ddaf11fac093ca9b9a13cd7f",
+        "rev": "fa2ab930dd7c82bb91edd051db7a7222ae2bc3c8",
         "type": "github"
       },
       "original": {
@@ -400,11 +400,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1701282134,
-        "narHash": "sha256-5Tm7yLcFcBqjjKAm3Asy8TK7jghjZ/eH5++kDEnlCuw=",
+        "lastModified": 1701805708,
+        "narHash": "sha256-hh0S14E816Img0tPaNQSEKFvSscSIrvu1ypubtfh6M4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2bc6ba12ff5e3806c41e29aaafd28c6e4fee8a70",
+        "rev": "0561103cedb11e7554cf34cea81e5f5d578a4753",
         "type": "github"
       },
       "original": {
@@ -428,11 +428,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701250280,
-        "narHash": "sha256-Nx2nqkUfOAvW+GlVIs5HK8WfuZsbN8FqW2bXNx0fMJc=",
+        "lastModified": 1701772025,
+        "narHash": "sha256-Q8U9c39+aX9dsyMWFjRLLCav5m+M6IrE1V7X9AWfreM=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "f56d412f84e2cee53365ade1093f9cc449d58fa3",
+        "rev": "903e2a1ccb92f17ac5810bc1229f5dd0addd7ba6",
         "type": "github"
       },
       "original": {
diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix
index 5402b34..6d1b549 100644
--- a/modules/common/emacs/default.nix
+++ b/modules/common/emacs/default.nix
@@ -61,8 +61,6 @@ in {
           text = concatLines [
             (
               let
-                # NOTE Packages required for vterm here are mostly only used for
-                # initially compiling the libvterm library.
                 extraBins = with pkgs;
                   [
                     (aspellWithDicts (p: with p; [en ru])) # :checkers (spell +aspell)
@@ -70,7 +68,6 @@ in {
                     asmfmt # :editor format
                     cargo # :lang rust
                     clang-tools # :lang (cc +lsp) :editor format
-                    cmake # :lang cc :term vterm
                     cmake-format # :lang cc :editor format
                     cmigemo # :lang japanese
                     config.hm.programs.emacs.package # !doom
@@ -79,9 +76,8 @@ in {
                     dockfmt # :tools docker :editor format
                     editorconfig-core-c # :tools editorconfig
                     fd # doom!
-                    gcc # :lang cc :term vterm
+                    gcc # :lang cc
                     ghc # :lang haskell
-                    gnumake # :term vterm
                     gnuplot # :lang (org +gnuplot)
                     gnutar # :tools tree-sitter
                     gnutls # doom! :app irc
@@ -103,7 +99,6 @@ in {
                     html-tidy # :lang web :editor format
                     jdk # :lang java :lang plantuml :checkers grammar
                     languagetool # :checkers grammar
-                    libtool # :term vterm
                     libxml2 # :lang data :editor format
                     markdownlint-cli # :lang markdown
                     nil # :lang (nix +lsp)
@@ -117,7 +112,6 @@ in {
                     nodePackages.vscode-json-languageserver-bin # lang (json +lsp)
                     nodejs # :tools debugger
                     pandoc # :lang org markdown latex
-                    perl # :term vterm
                     pinentry-emacs # doom!
                     pipenv # :lang python
                     pre-commit # :tools magit
diff --git a/modules/nixos/common/nix.nix b/modules/nixos/common/nix.nix
index e21cc5c..2976cfc 100644
--- a/modules/nixos/common/nix.nix
+++ b/modules/nixos/common/nix.nix
@@ -2,7 +2,6 @@
   config,
   inputs,
   lib,
-  this,
   ...
 }:
 with lib; let
@@ -15,9 +14,10 @@ in {
   };
 
   config = {
-    nix = mkIf this.isHeadless {
+    nix = {
       daemonCPUSchedPolicy = "idle";
       daemonIOSchedClass = "idle";
+      daemonIOSchedPriority = 7;
     };
 
     nixpkgs.config.allowUnfreePredicate = p: elem (getName p) cfg.allowedUnfreePackages;
diff --git a/modules/nixos/unbound.nix b/modules/nixos/unbound.nix
index c7338e5..18e6867 100644
--- a/modules/nixos/unbound.nix
+++ b/modules/nixos/unbound.nix
@@ -133,9 +133,9 @@ in {
 
               extended-statistics = true;
 
-              log-replies = true;
-              log-tag-queryreply = true;
-              log-local-actions = true;
+              log-replies = false;
+              log-tag-queryreply = false;
+              log-local-actions = false;
 
               verbosity = 0;
 
diff --git a/overlay.nix b/overlay.nix
index 1cc33a1..c8fed1f 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -1,28 +1,23 @@
 final: prev: {
+  alejandra = prev.alejandra.overrideAttrs (_: super: {
+    patches =
+      (super.patches or [])
+      ++ [
+        ./patches/alejandra-no-noise.patch
+      ];
+  });
+
   bruh = prev.callPackage ./packages/bruh.nix {};
 
   emacsql-sqlite = prev.callPackage ./packages/emacsql-sqlite.nix {};
 
-  hiccup = prev.callPackage ./packages/hiccup.nix {};
-
-  myip = prev.callPackage ./packages/myip.nix {};
-
-  nixfiles = prev.callPackage ./packages/nixfiles.nix {};
-
-  openssl_1_0_0 = prev.callPackage ./packages/openssl_1_0_0.nix {};
-
-  parinfer-rust = prev.callPackage ./packages/parinfer-rust.nix {};
-
-  logcli = prev.grafana-loki.overrideAttrs (_: super: {
-    pname = "logcli";
-    subPackages = ["cmd/logcli"];
-    nativeBuildInputs = super.nativeBuildInputs ++ [final.installShellFiles];
-    postInstall = ''
-      installShellCompletion --cmd logcli \
-        --bash <($out/bin/logcli --completion--script-bash) \
-        --zsh <($out/bin/logcli --completion-script-zsh)
-    '';
-    preFixup = null;
+  git-extras = prev.git-extras.overrideAttrs (_: super: {
+    postPatch =
+      (super.postPatch or "")
+      + ''
+        substituteInPlace bin/git-setup \
+          --replace 'Initial commit' 'chore: init'
+      '';
   });
 
   grc = prev.grc.overrideAttrs (_: super: {
@@ -43,14 +38,30 @@ final: prev: {
       ];
   });
 
-  alejandra = prev.alejandra.overrideAttrs (_: super: {
-    patches =
-      (super.patches or [])
-      ++ [
-        ./patches/alejandra-no-noise.patch
-      ];
+  hiccup = prev.callPackage ./packages/hiccup.nix {};
+
+  logcli = prev.grafana-loki.overrideAttrs (_: super: {
+    pname = "logcli";
+    subPackages = ["cmd/logcli"];
+    nativeBuildInputs = super.nativeBuildInputs ++ [final.installShellFiles];
+    postInstall =
+      (super.postInstall or "")
+      + ''
+        installShellCompletion --cmd logcli \
+          --bash <($out/bin/logcli --completion--script-bash) \
+          --zsh <($out/bin/logcli --completion-script-zsh)
+      '';
+    preFixup = null;
   });
 
+  myip = prev.callPackage ./packages/myip.nix {};
+
+  nixfiles = prev.callPackage ./packages/nixfiles.nix {};
+
+  openssl_1_0_0 = prev.callPackage ./packages/openssl_1_0_0.nix {};
+
+  parinfer-rust = prev.callPackage ./packages/parinfer-rust.nix {};
+
   prismlauncher-unwrapped =
     (prev.prismlauncher-unwrapped.override (finalAttrs: {
       stdenv = final.useMoldLinker finalAttrs.stdenv;
@@ -78,12 +89,14 @@ final: prev: {
   vesktop = prev.vesktop.overrideAttrs (_: super: {
     nativeBuildInputs = super.nativeBuildInputs ++ [final.imagemagick];
     patches = (super.patches or []) ++ [./patches/vesktop-no-anime.patch];
-    postInstall = ''
-      rm -rf $out/share/icons/hicolor/*
-      for size in 16 24 32 48 64 96; do
-        convert -scale $size icon.png $size.png
-        install -Dm644 $size.png $out/share/icons/hicolor/''${size}x''${size}/apps/vencorddesktop.png
-      done
-    '';
+    postInstall =
+      (super.postInstall or "")
+      + ''
+        rm -rf $out/share/icons/hicolor/*
+        for size in 16 24 32 48 64 96; do
+          convert -scale $size icon.png $size.png
+          install -Dm644 $size.png $out/share/icons/hicolor/''${size}x''${size}/apps/vencorddesktop.png
+        done
+      '';
   });
 }
diff --git a/packages/parinfer-rust.nix b/packages/parinfer-rust.nix
index 6bf07dd..e04f890 100644
--- a/packages/parinfer-rust.nix
+++ b/packages/parinfer-rust.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "A Rust port of parinfer";
-    inherit (finalAttrs.src.meta) homepage;
+    inherit (src.meta) homepage;
     license = licenses.isc;
     maintainers = with maintainers; [azahi];
   };