Compare commits
11 Commits
db93fb0ad2
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9019ba84e3
|
||
| 4943b90476 | |||
|
|
05d276e392 | ||
| 5a4b2e815f | |||
|
|
c53da55394 | ||
|
|
ca8283f5a2
|
||
|
|
dfa84137be
|
||
|
|
ffd6bf94cc
|
||
|
|
29b2cbb011
|
||
| 1fb8aa1dcc | |||
|
|
341e743b1e |
48
flake.lock
generated
48
flake.lock
generated
@@ -45,11 +45,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1768561867,
|
||||
"narHash": "sha256-prGOZ+w3pZfGTRxworKcJliCNsewF0L4HUPjgU/6eaw=",
|
||||
"lastModified": 1768764703,
|
||||
"narHash": "sha256-5ulSDyOG1U+1sJhkJHYsUOWEsmtLl97O0NTVMvgIVyc=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "8b720b9662d4dd19048664b7e4216ce530591adc",
|
||||
"rev": "0fc4e7ac670a0ed874abacf73c4b072a6a58064b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -103,11 +103,11 @@
|
||||
},
|
||||
"hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1768584846,
|
||||
"narHash": "sha256-IRPmIOV2tPwxbhP/I9M5AmwhTC0lMPtoPStC+8T6xl0=",
|
||||
"lastModified": 1769302137,
|
||||
"narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "cce68f4a54fa4e3d633358364477f5cc1d782440",
|
||||
"rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -139,11 +139,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1768603898,
|
||||
"narHash": "sha256-vRV1dWJOCpCal3PRr86wE2WTOMfAhTu6G7bSvOsryUo=",
|
||||
"lastModified": 1768949235,
|
||||
"narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "2a63d0e9d2c72ac4d4150ebb242cf8d86f488c8c",
|
||||
"rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -174,11 +174,11 @@
|
||||
},
|
||||
"nixUnstable": {
|
||||
"locked": {
|
||||
"lastModified": 1768456270,
|
||||
"narHash": "sha256-NgaL2CCiUR6nsqUIY4yxkzz07iQUlUCany44CFv+OxY=",
|
||||
"lastModified": 1769268028,
|
||||
"narHash": "sha256-mAdJpV0e5IGZjnE4f/8uf0E4hQR7ptRP00gnZKUOdMo=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f4606b01b39e09065df37905a2133905246db9ed",
|
||||
"rev": "ab9fbbcf4858bd6d40ba2bbec37ceb4ab6e1f562",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -190,11 +190,11 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1768323494,
|
||||
"narHash": "sha256-yBXJLE6WCtrGo7LKiB6NOt6nisBEEkguC/lq/rP3zRQ=",
|
||||
"lastModified": 1769089682,
|
||||
"narHash": "sha256-9yA/LIuAVQq0lXelrZPjLuLVuZdm03p8tfmHhnDIkms=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "2c3e5ec5df46d3aeee2a1da0bfedd74e21f4bf3a",
|
||||
"rev": "078d69f03934859a181e81ba987c2bb033eebfc5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -221,11 +221,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1768564909,
|
||||
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
|
||||
"lastModified": 1769018530,
|
||||
"narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
|
||||
"rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -241,11 +241,11 @@
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1768614713,
|
||||
"narHash": "sha256-K+kAIZd9d3yPX7qxK8UL+43XeH6Uf4S3pLltpnUhzIA=",
|
||||
"lastModified": 1769305798,
|
||||
"narHash": "sha256-oqohD2EQPaEiDZPnc97QahZcezictVMzJgeA/6AG1bo=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nur",
|
||||
"rev": "8a51ee0772da572b130fec7c014ecf06bfa4de0c",
|
||||
"rev": "29210995e73bad5a2c1d82e1aeadfd245dba6095",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -274,11 +274,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1768481291,
|
||||
"narHash": "sha256-NjKtkJraCZEnLHAJxLTI+BfdU//9coAz9p5TqveZwPU=",
|
||||
"lastModified": 1768863606,
|
||||
"narHash": "sha256-1IHAeS8WtBiEo5XiyJBHOXMzECD6aaIOJmpQKzRRl64=",
|
||||
"owner": "Mic92",
|
||||
"repo": "sops-nix",
|
||||
"rev": "e085e303dfcce21adcb5fec535d65aacb066f101",
|
||||
"rev": "c7067be8db2c09ab1884de67ef6c4f693973f4a2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -9,6 +9,8 @@ in {
|
||||
"sudo" = "sudo ";
|
||||
"devsh" =
|
||||
"nix develop --profile /tmp/devsh-env ${nixflake_url}#devsh -c zsh";
|
||||
"cdevsh" =
|
||||
"nix develop --profile /tmp/devsh-env -c zsh";
|
||||
"nixb" = "(sudo nixos-rebuild switch --flake ${nixflake_url})";
|
||||
"nixgc" = "sudo nix-collect-garbage -d && nix-collect-garbage -d";
|
||||
"ssh" = "TERM=xterm-256color ${pkgs.openssh}/bin/ssh";
|
||||
|
||||
@@ -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];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
ms-python.vscode-pylance
|
||||
ms-vscode.cpptools
|
||||
dbaeumer.vscode-eslint
|
||||
continue.continue
|
||||
];
|
||||
#};
|
||||
};
|
||||
|
||||
@@ -6,6 +6,8 @@ let
|
||||
includeEmulator = false;
|
||||
};
|
||||
in {
|
||||
|
||||
imports = [ ./ollama ];
|
||||
config = lib.mkIf (config.syscfg.make.develop) {
|
||||
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,10 +16,7 @@ pkgs.mkShell {
|
||||
yarn-berry
|
||||
crystal
|
||||
shards
|
||||
python311Full
|
||||
virtualenv
|
||||
(with python311Packages; [ pip ])
|
||||
pipenv
|
||||
(with python313Packages; [ pip pandas numpy matplotlib typer pillow reportlab python-barcode pypdf markdown requests ])
|
||||
scala
|
||||
sbt
|
||||
cargo
|
||||
|
||||
Reference in New Issue
Block a user