Skip to content

Commit 077f651

Browse files
functorafunctora
committed
tabby -> ollama
1 parent 1eefc7e commit 077f651

File tree

10 files changed

+238
-182
lines changed

10 files changed

+238
-182
lines changed

‎nix/configuration.nix‎

Lines changed: 3 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ in {
285285
(import "${home-manager}/nixos")
286286
(import ./rigtora.nix)
287287
]
288-
++ (import ./tabby-services.nix)
289288
++ (
290289
if builtins.pathExists ./../prv/nix/configuration.nix
291290
then [(import ./../prv/nix/configuration.nix)]
@@ -753,27 +752,6 @@ in {
753752
fj.mkFirejailSimple "chromium"
754753
// mkOpenArena "rat"
755754
// import ./doom.nix
756-
// fj.mkFirejailCustom {
757-
pkg = "doom-infinite";
758-
dir = "doom";
759-
exe = ''
760-
${pkgs.gzdoom}/bin/gzdoom \
761-
-iwad ./freedoom-0.13.0/freedoom2.wad \
762-
-file ./DOOM_Infinite_DEMO_0978_6.pk3 \
763-
-file "./duhd/1 lights2.wad" "./duhd/8 DHTP Textures.pk3" "./duhd/9 JFO.wad" "./duhd/10 HD_SFX.wad" "./duhd/12 Flashlight++.pk3" "./duhd/13 Tilt++.pk3" "./duhd/14 brightmaps2.wad" "./duhd/16 d3snds.wad" "./duhd/17 brutaldoom_stuff.wad" "./duhd/19 SpriteShadow.wad" "./duhd/20 WorldGamma.wad" "./duhd/21 BloomBoost.wad" "./duhd/22 MotionBlur.pk3" "./duhd/23 hires_decals.wad" "./duhd/24 Terrains.wad" "./duhd/25 HD HUD.pk3" "./duhd/26 Liquids.pk3" "./duhd/27 marcelus_hd_sprites.pk3" "./duhd/29 Universal Rain and Snow v3.pk3" "./duhd/30 OST Remake.pk3" "./duhd/31 texture_lights.wad" "./duhd/0 Parallax PBR.pk3" \
764-
-file ./DoomBSMS.wad \
765-
-file ./mod.pk3 \
766-
-file ./UniversalGibs-master.zip \
767-
-file ./CodeFX.pk3 \
768-
-file ./CodeFXFire.pk3 \
769-
-file ./CodeFXBlood.pk3 \
770-
-file "./liquid/Liquid Texture Pack/(GZDoom) Liquid Texture Pack V4.0.pk3" \
771-
-file "./liquid/Liquid Texture Pack/LTP V4.0 Glowing Toxic Texture Addon.pk3" \
772-
-file "./liquid/LTP V4.0 Shader pack.pk3" \
773-
-file "./liquid/LTP V4.0 Sky shader addon.pk3" \
774-
-file ./SimpleSlots.1.1.pk7
775-
'';
776-
}
777755
// fj.mkFirejailCustom {
778756
pkg = "doom-mall";
779757
dir = "doom";
@@ -785,78 +763,14 @@ in {
785763
-file ./SimpleSlots.1.1.pk7
786764
'';
787765
}
788-
// fj.mkFirejailCustom {
789-
pkg = "tabby-download-embed";
790-
dir = "tabby-download";
791-
net = true;
792-
exe = ''
793-
${import ./tabby.nix}/bin/tabby \
794-
download --model Nomic-Embed-Text
795-
'';
796-
}
797-
// fj.mkFirejailCustom {
798-
pkg = "tabby-download-deepseek";
799-
dir = "tabby-download";
800-
net = true;
801-
#
802-
# NOTE : DeepSeekCoder-6.7B is out of memory on 4GB GPU.
803-
# Seems like only models up to 3B size are supported.
804-
#
805-
exe = ''
806-
${import ./tabby.nix}/bin/tabby \
807-
download --model DeepSeekCoder-1.3B
808-
'';
809-
}
810-
// fj.mkFirejailCustom {
811-
pkg = "tabby-download-gemma";
812-
dir = "tabby-download";
813-
net = true;
814-
exe = ''
815-
${import ./tabby.nix}/bin/tabby \
816-
download --model CodeGemma-2B
817-
'';
818-
}
819-
// fj.mkFirejailCustom {
820-
pkg = "tabby-download-instruct";
821-
dir = "tabby-download";
822-
net = true;
823-
exe = ''
824-
${import ./tabby.nix}/bin/tabby \
825-
download --model Qwen2.5-Coder-1.5B-Instruct
826-
'';
827-
}
828-
// fj.mkFirejailCustom {
829-
pkg = "tabby-agent";
830-
dir = "tabby";
831-
exe = "${
832-
import ./tabby-agent.nix {
833-
sock = "/home/${
834-
config.services.functora.userName
835-
}/.firejail/tabby/tabby.sock";
836-
}
837-
}/bin/tabby-agent";
838-
}
839-
// fj.mkFirejailCustom {
840-
pkg = "tabby-admin";
841-
dir = "tabby";
842-
exe = "${
843-
import ./tabby-admin.nix {sock = "./tabby.sock";}
844-
}/bin/tabby-admin";
766+
// fj.mkFirejailOffline {
767+
pkg = "vi";
768+
exe = "${vi}/bin/vi";
845769
}
846770
// fj.mkFirejailOffline {
847771
pkg = "piper";
848772
exe = "${import ./piper.nix}/bin/piper";
849773
}
850-
// fj.mkFirejailOffline {
851-
pkg = "vi";
852-
exe = "${
853-
import ./vi-socat.nix {
854-
sock = "/home/${
855-
config.services.functora.userName
856-
}/.firejail/tabby/tabby.sock";
857-
}
858-
}/bin/vi";
859-
}
860774
// fj.mkFirejailOffline {
861775
pkg = "hoogle-w3m";
862776
exe = "${import ./hoogle-w3m.nix}/bin/hoogle-w3m";
@@ -1253,8 +1167,5 @@ in {
12531167
# AI
12541168
#
12551169
services.ollama.enable = true;
1256-
services.ollama.acceleration = "rocm";
1257-
# services.tabby-server.enable = true;
1258-
# services.tabby-socket.enable = true;
12591170
};
12601171
}

