Compare commits

...

3 Commits

Author SHA1 Message Date
soraefir
9019ba84e3 Ollama 2026-01-27 23:41:15 +01:00
bot
4943b90476 Merge pull request 'Lock file maintenance' (#241) from renovate/lock-file-maintenance into main 2026-01-25 03:04:14 +01:00
Renovate Bot
05d276e392 Lock file maintenance 2026-01-25 02:04:04 +00:00
6 changed files with 29 additions and 12 deletions

18
flake.lock generated
View File

@@ -103,11 +103,11 @@
},
"hardware": {
"locked": {
"lastModified": 1769086393,
"narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=",
"lastModified": 1769302137,
"narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca",
"rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
"type": "github"
},
"original": {
@@ -174,11 +174,11 @@
},
"nixUnstable": {
"locked": {
"lastModified": 1769092226,
"narHash": "sha256-6h5sROT/3CTHvzPy9koKBmoCa2eJKh4fzQK8eYFEgl8=",
"lastModified": 1769268028,
"narHash": "sha256-mAdJpV0e5IGZjnE4f/8uf0E4hQR7ptRP00gnZKUOdMo=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "b579d443b37c9c5373044201ea77604e37e748c8",
"rev": "ab9fbbcf4858bd6d40ba2bbec37ceb4ab6e1f562",
"type": "github"
},
"original": {
@@ -241,11 +241,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1769219637,
"narHash": "sha256-DqkMrjJ2gAQMSbNnPWkGTCqSroEy8jlKQibxJuo+yn4=",
"lastModified": 1769305798,
"narHash": "sha256-oqohD2EQPaEiDZPnc97QahZcezictVMzJgeA/6AG1bo=",
"owner": "nix-community",
"repo": "nur",
"rev": "8f5107ca3fadba7a254cdf68ddb6a19e122c3cdb",
"rev": "29210995e73bad5a2c1d82e1aeadfd245dba6095",
"type": "github"
},
"original": {

View File

@@ -2,6 +2,6 @@
imports = [ ./vscodium ];
config = lib.mkIf (config.syscfg.make.develop) {
home.packages = with pkgs; [ blender godot_4 openscad-unstable bambu-studio pandoc];
home.packages = with pkgs; [ blender godot_4 openscad-unstable orca-slicer pandoc];
};
}

View File

@@ -12,6 +12,7 @@
ms-python.vscode-pylance
ms-vscode.cpptools
dbaeumer.vscode-eslint
continue.continue
];
#};
};

View File

@@ -6,6 +6,8 @@ let
includeEmulator = false;
};
in {
imports = [ ./ollama ];
config = lib.mkIf (config.syscfg.make.develop) {
environment.systemPackages = with pkgs;
[

View File

@@ -0,0 +1,16 @@
{ lib, config, pkgs, ... }:
let
ollamaPkg = pkgs.ollama-rocm;
in{
config = lib.mkIf (config.syscfg.make.develop) {
services.ollama = {
enable = true;
package = ollamaPkg;
acceleration = "rocm";
loadModels = [ "deepseek-v2:lite" "qwen2.5-coder:7b" "qwen2.5-coder:1.5b" ];
syncModels = true;
};
environment.systemPackages = with pkgs; [ ollamaPkg ];
};
}

View File

@@ -16,9 +16,7 @@ pkgs.mkShell {
yarn-berry
crystal
shards
virtualenv
(with python313Packages; [ pip pandas numpy matplotlib typer pillow reportlab python-barcode pypdf markdown requests ])
pipenv
scala
sbt
cargo