From c4e3ab2e4ab71478c0754d4a9b4275fbc493a271 Mon Sep 17 00:00:00 2001 From: cspark Date: Fri, 15 Mar 2024 16:55:59 +0000 Subject: [PATCH] Fix wrong variable name issue in gpu passthru module, configure console/tty colours --- global.nix | 30 +++++++++++++++++-- modules/cspark-single-gpu-passthru/module.nix | 2 +- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/global.nix b/global.nix index 55b3a899..d639f275 100644 --- a/global.nix +++ b/global.nix @@ -31,8 +31,34 @@ variant = ""; }; - # Configure console keymap - console.keyMap = "uk"; + # Console (TTY) Configuration + console = { + # Configure console keymap + keyMap = "uk"; + # Configure console colors (Gruvbox Light) - More colourschemes at https://github.com/kolunmi/ttyscheme/blob/main/ttyscheme + colors = [ + "fbf1c7" + "cc241d" + "98971a" + "d79921" + "458588" + "b16286" + "689d6a" + "7c6f64" + "928374" + "9d0006" + "79740e" + "b57614" + "076678" + "8f3f71" + "427b58" + "3c3836" + ]; + }; + + fonts.packages = with pkgs; [ + nerdfonts + ]; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.cspark = { diff --git a/modules/cspark-single-gpu-passthru/module.nix b/modules/cspark-single-gpu-passthru/module.nix index ba26243e..61a9673e 100644 --- a/modules/cspark-single-gpu-passthru/module.nix +++ b/modules/cspark-single-gpu-passthru/module.nix @@ -71,7 +71,7 @@ in qemuscript_source = builtins.readFile ./resources/libvirt/hooks/qemu; startscript_source = builtins.readFile ./resources/libvirt/hooks/qemu.d/vm/prepare/begin/start.sh; revertscript_source = builtins.readFile ./resources/libvirt/hooks/qemu.d/vm/release/end/revert.sh; - qemuscript = pkgs.writeShellScript "cspark-single-gpu-passthru-qemu" revertscript_source; + qemuscript = pkgs.writeShellScript "cspark-single-gpu-passthru-qemu" qemuscript_source; startscript = pkgs.writeShellScript "cspark-single-gpu-passthru-start.sh" startscript_source; revertscript = pkgs.writeShellScript "cspark-single-gpu-passthru-revert.sh" revertscript_source; gpuvbios = ./resources/libvirt/vgabios/gpuvbios.rom;