sets/packages.nix: Switch from p7zip to 7zz

flake.lock

@@ -10,11 +10,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701492342,
-        "narHash": "sha256-aOXtDIMYbEeQgS+gKNnzpx7rc6a+GOJOYeKBkz4AeFg=",
+        "lastModified": 1702966889,
+        "narHash": "sha256-+vRUp3CoGyEya2JhhjxxM7JuVynsET7cbloYOlpZDOo=",
         "ref": "refs/heads/canon",
-        "rev": "a2b561a59ab067d695bf8a3bbbc678cb4482231e",
-        "revCount": 17,
+        "rev": "195c2e4d1c70f6e9b36f134097beddeedd2dd8d0",
+        "revCount": 18,
         "type": "git",
         "url": "https://git.mildlyfunctional.gay/artemist/packages.git"
       },
@@ -137,11 +137,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1694323018,
-        "narHash": "sha256-qjqjd4X79FJyv+JcULm5AQeXdtrg/+zGKvjXBcHkqT8=",
+        "lastModified": 1703056424,
+        "narHash": "sha256-D0vX6SlfDERFEza2xUEdgS6B5x85hkHBOxdvRFicMTY=",
         "ref": "refs/heads/canon",
-        "rev": "a5002a6881b40efbc91829a990a8e11983105db9",
-        "revCount": 3,
+        "rev": "0fa9c60778602279f7c81095db2eebab012e2e99",
+        "revCount": 16,
         "type": "git",
         "url": "https://git.mildlyfunctional.gay/artemist/fonts.git"
       },
@@ -201,11 +201,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702735279,
-        "narHash": "sha256-SztEzDOE/6bDNnWWvnRbSHPVrgewLwdSei1sxoZFejM=",
+        "lastModified": 1703072477,
+        "narHash": "sha256-I2g7o+J26iK3sGk53iuaYiMWryzAYx0zhNQUFzTID/A=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e9b9ecef4295a835ab073814f100498716b05a96",
+        "rev": "433120e47d016c9960dd9c2b1821e97d223a6a39",
         "type": "github"
       },
       "original": {
@@ -222,11 +222,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702725654,
-        "narHash": "sha256-jcYYMEkHArk1K8IpL8X1+AzipmGlkRimKBpQ9kmDD4w=",
+        "lastModified": 1703015323,
+        "narHash": "sha256-XTHHu0VoPC1wZwpsiLc7MMqQqirYNcvCnjtznqBVfXw=",
         "owner": "jovian-experiments",
         "repo": "jovian-nixos",
-        "rev": "e7ffb0cd75f38ac65d99614acfea576e1b23c100",
+        "rev": "5814cd0fb21308ad928e0fe6f61efc165a4a136c",
         "type": "github"
       },
       "original": {
@@ -293,11 +293,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702291765,
-        "narHash": "sha256-kfxavgLKPIZdYVPUPcoDZyr5lleymrqbr5G9PVfQ2NY=",
+        "lastModified": 1702864432,
+        "narHash": "sha256-xR5Igg2hnm979W3YgMDrSjErHFhHo4rbMboF6DC0mbc=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "45d82e0a8b9dd6c5dd9da835ac0c072239af7785",
+        "rev": "4605ccd764fac78b9e4b5b058698cb9f04430b91",
         "type": "github"
       },
       "original": {
@@ -323,11 +323,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1702151865,
-        "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
+        "lastModified": 1703013332,
+        "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
+        "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
         "type": "github"
       },
       "original": {
@@ -380,11 +380,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1702653568,
-        "narHash": "sha256-SwrNBw/1/oMURAa9/8MdvC4b3UYohoMAvSazeIt3hkg=",
+        "lastModified": 1703094677,
+        "narHash": "sha256-SaYCJr6zpWEY8IPE2eoMbMoFk6GeLdQpqDoPvvJ3oGM=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "b3fb1c4c8189bc873911da3f31d18082a0721fa9",
+        "rev": "81d103b69b012fad26e2ac1a306725db9f9aaf71",
         "type": "github"
       },
       "original": {
@@ -516,11 +516,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702758059,
-        "narHash": "sha256-YiSDCJOdkLnCI3pQNLIZ+JdD/qSmuhNocoL86CPs0Qc=",
+        "lastModified": 1702772384,
+        "narHash": "sha256-+J3Y74cE8IoLn2oMeVVB2KtWcRq0mw5pzgQzsWIPVqY=",
         "ref": "refs/heads/canon",
-        "rev": "ad1d0bde3530dddf28f380564afcf2d6b20d0c52",
-        "revCount": 56,
+        "rev": "e4da84bbd4e6ca25991f69e16185f878a7eccd18",
+        "revCount": 62,
         "type": "git",
         "url": "https://git.mildlyfunctional.gay/mildlyfunctionalgays/rustybar.git"
       },

sets/base.nix

@@ -22,9 +22,11 @@
   };
 
   nixpkgs = {
-    overlays = [ inputs.artemist.overlays.default ];
+    overlays =
+      [ inputs.artemist.overlays.default inputs.fonts.overlays.default ];
     config.allowUnfreePredicate = pkg:
-      builtins.elem (lib.getName pkg) [
+      (pkg ? passthru && pkg.passthru ? font && pkg.passthru.font)
+      || (builtins.elem (lib.getName pkg) [
         "1password"
         "brscan5"
         "brscan5-etc-files"
@@ -38,7 +40,7 @@
         "steam-original"
         "steam-run"
         "unrar"
-      ];
+      ]);
   };
 
   console = {

sets/fonts.nix

@@ -58,6 +58,6 @@
 
         # Weird symbols
         (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
-      ] ++ (builtins.attrValues inputs.fonts.packages.${pkgs.system});
+      ] ++ (builtins.attrValues pkgs.extraFonts);
   };
 }

sets/packages.nix

@@ -40,6 +40,7 @@
     udftools
 
     # Useful CLI tools
+    _7zz
     appimage-run
     bind
     borgbackup
@@ -55,7 +56,6 @@
     lsof
     nix-index
     openssl
-    p7zip
     parallel
     pciutils
     pdftk

sets/workstation.nix

@@ -26,7 +26,7 @@
   services = {
     avahi = {
       enable = true;
-      nssmdns = true;
+      nssmdns4 = true;
       publish = {
         enable = lib.mkDefault true;
         addresses = true;