diff --git a/flake.nix b/flake.nix index 36df650..281352c 100644 --- a/flake.nix +++ b/flake.nix @@ -20,14 +20,23 @@ inherit inputs; src = ./.; - channels-config.allowUnfree = false; - supportedSystems = inputs.snowfall-lib.inputs.flake-utils-plus.lib.defaultSystems ++ ["i686-linux"]; - + # Configure Nix 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; [ diff --git a/modules/home/services/numen/default.nix b/modules/home/services/numen/default.nix index 8cde203..8a1da0d 100644 --- a/modules/home/services/numen/default.nix +++ b/modules/home/services/numen/default.nix @@ -14,7 +14,7 @@ in numenPkg = mkOption { type = types.package; - default = pkgs.internal.numen; + default = pkgs.kb-one.numen; }; # models = mkOption { @@ -28,7 +28,7 @@ in model = mkOption { type = types.pathInStore; - default = "${pkgs.internal.vosk-model-small-en-us}/usr/share/vosk-models/small-en-us/"; + default = "${pkgs.kb-one.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. diff --git a/packages/numen/default.nix b/packages/numen/default.nix index b3ab5a0..fa8e76c 100644 --- a/packages/numen/default.nix +++ b/packages/numen/default.nix @@ -28,8 +28,8 @@ buildGoModule rec { allowGoReference = true; preBuild = '' - export CGO_CFLAGS="-I${pkgs.internal.vosk-bin}/include" - export CGO_LDFLAGS="-L${pkgs.internal.vosk-bin}/lib" + export CGO_CFLAGS="-I${pkgs.kb-one.vosk-bin}/include" + export CGO_LDFLAGS="-L${pkgs.kb-one.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.internal.vosk-model-small-en-us}/usr/share/vosk-models/small-en-us" + "-X main.DefaultModelPaths=${pkgs.kb-one.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.internal.dotool alsa-utils ]} \ + --prefix PATH : ${lib.makeBinPath [ pkgs.kb-one.dotool alsa-utils ]} \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libxkbcommon stdenv.cc.cc.lib ]} \ ''; } diff --git a/systems/i686-linux/Rubtrm/default.nix b/systems/i686-linux/Rubtrm/default.nix index d1f6e41..b95bdb2 100644 --- a/systems/i686-linux/Rubtrm/default.nix +++ b/systems/i686-linux/Rubtrm/default.nix @@ -61,7 +61,7 @@ }; # Enable sound with pipewire. - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; @@ -80,7 +80,7 @@ extraGroups = [ "wheel" "networkmanager" "input" ]; packages = with pkgs; [ tree - internal.numen + kb-one.numen ]; }; diff --git a/systems/i686-linux/Rubtrm/hardware.nix b/systems/i686-linux/Rubtrm/hardware.nix index afa99ec..8e49f42 100644 --- a/systems/i686-linux/Rubtrm/hardware.nix +++ b/systems/i686-linux/Rubtrm/hardware.nix @@ -37,8 +37,8 @@ nixpkgs.hostPlatform = lib.mkDefault "i686-linux"; # networking.enableIntel3945ABGFirmware = true; - 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.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.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.enableAllFirmware = true; } diff --git a/systems/x86_64-linux/HyperC/default.nix b/systems/x86_64-linux/HyperC/default.nix index 623d595..7208c95 100644 --- a/systems/x86_64-linux/HyperC/default.nix +++ b/systems/x86_64-linux/HyperC/default.nix @@ -109,7 +109,7 @@ services.printing.enable = true; # Enable sound with pipewire. - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; security.rtkit.enable = true; services.pipewire = { enable = true; diff --git a/systems/x86_64-linux/LoyAdjo/default.nix b/systems/x86_64-linux/LoyAdjo/default.nix index 09390ce..d748dc1 100644 --- a/systems/x86_64-linux/LoyAdjo/default.nix +++ b/systems/x86_64-linux/LoyAdjo/default.nix @@ -117,9 +117,9 @@ environment.systemPackages = with pkgs; [ vim git - internal.numen - internal.dotool - internal.vosk-model-small-en-us + kb-one.numen + kb-one.dotool + kb-one.vosk-model-small-en-us ]; system.stateVersion = "24.05"; # NEVER Change this!