Compare commits

..

No commits in common. "1f9f5a1914a3a0c47f7e5b2ee26082b751a6f7ef" and "ca3b1adf5e43b4f8358d72e01c4a2f992acc8e71" have entirely different histories.

7 changed files with 42 additions and 26 deletions

View file

@ -20,23 +20,14 @@
inherit inputs;
src = ./.;
# Configure Nix
channels-config.allowUnfree = false;
supportedSystems = inputs.snowfall-lib.inputs.flake-utils-plus.lib.defaultSystems ++ ["i686-linux"];
nix.gc = {
automatic = true;
options = "--delete-older-than 30d";
};
nix.optimise.automatic = true;
channels-config.allowUnfree = false;
# Configure Flake Utils Plus
supportedSystems = inputs.snowfall-lib.inputs.flake-utils-plus.lib.defaultSystems ++ ["i686-linux"];
# Configure Snowfall Lib
snowfall = {
meta.name = "kB01s System Configuration Flake";
meta.title = "kB01s System Configuration Flake";
namespace = "kb-one";
};
# Modules for Host HyperC
systems.hosts.HyperC.modules = with inputs; [

View file

@ -14,7 +14,7 @@ in
numenPkg = mkOption {
type = types.package;
default = pkgs.kb-one.numen;
default = pkgs.internal.numen;
};
# models = mkOption {
@ -28,7 +28,7 @@ in
model = mkOption {
type = types.pathInStore;
default = "${pkgs.kb-one.vosk-model-small-en-us}/usr/share/vosk-models/small-en-us/";
default = "${pkgs.internal.vosk-model-small-en-us}/usr/share/vosk-models/small-en-us/";
example = "vosk-model-small-en-us";
description = ''
Vosk model to be loaded by numen.

View file

@ -28,8 +28,8 @@ buildGoModule rec {
allowGoReference = true;
preBuild = ''
export CGO_CFLAGS="-I${pkgs.kb-one.vosk-bin}/include"
export CGO_LDFLAGS="-L${pkgs.kb-one.vosk-bin}/lib"
export CGO_CFLAGS="-I${pkgs.internal.vosk-bin}/include"
export CGO_LDFLAGS="-L${pkgs.internal.vosk-bin}/lib"
'';
nativeBuildInputs = [
makeWrapper
@ -38,7 +38,7 @@ buildGoModule rec {
ldflags = [
"-X main.Version=${version}"
"-X main.DefaultModelPackage=vosk-model-small-en-us"
"-X main.DefaultModelPaths=${pkgs.kb-one.vosk-model-small-en-us}/usr/share/vosk-models/small-en-us"
"-X main.DefaultModelPaths=${pkgs.internal.vosk-model-small-en-us}/usr/share/vosk-models/small-en-us"
"-X main.DefaultPhrasesDir=${placeholder "out"}/etc/numen/phrases"
];
# This is necessary because while the scripts are copied relative to
@ -82,7 +82,7 @@ buildGoModule rec {
'';
postFixup = ''
wrapProgram $out/bin/numen \
--prefix PATH : ${lib.makeBinPath [ pkgs.kb-one.dotool alsa-utils ]} \
--prefix PATH : ${lib.makeBinPath [ pkgs.internal.dotool alsa-utils ]} \
--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libxkbcommon stdenv.cc.cc.lib ]} \
'';
}

View file

@ -61,7 +61,7 @@
};
# Enable sound with pipewire.
services.pulseaudio.enable = false;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
@ -80,7 +80,7 @@
extraGroups = [ "wheel" "networkmanager" "input" ];
packages = with pkgs; [
tree
kb-one.numen
internal.numen
];
};

View file

@ -37,8 +37,8 @@
nixpkgs.hostPlatform = lib.mkDefault "i686-linux";
# networking.enableIntel3945ABGFirmware = true;
hardware.graphics.extraPackages = [ pkgs.intel-vaapi-driver pkgs.kb-one.intel-media-sdk ];
hardware.graphics.extraPackages32 = [ pkgs.intel-vaapi-driver pkgs.kb-one.intel-media-sdk ];
hardware.graphics.extraPackages = [ pkgs.intel-vaapi-driver pkgs.internal.intel-media-sdk ];
hardware.graphics.extraPackages32 = [ pkgs.intel-vaapi-driver pkgs.internal.intel-media-sdk ];
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.enableAllFirmware = true;
}

View file

@ -117,9 +117,9 @@
environment.systemPackages = with pkgs; [
vim
git
kb-one.numen
kb-one.dotool
kb-one.vosk-model-small-en-us
internal.numen
internal.dotool
internal.vosk-model-small-en-us
];
system.stateVersion = "24.05"; # NEVER Change this!

View file

@ -18,6 +18,7 @@
"cache.HyperC:90YNJ0eWsuBGVVP989lJh1rL8C0KM6IKbAtEUiu+FCU="
];
# Bootloader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
@ -26,6 +27,11 @@
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
networking.hostName = "voloxo"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
# Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
# Enable networking
networking.networkmanager.enable = true;
@ -48,6 +54,8 @@
LC_TIME = "de_DE.UTF-8";
};
# Nvidia Configuration
hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable;
hardware.bluetooth.enable = true;
@ -80,15 +88,24 @@
services.printing.enable = true;
# Enable sound with pipewire.
services.pulseaudio.enable = false;
hardware.pulseaudio.enable = false;
security.rtkit.enable = true;
services.pipewire = {
enable = true;
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
# use the example session manager (no others are packaged yet so this is enabled by default,
# no need to redefine it in your config for now)
#media-session.enable = true;
};
# Enable touchpad support (enabled default in most desktopManager).
# services.xserver.libinput.enable = true;
# Define a user account. Don't forget to set a password with passwd.
users.users.kb = {
isNormalUser = true;
@ -191,6 +208,14 @@
ntfs3g
];
# Some programs need SUID wrappers, can be configured further or are
# started in user sessions.
# programs.mtr.enable = true;
# programs.gnupg.agent = {
# enable = true;
# enableSSHSupport = true;
# };
# List services that you want to enable:
systemd.services.languagetool = {
description = "LanguageTool HTTP Server for local Spellchecking";