From fc5a748fa5290d241fae709602be3b9655ea666f Mon Sep 17 00:00:00 2001 From: Jan-Bulthuis Date: Tue, 11 Feb 2025 15:48:55 +0100 Subject: [PATCH] Created dina-psf package --- modules/base/default.nix | 35 ++------------------------------ modules/greeter/gdm/default.nix | 18 +++++++++++++---- pkgs/default.nix | 2 +- pkgs/fonts/dina-psf.nix | 36 +++++++++++++++++++++++++++++++++ pkgs/fonts/dina-psfu.nix | 29 -------------------------- pkgs/fonts/dina-vector.nix | 8 ++------ 6 files changed, 55 insertions(+), 73 deletions(-) create mode 100644 pkgs/fonts/dina-psf.nix delete mode 100644 pkgs/fonts/dina-psfu.nix diff --git a/modules/base/default.nix b/modules/base/default.nix index db65d92..896e84d 100644 --- a/modules/base/default.nix +++ b/modules/base/default.nix @@ -36,6 +36,7 @@ in # usbutils # udiskie # udisks + dina-psf ]; security.krb5 = { @@ -101,38 +102,6 @@ in # services.gvfs.enable = true; services.udisks2.enable = true; - # TODO: Remove? - # Temporarily disable nvidia dgpu - # boot.extraModprobeConfig = '' - # blacklist nouveau - # options nouveau modeset=0 - # ''; - # services.udev.extraRules = '' - # # Remove NVIDIA USB xHCI Host Controller devices, if present - # ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c0330", ATTR{power/control}="auto", ATTR{remove}="1" - - # # Remove NVIDIA USB Type-C UCSI devices, if present - # ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x0c8000", ATTR{power/control}="auto", ATTR{remove}="1" - - # # Remove NVIDIA Audio devices, if present - # ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x040300", ATTR{power/control}="auto", ATTR{remove}="1" - - # # Remove NVIDIA VGA/3D controller devices - # ACTION=="add", SUBSYSTEM=="pci", ATTR{vendor}=="0x10de", ATTR{class}=="0x03[0-9]*", ATTR{power/control}="auto", ATTR{remove}="1" - # ''; - # boot.blacklistedKernelModules = [ - # "nouveau" - # "nvidia" - # ]; - - # TODO: Move to module - # Adds gnome as DE - # modules.greetd.enable = lib.mkForce false; - # modules.tuigreet.enable = lib.mkForce false; - # services.xserver = { - # enable = true; - # displayManager.gdm.enable = true; - # desktopManager.gnome.enable = true; - # }; + console.font = "${pkgs.dina-psf}/share/consolefonts/dina.psf"; }; } diff --git a/modules/greeter/gdm/default.nix b/modules/greeter/gdm/default.nix index e165fe8..f462091 100644 --- a/modules/greeter/gdm/default.nix +++ b/modules/greeter/gdm/default.nix @@ -15,11 +15,21 @@ in }; config = mkIf cfg.enable { - services.xserver = { + # services.xserver = { + # enable = true; + # displayManager.gdm.enable = true; + # displayManager.gdm.wayland = true; + # libinput.enable = true; + # }; + services.displayManager.ly = { enable = true; - displayManager.gdm.enable = true; - displayManager.gdm.wayland = true; - libinput.enable = true; + settings = { + animation = "matrix"; + box_title = "Hewwo! >_< :3"; + clear_password = true; + load = true; + save = true; + }; }; }; } diff --git a/pkgs/default.nix b/pkgs/default.nix index fbe2275..9a1f4d5 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -6,7 +6,7 @@ nixpkgs.config = { packageOverrides = pkgs: { dina-vector = pkgs.callPackage ./fonts/dina-vector.nix { }; - dina-psfu = pkgs.callPackage ./fonts/dina-psfu.nix { }; + dina-psf = pkgs.callPackage ./fonts/dina-psf.nix { }; wqy-zenhei = pkgs.callPackage ./fonts/wqy-zenhei.nix { }; wqy-microhei = pkgs.callPackage ./fonts/wqy-microhei.nix { }; wqy-bitmapsong = pkgs.callPackage ./fonts/wqy-bitmapsong.nix { }; diff --git a/pkgs/fonts/dina-psf.nix b/pkgs/fonts/dina-psf.nix new file mode 100644 index 0000000..b16cafb --- /dev/null +++ b/pkgs/fonts/dina-psf.nix @@ -0,0 +1,36 @@ +{ + pkgs, + ... +}: + +pkgs.stdenv.mkDerivation { + pname = "dina-psfu"; + version = "1.0.0"; + + unpackPhase = '' + true + ''; + + buildInputs = with pkgs; [ + dina-font.bdf + bdf2psf + ]; + + buildPhase = '' + cp ${pkgs.dina-font.bdf}/share/fonts/misc/Dina_r400-9.bdf ./dina.bdf + + # Set the AVERAGE_WIDTH property on the font + sed 's/STARTPROPERTIES 16/STARTPROPERTIES 17\ + AVERAGE_WIDTH 70/' ./dina.bdf > ./dina-mod.bdf + + # Convert the bdf to psf + bdf2psf --fb ./dina-mod.bdf \ + ${pkgs.bdf2psf}/share/bdf2psf/standard.equivalents \ + ${pkgs.bdf2psf}/share/bdf2psf/ascii.set+${pkgs.bdf2psf}/share/bdf2psf/linux.set+${pkgs.bdf2psf}/share/bdf2psf/useful.set \ + 512 ./dina.psf + ''; + + installPhase = '' + install -Dm644 -t $out/share/consolefonts *.psf + ''; +} diff --git a/pkgs/fonts/dina-psfu.nix b/pkgs/fonts/dina-psfu.nix deleted file mode 100644 index 25b843a..0000000 --- a/pkgs/fonts/dina-psfu.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - pkgs, - ... -}: - -pkgs.stdenv.mkDerivation { - pname = "dina-psfu"; - version = "1.0.0"; - - # src = pkgs.fetchurl { - # url = "mirror://sourceforge/wqy/${pname}-${version}.tar.gz"; - # # hash = "sha256-r2Vf7ftJCqu7jOc2AqCKaoR/r8eNw2P/OQGqbDOEyl0="; - # hash = "sha256-0uvwkRUbvJ0remTnlP8dElRjaBVd6iukNYBTE/CTO7s="; - # }; - - unpackPhase = "true"; - - buildInputs = with pkgs; [ - dina-font - bdf2psf - tree - ]; - buildPhase = '' - tree > debug.txt - ''; - installPhase = '' - install -Dm644 $out/debug.txt - ''; -} diff --git a/pkgs/fonts/dina-vector.nix b/pkgs/fonts/dina-vector.nix index 2a30013..2e65540 100644 --- a/pkgs/fonts/dina-vector.nix +++ b/pkgs/fonts/dina-vector.nix @@ -7,12 +7,6 @@ pkgs.stdenv.mkDerivation { pname = "dina-font"; version = "1.0.0"; - # src = pkgs.fetchurl { - # url = "mirror://sourceforge/wqy/${pname}-${version}.tar.gz"; - # # hash = "sha256-r2Vf7ftJCqu7jOc2AqCKaoR/r8eNw2P/OQGqbDOEyl0="; - # hash = "sha256-0uvwkRUbvJ0remTnlP8dElRjaBVd6iukNYBTE/CTO7s="; - # }; - unpackPhase = "true"; buildInputs = [ @@ -21,6 +15,8 @@ pkgs.stdenv.mkDerivation { pkgs.wqy-bitmapsong pkgs.tree ]; + + # TODO: Fix or remove package buildPhase = '' tree > debug.txt '';