Compare commits
3 Commits
4943b90476
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 8b5d4e241f | |||
|
|
7e24069870 | ||
|
|
9019ba84e3
|
36
flake.lock
generated
36
flake.lock
generated
@@ -139,11 +139,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768949235,
|
"lastModified": 1769580047,
|
||||||
"narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=",
|
"narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5",
|
"rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -174,11 +174,11 @@
|
|||||||
},
|
},
|
||||||
"nixUnstable": {
|
"nixUnstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769268028,
|
"lastModified": 1769740369,
|
||||||
"narHash": "sha256-mAdJpV0e5IGZjnE4f/8uf0E4hQR7ptRP00gnZKUOdMo=",
|
"narHash": "sha256-xKPyJoMoXfXpDM5DFDZDsi9PHArf2k5BJjvReYXoFpM=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ab9fbbcf4858bd6d40ba2bbec37ceb4ab6e1f562",
|
"rev": "6308c3b21396534d8aaeac46179c14c439a89b8a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -190,11 +190,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769089682,
|
"lastModified": 1769598131,
|
||||||
"narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
|
"narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "078d69f03934859a181e81ba987c2bb033eebfc5",
|
"rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -221,11 +221,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769018530,
|
"lastModified": 1769461804,
|
||||||
"narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
|
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
|
"rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -241,11 +241,11 @@
|
|||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769305798,
|
"lastModified": 1769814311,
|
||||||
"narHash": "sha256-oqohD2EQPaEiDZPnc97QahZcezictVMzJgeA/6AG1bo=",
|
"narHash": "sha256-3vHLVsCZFnEOFfWE17vY02vL+BRJnQdQzEdAdRUysuI=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "29210995e73bad5a2c1d82e1aeadfd245dba6095",
|
"rev": "900e70bc0a9b647b5c2f8e573c84a35fa3961630",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -274,11 +274,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768863606,
|
"lastModified": 1769469829,
|
||||||
"narHash": "sha256-1IHAeS8WtBiEo5XiyJBHOXMzECD6aaIOJmpQKzRRl64=",
|
"narHash": "sha256-wFcr32ZqspCxk4+FvIxIL0AZktRs6DuF8oOsLt59YBU=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "c7067be8db2c09ab1884de67ef6c4f693973f4a2",
|
"rev": "c5eebd4eb2e3372fe12a8d70a248a6ee9dd02eff",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -2,6 +2,6 @@
|
|||||||
imports = [ ./vscodium ];
|
imports = [ ./vscodium ];
|
||||||
|
|
||||||
config = lib.mkIf (config.syscfg.make.develop) {
|
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];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
ms-python.vscode-pylance
|
ms-python.vscode-pylance
|
||||||
ms-vscode.cpptools
|
ms-vscode.cpptools
|
||||||
dbaeumer.vscode-eslint
|
dbaeumer.vscode-eslint
|
||||||
|
continue.continue
|
||||||
];
|
];
|
||||||
#};
|
#};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ let
|
|||||||
includeEmulator = false;
|
includeEmulator = false;
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
|
|
||||||
|
imports = [ ./ollama ];
|
||||||
config = lib.mkIf (config.syscfg.make.develop) {
|
config = lib.mkIf (config.syscfg.make.develop) {
|
||||||
environment.systemPackages = with pkgs;
|
environment.systemPackages = with pkgs;
|
||||||
[
|
[
|
||||||
|
|||||||
16
modules/nixos/tools/develop/ollama/default.nix
Normal file
16
modules/nixos/tools/develop/ollama/default.nix
Normal 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 ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -16,9 +16,7 @@ pkgs.mkShell {
|
|||||||
yarn-berry
|
yarn-berry
|
||||||
crystal
|
crystal
|
||||||
shards
|
shards
|
||||||
virtualenv
|
|
||||||
(with python313Packages; [ pip pandas numpy matplotlib typer pillow reportlab python-barcode pypdf markdown requests ])
|
(with python313Packages; [ pip pandas numpy matplotlib typer pillow reportlab python-barcode pypdf markdown requests ])
|
||||||
pipenv
|
|
||||||
scala
|
scala
|
||||||
sbt
|
sbt
|
||||||
cargo
|
cargo
|
||||||
|
|||||||
Reference in New Issue
Block a user