feat: Add new layout and 2 new colorschemes

flake.nix

@@ -3,54 +3,56 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
-    grub-theme.url = "github:max-ishere/grub-theme.nix?ref=main";
-    grub-theme.inputs.nixpkgs.follows = "nixpkgs";
+    # grubTheme.url = "github:max-ishere/grub-theme.nix?ref=main";
+    grubTheme.url = "/home/max_ishere/Projects/grub-theme.nix";
+    grubTheme.inputs.nixpkgs.follows = "nixpkgs";
+    hywenhei-extended-font = {
+      url = "github:cawa-93/HYWenHei-Extended-Font?ref=main";
+      flake = false;
+    };
   };
 
   outputs = {
     self,
     nixpkgs,
-    grub-theme,
+    grubTheme,
+    hywenhei-extended-font,
   }: let
     system = "x86_64-linux";
-    pkgs = import nixpkgs {
+    unfreePkgs = import nixpkgs {
       inherit system;
       config.allowUnfree = true; # like this
     };
-    lib = nixpkgs.lib;
+    pkgs = nixpkgs.legacyPackages.${system};
+    inherit (nixpkgs) lib;
   in {
     formatter.${system} = pkgs.alejandra;
 
-    packages.${system} = {
-      preview-theme = grub-theme.lib.mkGrubThemePreview {
-        src = self.packages.${system}.grubshin-bootpact;
-        name = "grubshin-bootpact";
-        # resolution = "1280x720";
-        menuentries = builtins.map (png: let
-          class = lib.removeSuffix ".png" png;
-        in {
-          name = "class: ${class}";
-          inherit class;
-        }) (builtins.attrNames (builtins.readDir ./src/icons));
-      };
+    theme = pkgs.callPackage ./nix/theme.nix {
+      grubTheme = grubTheme.lib;
+      inherit hywenhei-extended-font;
+    };
 
-      grubshin-bootpact = pkgs.callPackage ./grubshin-bootpact.nix {
-        inherit (grub-theme.lib) mkGrubThemeTxt;
-      };
+    packages.${system} = import ./nix/packages/grubshin-bootpact.nix {
+      inherit (self) theme;
+      inherit lib;
+      grubTheme = grubTheme.lib;
     };
 
     devShells.${system} = {
       default = pkgs.mkShell {
         buildInputs = with pkgs; [
-          (vscode-with-extensions.override {
+          (unfreePkgs.vscode-with-extensions.override {
             vscodeExtensions = with vscode-extensions; [
               vscodevim.vim
               jnoortheen.nix-ide
               ms-vscode.hexeditor
             ];
           })
+          nixd
 
           inkscape
+          resvg
         ];
       };
     };