Skip to content

Commit d71dd09

Browse files
committed
wip
1 parent a1c7780 commit d71dd09

File tree

3 files changed

+7
-50
lines changed

3 files changed

+7
-50
lines changed

nix/configuration.nix

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,8 +1119,11 @@ in {
11191119
#
11201120
# AI
11211121
#
1122-
services.ollama.enable = true;
1123-
services.ollama.package = unst.ollama;
1122+
services.llama-cpp.enable = true;
1123+
services.llama-cpp.port = 11434;
1124+
services.llama-cpp.package = pkgs.llama-cpp.override {vulkanSupport = true;};
1125+
services.llama-cpp.model =
1126+
../../Downloads/microsoft_Phi-4-reasoning-plus-Q5_K_M.gguf;
11241127
#
11251128
# Fonts
11261129
#

nix/doom.nix

Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ in
5656
pkg = "doom-infinite";
5757
dir = pkg;
5858
exe = ''
59-
${olds.gzdoom}/bin/gzdoom \
59+
${unst.gzdoom}/bin/gzdoom \
6060
-iwad ${../bak/doom/freedoom-0.13.0/freedoom2.wad} \
61-
-file ${../bak/doom/DOOM_Infinite_DEMO_0978_6.pk3} \
61+
-file ${../bak/doom/DOOM_Infinite_098_PP2_H2.pk3} \
6262
-file ${../bak/doom/DMSF_ALX-R3.WAD} \
6363
-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}/31 texture_lights.wad" "${duhd}/0 Parallax PBR.pk3" \
6464
-file ${../bak/doom/HD_Map_Enhancements.wad} \
@@ -77,42 +77,4 @@ in
7777
-file ${../bak/doom/SimpleSlots.1.1.pk7}
7878
'';
7979
}
80-
// fj.mkFirejailCustom rec {
81-
pkg = "doom-furdoom";
82-
dir = pkg;
83-
exe = ''
84-
${vkdm}/bin/vkdoom \
85-
-iwad ${../bak/doom/freedoom-0.13.0/freedoom2.wad} \
86-
-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" \
87-
-file ${../bak/doom/HD_Map_Enhancements.wad} \
88-
-file ${../bak/doom/FURDoom_BETAv0.1.pk3} \
89-
-file "${../bak/doom/liquid}/Liquid Texture Pack/(GZDoom) Liquid Texture Pack V4.0.pk3" \
90-
-file "${../bak/doom/liquid}/Glowing Toxic Texture Pack/LTP V4.0 Glowing Toxic Texture Addon.pk3" \
91-
-file "${../bak/doom/liquid}/Shader Pack/LTP V4.0 Shader pack.pk3" \
92-
-file "${../bak/doom/liquid}/Shader Pack/LTP V4.0 Sky shader addon.pk3" \
93-
-file ${../bak/doom/nashgore.pk3} \
94-
-file ${../bak/doom/dblood.pk3} \
95-
-file ${../bak/doom/relite_0.7.3b.pk3} \
96-
-file ${../bak/doom/SimpleSlots.1.1.pk7}
97-
'';
98-
}
99-
// fj.mkFirejailCustom {
100-
pkg = "doom-puff";
101-
dir = "doom";
102-
exe = ''
103-
${olds.gzdoom}/bin/gzdoom \
104-
-iwad ${../bak/doom/freedoom-0.13.0/freedoom2.wad} \
105-
-file ${../bak/doom/bulletzborn.pk3}
106-
'';
107-
}
108-
// fj.mkFirejailCustom {
109-
pkg = "doom-siren";
110-
dir = "doom";
111-
exe = ''
112-
${vkdm}/bin/vkdoom \
113-
-iwad ${../bak/doom/freedoom-0.13.0/freedoom2.wad} \
114-
-file ${../bak/doom/Siren-0.86c.pk3} \
115-
-file ${../bak/doom/SimpleSlots.1.1.pk7}
116-
'';
117-
}
11880
)

pub/bfx/hie.yaml

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)