Retrying
This commit is contained in:
@@ -1,15 +0,0 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{
|
||||
services.ollama = {
|
||||
enable = true;
|
||||
package = pkgs.ollama-vulkan;
|
||||
loadModels = [
|
||||
"qwen2.5-coder:7b"
|
||||
"qwen2.5-coder:32b"
|
||||
"starcoder2:15b"
|
||||
];
|
||||
};
|
||||
environment.systemPackages = [
|
||||
pkgs.ollama-vulkan
|
||||
];
|
||||
}
|
||||
@@ -1,10 +1,8 @@
|
||||
{ config, pkgs, lib, flakeRoot, ... }:
|
||||
|
||||
let
|
||||
moduleName = "install-flatpaks";
|
||||
flatpakConfPath = flakeRoot + "/assets/conf/apps/flatpaks.conf";
|
||||
raw = builtins.readFile flatpakConfPath;
|
||||
|
||||
# Explicit "\n" so we never accidentally split into characters
|
||||
rawLines = lib.splitString "\n" raw;
|
||||
|
||||
|
||||
@@ -1,29 +1,23 @@
|
||||
{ config, lib, pkgs, flakeRoot, inputs, ... }:
|
||||
|
||||
let
|
||||
packagesConfPath = flakeRoot + "/assets/conf/apps/packages.conf";
|
||||
raw = builtins.readFile packagesConfPath;
|
||||
|
||||
# IMPORTANT: explicit "\n" so we never accidentally split into characters
|
||||
rawLines = lib.splitString "\n" raw;
|
||||
|
||||
# Guard: if we accidentally split into characters, rawLines length ~= stringLength raw
|
||||
_guard = assert !(
|
||||
builtins.stringLength raw > 1 &&
|
||||
builtins.length rawLines == builtins.stringLength raw
|
||||
); true;
|
||||
|
||||
cleanLine = l:
|
||||
let
|
||||
noCR = lib.replaceStrings [ "\r" ] [ "" ] l;
|
||||
noInlineComment = lib.head (lib.splitString "#" noCR);
|
||||
in
|
||||
lib.strings.trim noInlineComment;
|
||||
|
||||
entries =
|
||||
builtins.filter (l: l != "")
|
||||
(map cleanLine rawLines);
|
||||
|
||||
resolvePkg = name:
|
||||
let
|
||||
parts = lib.splitString "." name;
|
||||
@@ -32,19 +26,15 @@ let
|
||||
if found == null then
|
||||
throw ''
|
||||
install_packages.nix: package not found in pkgs
|
||||
|
||||
Token : ${builtins.toJSON name}
|
||||
packages.conf : ${toString packagesConfPath}
|
||||
Hint : check the attribute name on search.nixos.org/packages
|
||||
''
|
||||
else
|
||||
found;
|
||||
|
||||
packages = builtins.seq _guard (map resolvePkg entries);
|
||||
|
||||
zenBrowser =
|
||||
inputs.zen-browser.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||
|
||||
in
|
||||
{
|
||||
environment.systemPackages =
|
||||
|
||||
Reference in New Issue
Block a user