Skip to content

Commit 77a4ef1

Browse files
functorafunctora
committed
latest ollama
1 parent 7fd9106 commit 77a4ef1

File tree

3 files changed

+55
-56
lines changed

3 files changed

+55
-56
lines changed

‎nix/configuration.nix‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,9 @@
3636
(
3737
if config.services.functora.blockHosts
3838
then [
39-
"err.ee"
40-
"delfi.ee"
41-
"postimees.ee"
42-
# "rumble.com"
43-
# "odysee.com"
44-
# "bastyon.com"
45-
# "bitchute.com"
39+
# "err.ee"
40+
# "delfi.ee"
41+
# "postimees.ee"
4642
]
4743
else []
4844
));
@@ -1091,6 +1087,7 @@ in {
10911087
# AI
10921088
#
10931089
services.ollama.enable = true;
1090+
services.ollama.package = unst.ollama;
10941091
#
10951092
# Fonts
10961093
#

‎nix/doom.nix‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,15 @@ in
6060
-iwad ${../bak/doom/freedoom-0.13.0/freedoom2.wad} \
6161
-file ${../bak/doom/DOOM_Infinite_DEMO_0978_6.pk3} \
6262
-file ${../bak/doom/DMSF_ALX-R3.WAD} \
63-
-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" \
63+
-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} \
6565
-file ${../bak/doom/DoomInfiniteWeaponsSkins.pk3} \
6666
-file "${../bak/doom/liquid}/Liquid Texture Pack/(GZDoom) Liquid Texture Pack V4.0.pk3" \
6767
-file "${../bak/doom/liquid}/Glowing Toxic Texture Pack/LTP V4.0 Glowing Toxic Texture Addon.pk3" \
6868
-file "${../bak/doom/liquid}/Shader Pack/LTP V4.0 Shader pack.pk3" \
6969
-file "${../bak/doom/liquid}/Shader Pack/LTP V4.0 Sky shader addon.pk3" \
70+
-file ${../bak/doom/UltimateDoom2016OST.pk3} \
71+
-file ${../bak/doom/DOOMIIHellOnEarth_DOOMEternal_OST.pk3} \
7072
-file ${../bak/doom/Barrels.pk3} \
7173
-file ${../bak/doom/nashgore.pk3} \
7274
-file ${../bak/doom/dblood.pk3} \

‎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": "b32441ec0fae600e647cf4e6d6c245286a583106",
45+
"sha256": "0jgdrq44r2rqq80n0js3312l1fhxhy2g03z8348sq083zrvqr48f",
46+
"type": "tarball",
47+
"url": "https://github.com/NixOS/nixpkgs/archive/b32441ec0fae600e647cf4e6d6c245286a583106.tar.gz",
48+
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
49+
}
5050
}

0 commit comments

Comments
 (0)