‎nix/doom.nix‎

Lines changed: 55 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
let
2+
olds = import ./oldpkgs.nix;
23
pkgs = import ./nixpkgs.nix;
34
unst = import ./nixpkgs-unstable.nix;
45
fj = import ./firejail.nix;
6+
duhd = ../bak/doom/duhd;
57
in
68
pkgs.lib.optionalAttrs (builtins.pathExists ../bak/doom)
79
(
8-
fj.mkFirejailCustom rec {
10+
fj.mkFirejailCustom {
911
pkg = "doom-64";
1012
dir = "doom";
1113
exe = ''
@@ -18,12 +20,19 @@ in
1820
-file ${../bak/doom/SimpleSlots.1.1.pk7}
1921
'';
2022
}
21-
// fj.mkFirejailCustom rec {
23+
// fj.mkFirejailCustom {
2224
pkg = "doom-ashes1";
2325
dir = "doom";
2426
exe = ''
2527
${unst.gzdoom}/bin/gzdoom \
2628
-iwad ${../bak/doom/freedoom-0.13.0/freedoom2.wad} \
29+
-file ${../bak/doom/CodeFX.pk3} \
30+
-file ${../bak/doom/CodeFXFire.pk3} \
31+
-file ${../bak/doom/CodeFXBlood.pk3} \
32+
-file "${../bak/doom/liquid}/Liquid Texture Pack/(GZDoom) Liquid Texture Pack V4.0.pk3" \
33+
-file "${../bak/doom/liquid}/Glowing Toxic Texture Pack/LTP V4.0 Glowing Toxic Texture Addon.pk3" \
34+
-file "${../bak/doom/liquid}/Shader Pack/LTP V4.0 Shader pack.pk3" \
35+
-file "${../bak/doom/liquid}/Shader Pack/LTP V4.0 Sky shader addon.pk3" \
2736
-file ${../bak/doom/AshesStandalone_V1_51/Resources/AshesSAMenu.pk3} \
2837
-file ${../bak/doom/AshesStandalone_V1_51/Resources/lightmodepatch.pk3} \
2938
-file ${../bak/doom/AshesStandalone_V1_51/Resources/Ashes2063Enriched2_23.pk3} \
@@ -35,8 +44,50 @@ in
3544
-file ${../bak/doom/ashes-wpn-tracers.pk3} \
3645
-file ${../bak/doom/relite_0.7.3b.pk3} \
3746
-file ${../bak/doom/nashgore.pk3} \
38-
-file ${../bak/doom/MaterialsNashgoreNext.pk3} \
39-
-file ${../bak/doom/purple.pk3} \
47+
-file ${../bak/doom/cblood.pk3} \
48+
-file ${../bak/doom/SimpleSlots.1.1.pk7}
49+
'';
50+
}
51+
// fj.mkFirejailCustom {
52+
pkg = "doom-free2";
53+
dir = "doom";
54+
exe = ''
55+
${unst.gzdoom}/bin/gzdoom \
56+
-iwad ${../bak/doom/freedoom-0.13.0/freedoom2.wad} \
57+
-file ${../bak/doom/DoomBSMS.wad} \
58+
-file "${duhd}/1 lights2.wad" "${duhd}/8 DHTP Textures.pk3" "${duhd}/9 JFO.wad" "${duhd}/10 HD_SFX.wad" "${duhd}/12 Flashlight++.pk3" "${duhd}/14 brightmaps2.wad" "${duhd}/16 d3snds.wad" "${duhd}/20 WorldGamma.wad" "${duhd}/21 BloomBoost.wad" "${duhd}/23 hires_decals.wad" "${duhd}/24 Terrains.wad" "${duhd}/25 HD HUD.pk3" "${duhd}/26 Liquids.pk3" "${duhd}/27 marcelus_hd_sprites.pk3" "${duhd}/29 Universal Rain and Snow v3.pk3" "${duhd}/30 OST Remake.pk3" "${duhd}/31 texture_lights.wad" "${duhd}/0 Parallax PBR.pk3" \
59+
-file ${../bak/doom/CodeFX.pk3} \
60+
-file ${../bak/doom/CodeFXFire.pk3} \
61+
-file ${../bak/doom/CodeFXBlood.pk3} \
62+
-file "${../bak/doom/liquid}/Liquid Texture Pack/(GZDoom) Liquid Texture Pack V4.0.pk3" \
63+
-file "${../bak/doom/liquid}/Glowing Toxic Texture Pack/LTP V4.0 Glowing Toxic Texture Addon.pk3" \
64+
-file "${../bak/doom/liquid}/Shader Pack/LTP V4.0 Shader pack.pk3" \
65+
-file "${../bak/doom/liquid}/Shader Pack/LTP V4.0 Sky shader addon.pk3" \
66+
-file ${../bak/doom/Project_Brutality-PB_Staging.zip} \
67+
-file ${../bak/doom/relite_0.7.3b.pk3} \
68+
-file ${../bak/doom/cblood.pk3} \
69+
-file ${../bak/doom/SimpleSlots.1.1.pk7}
70+
'';
71+
}
72+
// fj.mkFirejailCustom {
73+
pkg = "doom-infinite";
74+
dir = "doom";
75+
exe = ''
76+
${olds.gzdoom}/bin/gzdoom \
77+
-iwad ${../bak/doom/freedoom-0.13.0/freedoom2.wad} \
78+
-file ${../bak/doom/DOOM_Infinite_DEMO_0978_6.pk3} \
79+
-file "${duhd}/1 lights2.wad" "${duhd}/8 DHTP Textures.pk3" "${duhd}/9 JFO.wad" "${duhd}/10 HD_SFX.wad" "${duhd}/12 Flashlight++.pk3" "${duhd}/13 Tilt++.pk3" "${duhd}/14 brightmaps2.wad" "${duhd}/16 d3snds.wad" "${duhd}/17 brutaldoom_stuff.wad" "${duhd}/19 SpriteShadow.wad" "${duhd}/20 WorldGamma.wad" "${duhd}/21 BloomBoost.wad" "${duhd}/22 MotionBlur.pk3" "${duhd}/23 hires_decals.wad" "${duhd}/24 Terrains.wad" "${duhd}/25 HD HUD.pk3" "${duhd}/26 Liquids.pk3" "${duhd}/27 marcelus_hd_sprites.pk3" "${duhd}/29 Universal Rain and Snow v3.pk3" "${duhd}/30 OST Remake.pk3" "${duhd}/31 texture_lights.wad" "${duhd}/0 Parallax PBR.pk3" \
80+
-file ${../bak/doom/DoomBSMS.wad} \
81+
-file ${../bak/doom/DoomInfiniteWeaponsSkins.pk3} \
82+
-file ${../bak/doom/CodeFX.pk3} \
83+
-file ${../bak/doom/CodeFXFire.pk3} \
84+
-file ${../bak/doom/CodeFXBlood.pk3} \
85+
-file "${../bak/doom/liquid}/Liquid Texture Pack/(GZDoom) Liquid Texture Pack V4.0.pk3" \
86+
-file "${../bak/doom/liquid}/Glowing Toxic Texture Pack/LTP V4.0 Glowing Toxic Texture Addon.pk3" \
87+
-file "${../bak/doom/liquid}/Shader Pack/LTP V4.0 Shader pack.pk3" \
88+
-file "${../bak/doom/liquid}/Shader Pack/LTP V4.0 Sky shader addon.pk3" \
89+
-file ${../bak/doom/nashgore.pk3} \
90+
-file ${../bak/doom/dblood.pk3} \
4091
-file ${../bak/doom/SimpleSlots.1.1.pk7}
4192
'';
4293
}

