Mitigate deprecations

configs/programs/neovim.nix

@@ -79,7 +79,7 @@ let
 		];
 
 	# Via https://gist.github.com/nat-418/d76586da7a5d113ab90578ed56069509
-	fromGitHub = ref: repo: pkgs.vimUtils.buildVimPluginFrom2Nix {
+	fromGitHub = ref: repo: pkgs.vimUtils.buildVimPlugin {
 		pname = "${lib.strings.sanitizeDerivationName repo}";
 		version = ref;
 		src = builtins.fetchGit {

nixos.nix

@@ -135,7 +135,7 @@ let systemInformation = import ./system/system-information.nix; in
 		totem
 	];
 	fonts = {
-		fonts = with pkgs; with import packages/all-packages.nix nixpkgs; [
+		packages = with pkgs; with import packages/all-packages.nix nixpkgs; [
 			justseeds
 			manrope
 			google-fonts
@@ -143,7 +143,7 @@ let systemInformation = import ./system/system-information.nix; in
 			atkinson-hyperlegible
 		];
 		fontDir.enable = true;
-		enableDefaultFonts = true;
+		enableDefaultPackages = true;
 		fontconfig.defaultFonts = {
 			sansSerif = ["Atkinson Hyperlegible"];
 			monospace = ["Comic Mono:style=Normal"];
@@ -164,7 +164,7 @@ let systemInformation = import ./system/system-information.nix; in
 			dataDir = "/home/ember";
 			configDir = "/home/ember/.config/syncthing";
 			user = "ember";
-			devices = {
+			settings.devices = {
 				redwood.name = "🍂 Redwood";
 				redwood.id =
 				"WY2GFMX-CQ52VBK-M3Y4JJH-4FIA6F2-NGB3S2I-SJ42D45-7FT77KH-2OGO2AZ";

packages/justseeds.nix

@@ -1,6 +1,6 @@
 {pkgs, stdenv, lib, ...}: stdenv.mkDerivation {
 	pname = "justseeds-fontpack";
-	version = "10.000";
+	version = "13.000";
 
 	# Fontpack 1
 	pack01 = pkgs.fetchzip {
@@ -18,8 +18,8 @@
 
 	# Fontpack 3
 	pack03 = pkgs.fetchzip {
-		url = "https://justseeds.org/wp-content/uploads/JSOTP-FP3.zip";
-		sha256 = "lLPsbpRuDVWgt/GX3/ZvxPjBDVNeu7OhhnBLqpmCArA=";
+		url = "https://justseeds.org/wp-content/uploads/JSOTP-FP3_2.zip";
+		sha256 = "gUbyXkR+Kr5w0//fbl72qqQRgqiyaA34pwDt1+t+Ejc=";
 		stripRoot = false;
 	};
 
@@ -79,11 +79,25 @@
 		stripRoot = false;
 	};
 
+	# Fontpack 12
+	pack12 = pkgs.fetchzip {
+		url = "https://justseeds.org/wp-content/uploads/JSOTP-12.zip";
+		sha256 = "anwRr+yaQWp/nxdXu89UMHSoexGvAuE2gApsfq3UibU=";
+		stripRoot = false;
+	};
+
+	# Fontpack 13
+	pack13 = pkgs.fetchzip {
+		url = "https://justseeds.org/wp-content/uploads/JOSTP-13.zip";
+		sha256 = "HOVl9PYZb6PUs0nIbognJQDvaasiafOWMkxiWliPQZg=";
+		stripRoot = false;
+	};
+
 	dontUnpack = true;
 	installPhase = ''
 		install -D -m 444 $pack01/JS_fontpak1/*.otf -t $out/share/fonts/otf
 		install -D -m 444 $pack02/justseeds_fontpak2/*.otf -t $out/share/fonts/otf
-		install -D -m 444 $pack03/'JSOTP FP3'/*.otf -t $out/share/fonts/otf
+		install -D -m 444 $pack03/'JSOTP FP3_2'/*.otf -t $out/share/fonts/otf
 		install -D -m 444 $pack04/fontpak4/*.otf -t $out/share/fonts/otf
 		install -D -m 444 $pack05/'JS Font Pak 5'/*.otf -t $out/share/fonts/otf
 		install -D -m 444 $pack06/'JS Font pack 6'/*.otf -t $out/share/fonts/otf
@@ -92,6 +106,8 @@
 		install -D -m 444 $pack09/'Justseeds Font Pack 9'/*.otf -t $out/share/fonts/otf
 		install -D -m 444 $pack10/'JSOTP 10'/*.otf -t $out/share/fonts/otf
 		install -D -m 444 $pack11/'JSOTP 11'/*.otf -t $out/share/fonts/otf
+		install -D -m 444 $pack12/'JSOTP 12'/*.otf -t $out/share/fonts/otf
+		install -D -m 444 $pack13/'JOSTP 13'/*.otf -t $out/share/fonts/otf
 	'';
 
 	meta = {

system/hardware-requirements.nix

@@ -1,10 +1,9 @@
-
 { config, lib, pkgs, modulesPath, ... }:
 
 {
   imports =
     [ (modulesPath + "/installer/scan/not-detected.nix")
-      <nixos-hardware/framework>
+      <nixos-hardware/framework/13-inch/11th-gen-intel>
     ];
 
   boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];