upstreamed the package

JohnRTitor · May 18, 2024 · 222348d · 222348d
1 parent a897ddd
commit 222348d
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 86 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/pkgs/matrix-plymouth-theme.nix b/pkgs/matrix-plymouth-theme.nix
diff --git a/system/boot/boot-options.nix b/system/boot/boot-options.nix
@@ -1,9 +1,7 @@
 # This conf file is used to configure boot
 {
-  config,
   pkgs,
-  lib,
-  systemSettings,
+  pkgs-edge,
   ...
 }: {
   # Enable systemd-boot
@@ -32,9 +30,9 @@
     # black_hud circle_hud cross_hud square_hud
     # circuit connect cuts_alt seal_2 seal_3
     theme = "matrix";
-    themePackages = with pkgs; [
-      (adi1090x-plymouth-themes.override {selected_themes = ["rings_2"];})
-      (callPackage ../../pkgs/matrix-plymouth-theme.nix {})
+    themePackages = [
+      (pkgs.adi1090x-plymouth-themes.override {selected_themes = ["rings_2"];})
+      pkgs-edge.plymouth-matrix-theme
     ];
   };
 }
diff --git a/system/services/default.nix b/system/services/default.nix
@@ -66,4 +66,12 @@
   security.apparmor.enable = true;
   security.apparmor.enableCache = true;
   services.dbus.apparmor = "enabled";
+
+  console = {
+    font = "ter-124b";
+    keyMap = "us";
+    packages = with pkgs; [
+      terminus_font
+    ];
+  };
 }