‎nix/firejail.nix‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@ in rec {
1515
grp ? null,
1616
cfg ? "",
1717
profile ? mkFirejailProfile {inherit pkg dir net grp cfg;},
18+
extraArgs ? [],
1819
exe,
1920
}: {
2021
"${pkg}" = {
2122
executable = exe;
22-
inherit profile;
23+
inherit profile extraArgs;
2324
};
2425
};
2526
mkFirejailOffline = {
@@ -29,8 +30,8 @@ in rec {
2930
mkFirejailCustom {
3031
inherit pkg exe;
3132
profile = pkgs.writeText "${pkg}.local" ''
32-
no3d
33-
nosound
33+
# no3d
34+
# nosound
3435
apparmor
3536
caps.drop all
3637
machine-id

‎nix/oldpkgs.nix‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import (fetchTarball {
2+
url = "https://github.com/NixOS/nixpkgs/archive/2abc9cbb40cad0e88dbbb7936ba21e6c2712b7fc.tar.gz";
3+
sha256 = "12dzcryf0vqmnxyh7mp4p8c7lgk2hb25d5c30abglmdz0bkl2zhw";
4+
}) {}

‎nix/sources.json‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
{
2-
"haskellNix": {
3-
"branch": "master",
4-
"description": "Alternative Haskell Infrastructure for Nixpkgs",
5-
"homepage": "https://input-output-hk.github.io/haskell.nix",
6-
"owner": "input-output-hk",
7-
"repo": "haskell.nix",
8-
"rev": "cdcce3719c3f47402e9e447961ca66e063d65ea7",
9-
"sha256": "17s05c7yxa8ww2rbr2bf0v5pyzirsghx73lm7cml3jabs8y2k4bm",
10-
"type": "tarball",
11-
"url": "https://github.com/input-output-hk/haskell.nix/archive/cdcce3719c3f47402e9e447961ca66e063d65ea7.tar.gz",
12-
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
13-
},
14-
"newpkgs": {
15-
"branch": "release-24.11",
16-
"description": "Nix Packages collection",
17-
"homepage": "",
18-
"owner": "NixOS",
19-
"repo": "nixpkgs",
20-
"rev": "21a2e1ea4388d7f775c304697cee826eb69060c5",
21-
"sha256": "1x52f7a1izy2697d5bcm62rysl0cs7scdzkg0fzqxpldjzlnffj0",
22-
"type": "tarball",
23-
"url": "https://github.com/NixOS/nixpkgs/archive/21a2e1ea4388d7f775c304697cee826eb69060c5.tar.gz",
24-
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
25-
},
26-
"nixpkgs": {
27-
"branch": "release-24.11",
28-
"description": "Nix Packages collection",
29-
"homepage": "",
30-
"owner": "NixOS",
31-
"repo": "nixpkgs",
32-
"rev": "21a2e1ea4388d7f775c304697cee826eb69060c5",
33-
"sha256": "1x52f7a1izy2697d5bcm62rysl0cs7scdzkg0fzqxpldjzlnffj0",
34-
"type": "tarball",
35-
"url": "https://github.com/NixOS/nixpkgs/archive/21a2e1ea4388d7f775c304697cee826eb69060c5.tar.gz",
36-
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
37-
},
38-
"nixpkgs-unstable": {
39-
"branch": "nixpkgs-unstable",
40-
"description": "Nix Packages collection",
41-
"homepage": "",
42-
"owner": "NixOS",
43-
"repo": "nixpkgs",
44-
"rev": "8c441601c43232976179eac52dde704c8bdf81ed",
45-
"sha256": "16r7z12kmznnbw7w1fq39f3n0g8a6mqnny2y73m7qivjxilfcqxb",
46-
"type": "tarball",
47-
"url": "https://github.com/NixOS/nixpkgs/archive/8c441601c43232976179eac52dde704c8bdf81ed.tar.gz",
48-
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
49-
}
2+
"haskellNix": {
3+
"branch": "master",
4+
"description": "Alternative Haskell Infrastructure for Nixpkgs",
5+
"homepage": "https://input-output-hk.github.io/haskell.nix",
6+
"owner": "input-output-hk",
7+
"repo": "haskell.nix",
8+
"rev": "cdcce3719c3f47402e9e447961ca66e063d65ea7",
9+
"sha256": "17s05c7yxa8ww2rbr2bf0v5pyzirsghx73lm7cml3jabs8y2k4bm",
10+
"type": "tarball",
11+
"url": "https://github.com/input-output-hk/haskell.nix/archive/cdcce3719c3f47402e9e447961ca66e063d65ea7.tar.gz",
12+
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
13+
},
14+
"newpkgs": {
15+
"branch": "release-24.11",
16+
"description": "Nix Packages collection",
17+
"homepage": "",
18+
"owner": "NixOS",
19+
"repo": "nixpkgs",
20+
"rev": "21a2e1ea4388d7f775c304697cee826eb69060c5",
21+
"sha256": "1x52f7a1izy2697d5bcm62rysl0cs7scdzkg0fzqxpldjzlnffj0",
22+
"type": "tarball",
23+
"url": "https://github.com/NixOS/nixpkgs/archive/21a2e1ea4388d7f775c304697cee826eb69060c5.tar.gz",
24+
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
25+
},
26+
"nixpkgs": {
27+
"branch": "release-24.11",
28+
"description": "Nix Packages collection",
29+
"homepage": "",
30+
"owner": "NixOS",
31+
"repo": "nixpkgs",
32+
"rev": "21a2e1ea4388d7f775c304697cee826eb69060c5",
33+
"sha256": "1x52f7a1izy2697d5bcm62rysl0cs7scdzkg0fzqxpldjzlnffj0",
34+
"type": "tarball",
35+
"url": "https://github.com/NixOS/nixpkgs/archive/21a2e1ea4388d7f775c304697cee826eb69060c5.tar.gz",
36+
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
37+
},
38+
"nixpkgs-unstable": {
39+
"branch": "nixpkgs-unstable",
40+
"description": "Nix Packages collection",
41+
"homepage": "",
42+
"owner": "NixOS",
43+
"repo": "nixpkgs",
44+
"rev": "8c441601c43232976179eac52dde704c8bdf81ed",
45+
"sha256": "16r7z12kmznnbw7w1fq39f3n0g8a6mqnny2y73m7qivjxilfcqxb",
46+
"type": "tarball",
47+
"url": "https://github.com/NixOS/nixpkgs/archive/8c441601c43232976179eac52dde704c8bdf81ed.tar.gz",
48+
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
49+
}
5050
}

‎pub/cblood/mapinfo.lmp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
GameInfo
22
{
3-
AddEventHandlers = "CBloodHandler"
3+
AddEventHandlers = "CDBloodHandler"
44
}

0 commit comments

Comments
 (0)