Compare commits
8 Commits
bf4711e9a0
...
7fd6cc9911
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7fd6cc9911 | ||
| 623cad29a7 | |||
| fde7963379 | |||
| e0f2f64886 | |||
| 0036acbde3 | |||
| ecdf223431 | |||
| 6e6a8a205a | |||
| 342ff16158 |
66
flake.lock
generated
66
flake.lock
generated
@@ -76,11 +76,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1773201798,
|
"lastModified": 1774497795,
|
||||||
"narHash": "sha256-TZQwHvIBz9hr/fci/G/AIjPSKCMtxQm/xFm3MNJ/mVg=",
|
"narHash": "sha256-tzgxKaCEMcU6XT0fjV/vEqDCM9yij6wBgPPBKiK8Dfk=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "016edd132727d8ac364454a6b443ef46c2d1c7e4",
|
"rev": "11af6f465a038233b8123022dcb7e293f3229f11",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -242,11 +242,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773179137,
|
"lastModified": 1774379316,
|
||||||
"narHash": "sha256-EdW2bwzlfme0vbMOcStnNmKlOAA05Bp6su2O8VLGT0k=",
|
"narHash": "sha256-0nGNxWDUH2Hzlj/R3Zf4FEK6fsFNB/dvewuboSRZqiI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "3f98e2bbc661ec0aaf558d8a283d6955f05f1d09",
|
"rev": "1eb0549a1ab3fe3f5acf86668249be15fa0e64f7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -283,11 +283,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1771502235,
|
"lastModified": 1773993211,
|
||||||
"narHash": "sha256-aH8h5ZOiyEGtHmEyuE/eFxx8TN7a+NGDnl4V+dbzJ6E=",
|
"narHash": "sha256-4J6vEtf7dIw3pZ/xM/dU7ECTmr8AsIIUQJba1B8wp5k=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "contrib",
|
"repo": "contrib",
|
||||||
"rev": "918f266dddae39fa4184a1b8bf51ec5381cf29f7",
|
"rev": "43c012d21d9314c585b97ac4f34752f6de93dc8f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -337,11 +337,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772945408,
|
"lastModified": 1774156144,
|
||||||
"narHash": "sha256-PMt48sEQ8cgCeljQ9I/32uoBq/8t8y+7W/nAZhf72TQ=",
|
"narHash": "sha256-gdYe9wTPl4ignDyXUl1LlICWj41+S0GB5lG1fKP17+A=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "1c1d8ea87b047788fd7567adf531418c5da321ec",
|
"rev": "55b588747fa3d7fc351a11831c4b874dab992862",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -417,11 +417,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772972630,
|
"lastModified": 1774465523,
|
||||||
"narHash": "sha256-mUJxsNOrBMNOUJzN0pfdVJ1r2pxeqm9gI/yIKXzVVbk=",
|
"narHash": "sha256-4v7HPm63Q90nNn4fgkgKsjW1AH2Klw7XzPtHJr562nM=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "3966ce987e1a9a164205ac8259a5fe8a64528f72",
|
"rev": "de895be946ad1d8aafa0bb6dfc7e7e0e9e466a29",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -440,11 +440,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773003096,
|
"lastModified": 1773233796,
|
||||||
"narHash": "sha256-YVIoEualeMIrJ6eSFJE75iwyr8kE2/MTVCeKhAKBr/Q=",
|
"narHash": "sha256-hpAVcTx1xQ7BVf9Y54kFDmjkj3pupEN6miweNXNdTeU=",
|
||||||
"owner": "NuschtOS",
|
"owner": "NuschtOS",
|
||||||
"repo": "nixos-modules",
|
"repo": "nixos-modules",
|
||||||
"rev": "586abeb940735af053f498e14a6ce4ce008e9760",
|
"rev": "753e2d83eee3d259f9c7ab8cdc1933766d4761a5",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -502,11 +502,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772963539,
|
"lastModified": 1774386573,
|
||||||
"narHash": "sha256-9jVDGZnvCckTGdYT53d/EfznygLskyLQXYwJLKMPsZs=",
|
"narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9dcb002ca1690658be4a04645215baea8b95f31d",
|
"rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -552,11 +552,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772893680,
|
"lastModified": 1774104215,
|
||||||
"narHash": "sha256-JDqZMgxUTCq85ObSaFw0HhE+lvdOre1lx9iI6vYyOEs=",
|
"narHash": "sha256-EAtviqz0sEAxdHS4crqu7JGR5oI3BwaqG0mw7CmXkO8=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "git-hooks.nix",
|
"repo": "git-hooks.nix",
|
||||||
"rev": "8baab586afc9c9b57645a734c820e4ac0a604af9",
|
"rev": "f799ae951fde0627157f40aec28dec27b22076d0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -596,11 +596,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773198218,
|
"lastModified": 1774494762,
|
||||||
"narHash": "sha256-sxQV16GQrBEfrwuhYT9WvmFBnN8HakhRfR+JR+3qaTo=",
|
"narHash": "sha256-lt22GCJZ6qBQLgNZZl3S/RUjTLXTlEy0Fn0sqMttLxQ=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "e552b1d2850f5f0a739bba27c6463af1a29e2f4e",
|
"rev": "ce3b3a61ebf28670dfc8b97eb35ed9e24474a2cf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -616,11 +616,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1773096132,
|
"lastModified": 1774303811,
|
||||||
"narHash": "sha256-M3zEnq9OElB7zqc+mjgPlByPm1O5t2fbUrH3t/Hm5Ag=",
|
"narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "d1ff3b1034d5bab5d7d8086a7803c5a5968cd784",
|
"rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -650,11 +650,11 @@
|
|||||||
"tinted-zed": "tinted-zed"
|
"tinted-zed": "tinted-zed"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1772296853,
|
"lastModified": 1774124764,
|
||||||
"narHash": "sha256-pAtzPsgHRKw/2Kv8HgAjSJg450FDldHPWsP3AKG/Xj0=",
|
"narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=",
|
||||||
"owner": "danth",
|
"owner": "danth",
|
||||||
"repo": "stylix",
|
"repo": "stylix",
|
||||||
"rev": "c4b8e80a1020e09a1f081ad0f98ce804a6e85acf",
|
"rev": "e31c79f571c5595a155f84b9d77ce53a84745494",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -49,30 +49,5 @@
|
|||||||
# Enable containerd for Kubernetes
|
# Enable containerd for Kubernetes
|
||||||
virtualisation.containerd.enable = true;
|
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
|
|
||||||
#'';
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,6 +27,7 @@
|
|||||||
fd
|
fd
|
||||||
file
|
file
|
||||||
firefox
|
firefox
|
||||||
|
|
||||||
# gestures replacement
|
# gestures replacement
|
||||||
git
|
git
|
||||||
glances
|
glances
|
||||||
|
|||||||
@@ -26,11 +26,9 @@
|
|||||||
|
|
||||||
programs.git.lfs.enable = false;
|
programs.git.lfs.enable = false;
|
||||||
|
|
||||||
nixpkgs.config = {
|
nixpkgs.config.packageOverrides = pkgs: {
|
||||||
packageOverrides = pkgs: {
|
|
||||||
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
boot = {
|
boot = {
|
||||||
loader.grub.device = "/dev/sda";
|
loader.grub.device = "/dev/sda";
|
||||||
@@ -100,13 +98,6 @@
|
|||||||
smartd.enable = true;
|
smartd.enable = true;
|
||||||
calibre-server.enable = false;
|
calibre-server.enable = false;
|
||||||
|
|
||||||
# Kubernetes example configuration
|
|
||||||
# To enable Kubernetes, uncomment the following:
|
|
||||||
# kubernetes = {
|
|
||||||
# enable = true;
|
|
||||||
# clusterName = "palatine-hill-cluster";
|
|
||||||
# controlPlaneEndpoint = "localhost:6443";
|
|
||||||
# };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nix.gc.options = "--delete-older-than 150d";
|
nix.gc.options = "--delete-older-than 150d";
|
||||||
|
|||||||
@@ -15,27 +15,25 @@ in
|
|||||||
"deepseek-r1:1.5b"
|
"deepseek-r1:1.5b"
|
||||||
"deepseek-r1:32b"
|
"deepseek-r1:32b"
|
||||||
"deepseek-r1:70b"
|
"deepseek-r1:70b"
|
||||||
"qwen3"
|
#"qwen3"
|
||||||
#"qwen3-coder-next"
|
#"qwen3.5:latest"
|
||||||
"qwen3-coder-next"
|
"qwen3-coder-next"
|
||||||
"lennyerik/zeta"
|
"lennyerik/zeta"
|
||||||
"qwen2.5-coder:14b"
|
|
||||||
"qwen2.5-coder:32b"
|
|
||||||
"nomic-embed-text:latest"
|
"nomic-embed-text:latest"
|
||||||
"llama4:scout"
|
|
||||||
"mistral:7b"
|
|
||||||
"minimax-m2.7:cloud"
|
|
||||||
"lfm2:24b"
|
"lfm2:24b"
|
||||||
"glm-4.7-flash"
|
"glm-4.7-flash"
|
||||||
|
"nemotron-cascade-2:30b"
|
||||||
|
"magistral"
|
||||||
|
"devstral-small-2"
|
||||||
];
|
];
|
||||||
models = vars.primary_ollama;
|
models = vars.primary_ollama;
|
||||||
environmentVariables = {
|
environmentVariables = {
|
||||||
FLASH_ATTENTION = "1";
|
FLASH_ATTENTION = "1";
|
||||||
OLLAMA_KV_CACHE_TYPE = "q8_0";
|
OLLAMA_KV_CACHE_TYPE = "q8_0";
|
||||||
# Ollama memory configuration
|
# Ollama memory configuration
|
||||||
OLLAMA_MAX_LOADED_MODELS = "3";
|
OLLAMA_MAX_LOADED_MODELS = "2";
|
||||||
OLLAMA_MAX_QUEUE = "512";
|
OLLAMA_MAX_QUEUE = "512";
|
||||||
OLLAMA_NUM_PARALLEL = "3";
|
OLLAMA_NUM_PARALLEL = "1";
|
||||||
|
|
||||||
# ROCm memory optimization
|
# ROCm memory optimization
|
||||||
#HIP_VISIBLE_DEVICES = "0";
|
#HIP_VISIBLE_DEVICES = "0";
|
||||||
|
|||||||
@@ -63,8 +63,40 @@
|
|||||||
"latex"
|
"latex"
|
||||||
"terraform"
|
"terraform"
|
||||||
"log"
|
"log"
|
||||||
|
"context7-mcp-server"
|
||||||
|
"github-mcp-server"
|
||||||
];
|
];
|
||||||
userSettings = {
|
userSettings = {
|
||||||
|
context_servers = {
|
||||||
|
nixos = {
|
||||||
|
command = "nix";
|
||||||
|
args = [
|
||||||
|
"run"
|
||||||
|
"github:utensils/mcp-nixos"
|
||||||
|
"--"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
language_models = {
|
||||||
|
ollama = {
|
||||||
|
api_url = "http://192.168.76.2:11434";
|
||||||
|
context_window = 128000;
|
||||||
|
# global keep alive doesnt work
|
||||||
|
#keep_alive = "15m";
|
||||||
|
available_models = [
|
||||||
|
{
|
||||||
|
name = "glm-4.7-flash";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
name = "lfm2:24b";
|
||||||
|
max_tokens = 128000;
|
||||||
|
keep_alive = "15m";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
colorize_brackets = true;
|
colorize_brackets = true;
|
||||||
hard_tabs = false;
|
hard_tabs = false;
|
||||||
vim_mode = true;
|
vim_mode = true;
|
||||||
@@ -77,7 +109,7 @@
|
|||||||
agent = {
|
agent = {
|
||||||
default_model = {
|
default_model = {
|
||||||
provider = "ollama";
|
provider = "ollama";
|
||||||
model = "qwen2.5-coder:latest";
|
model = "glm-4.7-flash";
|
||||||
};
|
};
|
||||||
favorite_models = [ ];
|
favorite_models = [ ];
|
||||||
model_parameters = [ ];
|
model_parameters = [ ];
|
||||||
@@ -89,13 +121,16 @@
|
|||||||
journal = {
|
journal = {
|
||||||
hour_format = "hour24";
|
hour_format = "hour24";
|
||||||
};
|
};
|
||||||
edit_preditions = {
|
edit_predictions = {
|
||||||
provider = "open_ai_compatible_api";
|
provider = "ollama";
|
||||||
open_ai_compatible_api = {
|
ollama = {
|
||||||
api_url = "http://localhost:11434/v1/completions";
|
#api_url = "http://192.168.76.2:11434/v1/completions";
|
||||||
model = "zeta:latest";
|
api_url = "http://192.168.76.2:11434";
|
||||||
prompt_format = "infer";
|
context_window = 128000;
|
||||||
|
model = "lennyerik/zeta";
|
||||||
|
prompt_format = "qwen";
|
||||||
max_requests = 64;
|
max_requests = 64;
|
||||||
|
max_output_tokens = 256;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
texlab = {
|
texlab = {
|
||||||
@@ -144,6 +179,8 @@
|
|||||||
# markdown
|
# markdown
|
||||||
nodePackages.markdownlint-cli
|
nodePackages.markdownlint-cli
|
||||||
|
|
||||||
|
# insert essential rust dependencies
|
||||||
|
|
||||||
# doom emacs dependencies
|
# doom emacs dependencies
|
||||||
yaml-language-server
|
yaml-language-server
|
||||||
nodePackages.typescript-language-server
|
nodePackages.typescript-language-server
|
||||||
@@ -163,7 +200,7 @@
|
|||||||
languagetool
|
languagetool
|
||||||
|
|
||||||
# latex
|
# latex
|
||||||
texlive.combined.scheme-medium
|
texlive.combined.scheme-full
|
||||||
|
|
||||||
# dependencies for nix-dotfiles/hydra-check-action
|
# dependencies for nix-dotfiles/hydra-check-action
|
||||||
nodejs_20
|
nodejs_20
|
||||||
@@ -184,5 +221,6 @@
|
|||||||
|
|
||||||
# arch zed deps
|
# arch zed deps
|
||||||
nixd
|
nixd
|
||||||
|
uv
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user