finally ollama works on the fwdesk
This commit is contained in:
1 parent
720f60a04c
commit
20d22067c9
7 files changed
+35
-25
No files matched your search
@@ -69,7 +69,7 @@ def "main remote" [cmd:string, target:string = ""] {
|
|||||||
return $valid_cmds
|
return $valid_cmds
|
||||||
}
|
}
|
||||||
$"($cmd) on ($target_host) with ($profile)" | print
|
$"($cmd) on ($target_host) with ($profile)" | print
|
||||||
mut runcmd = $"nixos-rebuild --target-host ($target_host) --use-remote-sudo ($cmd) --flake .#($profile)"
|
mut runcmd = $"nixos-rebuild --target-host ($target_host) --sudo ($cmd) --flake .#($profile)"
|
||||||
$runcmd | print
|
$runcmd | print
|
||||||
bash -c $runcmd
|
bash -c $runcmd
|
||||||
}
|
}
|
||||||
@@ -2,14 +2,14 @@ layout {
|
|||||||
background-color "transparent"
|
background-color "transparent"
|
||||||
|
|
||||||
focus-ring {
|
focus-ring {
|
||||||
active-color "#42a5f5"
|
active-color "#f9e2af"
|
||||||
inactive-color "#8c9199"
|
inactive-color "#6c7086"
|
||||||
urgent-color "#f2b8b5"
|
urgent-color "#f2b8b5"
|
||||||
}
|
}
|
||||||
|
|
||||||
border {
|
border {
|
||||||
active-color "#42a5f5"
|
active-color "#f9e2af"
|
||||||
inactive-color "#8c9199"
|
inactive-color "#6c7086"
|
||||||
urgent-color "#f2b8b5"
|
urgent-color "#f2b8b5"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -18,19 +18,19 @@ layout {
|
|||||||
}
|
}
|
||||||
|
|
||||||
tab-indicator {
|
tab-indicator {
|
||||||
active-color "#42a5f5"
|
active-color "#f9e2af"
|
||||||
inactive-color "#8c9199"
|
inactive-color "#6c7086"
|
||||||
urgent-color "#f2b8b5"
|
urgent-color "#f2b8b5"
|
||||||
}
|
}
|
||||||
|
|
||||||
insert-hint {
|
insert-hint {
|
||||||
color "#42a5f580"
|
color "#f9e2af80"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
recent-windows {
|
recent-windows {
|
||||||
highlight {
|
highlight {
|
||||||
active-color "#0d47a1"
|
active-color "#6e5a2f"
|
||||||
urgent-color "#f2b8b5"
|
urgent-color "#f2b8b5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Generated
+3
-3
@@ -654,11 +654,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1764440730,
|
"lastModified": 1767185284,
|
||||||
"narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
|
"narHash": "sha256-ljDBUDpD1Cg5n3mJI81Hz5qeZAwCGxon4kQW3Ho3+6Q=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
|
"rev": "40b1a28dce561bea34858287fbb23052c3ee63fe",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
+1
-1
@@ -260,7 +260,7 @@ in
|
|||||||
port = 11434;
|
port = 11434;
|
||||||
acceleration = "rocm";
|
acceleration = "rocm";
|
||||||
rocmOverrideGfx = "11.0.2";
|
rocmOverrideGfx = "11.0.2";
|
||||||
package = unstablePkgs.ollama-rocm;
|
# package = unstablePkgs.ollama-rocm;
|
||||||
};
|
};
|
||||||
# # Brother Printer
|
# # Brother Printer
|
||||||
hardware.sane.brscan5.enable = true;
|
hardware.sane.brscan5.enable = true;
|
||||||
|
|||||||
@@ -13,7 +13,6 @@
|
|||||||
boot.initrd.kernelModules = [ ];
|
boot.initrd.kernelModules = [ ];
|
||||||
boot.kernelModules = [ "kvm-amd" ];
|
boot.kernelModules = [ "kvm-amd" ];
|
||||||
boot.extraModulePackages = [ ];
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
fileSystems."/" =
|
fileSystems."/" =
|
||||||
{
|
{
|
||||||
device = "/dev/disk/by-uuid/e903eb56-160d-4b77-ba66-ef54a18207f2";
|
device = "/dev/disk/by-uuid/e903eb56-160d-4b77-ba66-ef54a18207f2";
|
||||||
|
|||||||
+21
-11
@@ -1,5 +1,6 @@
|
|||||||
{ pkgs
|
{ pkgs
|
||||||
, unstablePkgs
|
, unstablePkgs
|
||||||
|
, lib
|
||||||
, ...
|
, ...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
@@ -71,8 +72,7 @@ in
|
|||||||
environment.systemPackages =
|
environment.systemPackages =
|
||||||
(with pkgs; [
|
(with pkgs; [
|
||||||
# languages
|
# languages
|
||||||
python313
|
# cargo
|
||||||
cargo
|
|
||||||
rustc
|
rustc
|
||||||
go
|
go
|
||||||
pipx
|
pipx
|
||||||
@@ -84,6 +84,11 @@ in
|
|||||||
|
|
||||||
# Steam
|
# Steam
|
||||||
mangohud
|
mangohud
|
||||||
|
|
||||||
|
# LLM Stuff
|
||||||
|
ollama-rocm
|
||||||
|
# stable-diffusion-cpp-rocm
|
||||||
|
lmstudio
|
||||||
]);
|
]);
|
||||||
services.usbmuxd.enable = true;
|
services.usbmuxd.enable = true;
|
||||||
# Steam
|
# Steam
|
||||||
@@ -105,20 +110,25 @@ in
|
|||||||
hardware.xone.enable = true; # support for the xbox controller USB dongle
|
hardware.xone.enable = true; # support for the xbox controller USB dongle
|
||||||
# Ollama
|
# Ollama
|
||||||
services.open-webui.enable = true;
|
services.open-webui.enable = true;
|
||||||
|
users.users.ollama = {
|
||||||
|
enable = true;
|
||||||
|
home = "/var/lib/ollama";
|
||||||
|
extraGroups = [
|
||||||
|
"render"
|
||||||
|
"video"
|
||||||
|
];
|
||||||
|
};
|
||||||
services.ollama = {
|
services.ollama = {
|
||||||
enable = true;
|
enable = true;
|
||||||
host = "0.0.0.0";
|
host = "0.0.0.0";
|
||||||
port = ports.ollama;
|
port = ports.ollama;
|
||||||
acceleration = "rocm";
|
acceleration = "vulkan";
|
||||||
package = unstablePkgs.ollama-rocm;
|
user = "ollama";
|
||||||
};
|
home = "/var/lib/ollama";
|
||||||
# Tabby
|
rocmOverrideGfx = "gfx1151";
|
||||||
services.tabby = {
|
|
||||||
enable = true;
|
|
||||||
acceleration = "rocm";
|
|
||||||
host = "0.0.0.0";
|
|
||||||
port = ports.tabby;
|
|
||||||
};
|
};
|
||||||
|
hardware.graphics.enable = true;
|
||||||
|
hardware.amdgpu.opencl.enable = true;
|
||||||
environment.localBinInPath = true;
|
environment.localBinInPath = true;
|
||||||
programs.nh = {
|
programs.nh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ in
|
|||||||
# };
|
# };
|
||||||
environment.systemPackages = (with pkgs; [
|
environment.systemPackages = (with pkgs; [
|
||||||
rocmPackages.rocm-smi
|
rocmPackages.rocm-smi
|
||||||
|
rocmPackages.rocminfo
|
||||||
rocmPackages.rpp
|
rocmPackages.rpp
|
||||||
rocmPackages.rocm-core
|
rocmPackages.rocm-core
|
||||||
rocmPackages.rocm-runtime
|
rocmPackages.rocm-runtime
|
||||||
|
|||||||
Reference in new issue
Block a user