Created dina-psf package
This commit is contained in:
Jan-Bulthuis
parent
1b35d92f6b
commit
fc5a748fa5
|
|
@ -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";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 { };
|
||||
|
|
|
|||
|
|
@ -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
|
||||
'';
|
||||
}
|
||||
|
|
@ -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
|
||||
'';
|
||||
}
|
||||
|
|
@ -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
|
||||
'';
|
||||
|
|
|
|||
Loading…
Reference in New Issue