Compare commits
8 Commits
7fd6cc9911
...
update-fla
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8efbab4147 | ||
| e45e7960da | |||
| 0d5bf7e46d | |||
| 83c7ef00ad | |||
|
|
1fbe15c0a0 | ||
| a923f4fd82 | |||
| 802bf1ca4c | |||
| b5e45398d8 |
24
flake.lock
generated
24
flake.lock
generated
@@ -76,11 +76,11 @@
|
||||
},
|
||||
"locked": {
|
||||
"dir": "pkgs/firefox-addons",
|
||||
"lastModified": 1774497795,
|
||||
"narHash": "sha256-tzgxKaCEMcU6XT0fjV/vEqDCM9yij6wBgPPBKiK8Dfk=",
|
||||
"lastModified": 1774584175,
|
||||
"narHash": "sha256-3g85c0I2xSgcAayR6tRYPovsF9eBosN6AwBcoFiL+GY=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "11af6f465a038233b8123022dcb7e293f3229f11",
|
||||
"rev": "9e84571429d01fc3971f05ee3daa3316516b460f",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
@@ -242,11 +242,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774379316,
|
||||
"narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=",
|
||||
"lastModified": 1774584114,
|
||||
"narHash": "sha256-uWR9fC+4NykFJVn4GN4Ini9LX+w8Llj7BnWKKp0N6bw=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7",
|
||||
"rev": "4b1be5c38be350ee9452a4847945ce71d950dc31",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -417,11 +417,11 @@
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1774465523,
|
||||
"narHash": "sha256-4v7HPm63Q90nNn4fgkgKsjW1AH2Klw7XzPtHJr562nM=",
|
||||
"lastModified": 1774567711,
|
||||
"narHash": "sha256-uVlOHBvt6Vc/iYNJXLPa4c3cLXwMllOCVfAaLAcphIo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "de895be946ad1d8aafa0bb6dfc7e7e0e9e466a29",
|
||||
"rev": "3f6f874dfc34d386d10e434c48ad966c4832243e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -596,11 +596,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1774494762,
|
||||
"narHash": "sha256-lt22GCJZ6qBQLgNZZl3S/RUjTLXTlEy0Fn0sqMttLxQ=",
|
||||
"lastModified": 1774581174,
|
||||
"narHash": "sha256-258qgkMkYPkJ9qpIg63Wk8GoIbVjszkGGPU1wbVHYTk=",
|
||||
"owner": "oxalica",
|
||||
"repo": "rust-overlay",
|
||||
"rev": "ce3b3a61ebf28670dfc8b97eb35ed9e24474a2cf",
|
||||
"rev": "a313afc75b85fc77ac154bf0e62c36f68361fd0b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -46,8 +46,33 @@
|
||||
kubernetes
|
||||
];
|
||||
|
||||
# Enable containerd for Kubernetes
|
||||
virtualisation.containerd.enable = true;
|
||||
## Enable containerd for Kubernetes
|
||||
#virtualisation.containerd.enable = true;
|
||||
|
||||
## Enable kubelet
|
||||
#services.kubelet = {
|
||||
# enable = true;
|
||||
# extraFlags = {
|
||||
# "pod-infra-container-image" = "registry.k8s.io/pause:3.9";
|
||||
# };
|
||||
#};
|
||||
|
||||
## Enable kubeadm for cluster initialization
|
||||
#environment.etc."kubeadm.yaml".text = ''
|
||||
# apiVersion: kubeadm.k8s.io/v1beta3
|
||||
# kind: InitConfiguration
|
||||
# localAPIEndpoint:
|
||||
# advertiseAddress: 127.0.0.1
|
||||
# bindPort: 6443
|
||||
# ---
|
||||
# apiVersion: kubeadm.k8s.io/v1beta3
|
||||
# kind: ClusterConfiguration
|
||||
# clusterName: ${config.services.kubernetes.clusterName}
|
||||
# controlPlaneEndpoint: ${config.services.kubernetes.controlPlaneEndpoint}
|
||||
# networking:
|
||||
# serviceSubnet: 10.96.0.0/12
|
||||
# podSubnet: 10.244.0.0/16
|
||||
# dnsDomain: cluster.local
|
||||
#'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
@@ -17,6 +18,7 @@
|
||||
./stylix.nix
|
||||
./wifi.nix
|
||||
./zerotier.nix
|
||||
../palatine-hill/ollama.nix
|
||||
];
|
||||
|
||||
time.timeZone = "America/New_York";
|
||||
@@ -39,6 +41,19 @@
|
||||
sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
|
||||
|
||||
services = {
|
||||
ollama = {
|
||||
package = lib.mkForce pkgs.ollama-rocm;
|
||||
models = lib.mkForce "${config.services.ollama.home}/models";
|
||||
loadModels = lib.mkForce [
|
||||
"deepseek-r1:1.5b"
|
||||
"lennyerik/zeta"
|
||||
"nomic-embed-text:latest"
|
||||
"glm-4.7-flash"
|
||||
"magistral"
|
||||
"devstral-small-2"
|
||||
"starcoder2:7b"
|
||||
];
|
||||
};
|
||||
flatpak.enable = true;
|
||||
calibre-web = {
|
||||
# temp disable this
|
||||
|
||||
@@ -35,12 +35,8 @@
|
||||
grim
|
||||
htop
|
||||
hwloc
|
||||
ipmiview
|
||||
iperf3
|
||||
# ipscan
|
||||
javaPackages.compiler.temurin-bin.jdk-25
|
||||
javaPackages.compiler.temurin-bin.jdk-21
|
||||
javaPackages.compiler.temurin-bin.jdk-17
|
||||
jp2a
|
||||
jq
|
||||
kdePackages.kdenlive
|
||||
|
||||
@@ -17,7 +17,6 @@
|
||||
./minio.nix
|
||||
./networking.nix
|
||||
./nextcloud.nix
|
||||
./ollama.nix
|
||||
#./plex
|
||||
./postgresql.nix
|
||||
./samba.nix
|
||||
|
||||
@@ -25,13 +25,14 @@ in
|
||||
"nemotron-cascade-2:30b"
|
||||
"magistral"
|
||||
"devstral-small-2"
|
||||
"starcoder2:15b"
|
||||
];
|
||||
models = vars.primary_ollama;
|
||||
environmentVariables = {
|
||||
FLASH_ATTENTION = "1";
|
||||
OLLAMA_KV_CACHE_TYPE = "q8_0";
|
||||
OLLAMA_KV_CACHE_TYPE = "q4_0";
|
||||
# Ollama memory configuration
|
||||
OLLAMA_MAX_LOADED_MODELS = "2";
|
||||
OLLAMA_MAX_LOADED_MODELS = "3";
|
||||
OLLAMA_MAX_QUEUE = "512";
|
||||
OLLAMA_NUM_PARALLEL = "1";
|
||||
|
||||
|
||||
@@ -31,7 +31,6 @@
|
||||
grim
|
||||
htop
|
||||
hwloc
|
||||
ipmiview
|
||||
iperf3
|
||||
# ipscan
|
||||
jp2a
|
||||
|
||||
@@ -85,7 +85,32 @@
|
||||
#keep_alive = "15m";
|
||||
available_models = [
|
||||
{
|
||||
name = "glm-4.7-flash";
|
||||
name = "deepseek-r1:1.5b";
|
||||
max_tokens = 128000;
|
||||
keep_alive = "15m";
|
||||
}
|
||||
{
|
||||
name = "deepseek-r1:32b";
|
||||
max_tokens = 128000;
|
||||
keep_alive = "15m";
|
||||
}
|
||||
{
|
||||
name = "deepseek-r1:70b";
|
||||
max_tokens = 128000;
|
||||
keep_alive = "15m";
|
||||
}
|
||||
{
|
||||
name = "qwen3-coder-next";
|
||||
max_tokens = 128000;
|
||||
keep_alive = "15m";
|
||||
}
|
||||
{
|
||||
name = "lennyerik/zeta";
|
||||
max_tokens = 128000;
|
||||
keep_alive = "15m";
|
||||
}
|
||||
{
|
||||
name = "nomic-embed-text:latest";
|
||||
max_tokens = 128000;
|
||||
keep_alive = "15m";
|
||||
}
|
||||
@@ -94,6 +119,22 @@
|
||||
max_tokens = 128000;
|
||||
keep_alive = "15m";
|
||||
}
|
||||
{
|
||||
name = "glm-4.7-flash";
|
||||
max_tokens = 128000;
|
||||
keep_alive = "15m";
|
||||
}
|
||||
{
|
||||
name = "nemotron-cascade-2:30b";
|
||||
max_tokens = 128000;
|
||||
keep_alive = "15m";
|
||||
}
|
||||
{
|
||||
name = "magistral";
|
||||
max_tokens = 128000;
|
||||
keep_alive = "15m";
|
||||
}
|
||||
|
||||
];
|
||||
};
|
||||
};
|
||||
@@ -200,7 +241,7 @@
|
||||
languagetool
|
||||
|
||||
# latex
|
||||
texlive.combined.scheme-full
|
||||
texlive.combined.scheme-medium
|
||||
|
||||
# dependencies for nix-dotfiles/hydra-check-action
|
||||
nodejs_20
|
||||
|
||||
Reference in New Issue
Block a user