update

Signed-off-by: Maximilian Huber <[email protected]>
maxhbr · Oct 23, 2024 · 4e188d7 · 4e188d7
1 parent b5973aa
commit 4e188d7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 48 deletions.
diff --git a/flake.nix b/flake.nix
@@ -213,6 +213,7 @@
             ({ pkgs, myconfig, ... }: {
               imports = [
                 (myconfig.metadatalib.announceHost "x1extremeG2")
+                (myconfig.metadatalib.announceHost "spare")
                 (myconfig.metadatalib.announceHost "workstation")
                 (myconfig.metadatalib.announceHost "nas")
                 (myconfig.metadatalib.announceHost "vserver")
@@ -234,6 +235,10 @@
               };
             })
           ] ++ moreModules) metadataOverride);
+        host-spare = moreModules: metadataOverride:
+          (self.lib.evalConfiguration "x86_64-linux" "spare" ([
+            self.nixosModules.core
+          ] ++ moreModules) metadataOverride);
         host-x1extremeG2 = moreModules: metadataOverride:
           (self.lib.evalConfiguration "x86_64-linux" "x1extremeG2" ([
             { config = { hardware.enableRedistributableFirmware = true; }; }
@@ -268,6 +273,7 @@
 
       nixosConfigurations = {
         p14 = self.nixosConfigurationsGen.host-p14 [ ] { };
+        spare = self.nixosConfigurationsGen.host-spare [ ] { };
         # x1extremeG2 = self.nixosConfigurationsGen.host-x1extremeG2 [ ] { };
         workstation = self.nixosConfigurationsGen.host-workstation [ ] { };
         vserver = self.nixosConfigurationsGen.host-vserver [ ] { };

diff --git a/hosts/host.spare/streamcam.nix b/hosts/host.spare/streamcam.nix
diff --git a/modules/myconfig.desktop.fonts.nix b/modules/myconfig.desktop.fonts.nix
@@ -27,7 +27,7 @@
         # liberation_ttf
         mplus-outline-fonts.githubRelease
         noto-fonts
-        noto-fonts-cjk
+        noto-fonts-cjk-sans
         noto-fonts-emoji
         proggyfonts
         roboto

diff --git a/scripts/bootstrap.nixos-install.sh b/scripts/bootstrap.nixos-install.sh
@@ -10,15 +10,15 @@ fi
 
 installBuiltSystem() {
     local target="$1"
-    local outLink="/tmp/systemOutLink"
+    local outLink='../result.'"$target"
 
     set -x
 
     nix build \
         -L \
         --fallback \
         --log-format bar-with-logs \
-        --out-link '../result.'"$target" \
+        --out-link "$outLink" \
         '.#nixosConfigurations.'"$target"'.config.system.build.toplevel'
 
     sudo nixos-install --no-root-passwd --system "$outLink"