From 00091026f7924c5e3177302b11af9d9d31e86e73 Mon Sep 17 00:00:00 2001
From: Tristan Druyen <tristan@vault81.de>
Date: Tue, 12 Dec 2023 18:25:46 +0100
Subject: [PATCH] Add llama-cpp.el

---
 ext/doom/config.el              | 47 +++++++++++----------------------
 flake.lock                      | 36 ++++++++++++-------------
 systems/nixos-pulse/default.nix |  1 +
 3 files changed, 34 insertions(+), 50 deletions(-)

diff --git a/ext/doom/config.el b/ext/doom/config.el
index dc33c1b..0c8669d 100644
--- a/ext/doom/config.el
+++ b/ext/doom/config.el
@@ -116,43 +116,26 @@
 
 ;; openchat prompt: GPT4 User: {prompt}<|end_of_turn|>GPT4 Assistant:
 
-;; (use-package llama-cpp
-;;  :ensure t)
 
 ;; (use-package llama-cpp-code)
 ;; (use-package llama-cpp-chat)
 
+(use-package! llama-cpp
+  :config
+  ;; mixtral
+  (setq! llama-cpp-host "100.64.0.3"
+         llama-cpp-params '(
+                            :n_predict -1
+                            :stop ["</s>"]
+                            )
 
-;; openchat
-;; (setq!
-;;  llama-cpp-params '(
-;;                     :n_predict -1
-;;                     :stop ["<|end_of_turn|>"]
-;;                     )
-
-;;  llama-cpp-chat-prompt "System:
-;; You are an intelligent programming assistant.
-;; The User is a professional software developer, be concise in your answers and assume technical proficiency.
-;; "
-;;  llama-cpp-chat-input-prefix "
-;; GPT4User:
-;; "
-;;  llama-cpp-chat-input-suffix "
-;; <|end_of_turn|>
-;; GPT4 Assistant:
-;; ")
-
-;; Phind codellama :
-(setq! llama-cpp-chat-prompt "### System Prompt
-You are an intelligent programming assistant."
-       llama-cpp-chat-input-prefix "
-
-### User Message
-"
-       llama-cpp-chat-input-suffix "
-
-### Assistant
-")
+         llama-cpp-chat-prompt "You are an intelligent programming assistant.
+        The User is a professional software developer, be concise in your answers and assume technical proficiency.
+        "
+         llama-cpp-chat-prompt-prefix "System: <s>[INST]"
+         llama-cpp-chat-input-prefix "</s><s>[INST]"
+         llama-cpp-chat-input-suffix "[/INST]")
+  )
 
 
 ;; Nix
diff --git a/flake.lock b/flake.lock
index 04ed3b4..396e73d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         "yafas": "yafas"
       },
       "locked": {
-        "lastModified": 1702226237,
-        "narHash": "sha256-DWTjzjGQaODVNqjFitOz8FBcKFNUYQMK8YzRhd2xANw=",
+        "lastModified": 1702323173,
+        "narHash": "sha256-G/mhFrlBDV6sgyfZ7fbCMlnH0VLKjk+1m7TXSWXaFdc=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "fcb86262e7bcd5dcbe165e5959aad80064cd82f6",
+        "rev": "29cd0da206e1815af2aa5791016baf2ab7055b15",
         "type": "github"
       },
       "original": {
@@ -273,11 +273,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1702177733,
-        "narHash": "sha256-lr3hkmmuqDFPj3i41cHpaALF3Txo3kxsJ3L6jZLujJ8=",
+        "lastModified": 1702291765,
+        "narHash": "sha256-kfxavgLKPIZdYVPUPcoDZyr5lleymrqbr5G9PVfQ2NY=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "58ecd98e27e27fcbb27a51a588555c828b1ec56e",
+        "rev": "45d82e0a8b9dd6c5dd9da835ac0c072239af7785",
         "type": "github"
       },
       "original": {
@@ -412,11 +412,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1702206697,
-        "narHash": "sha256-vE9oEx3Y8TO5MnWwFlmopjHd1JoEBno+EhsfUCq5iR8=",
+        "lastModified": 1702272962,
+        "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "29d6c96900b9b576c2fb89491452f283aa979819",
+        "rev": "e97b3e4186bcadf0ef1b6be22b8558eab1cdeb5d",
         "type": "github"
       },
       "original": {
@@ -444,11 +444,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1701952659,
-        "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=",
+        "lastModified": 1702233072,
+        "narHash": "sha256-H5G2wgbim2Ku6G6w+NSaQaauv6B6DlPhY9fMvArKqRo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4",
+        "rev": "781e2a9797ecf0f146e81425c822dca69fe4a348",
         "type": "github"
       },
       "original": {
@@ -498,11 +498,11 @@
         "osx-kvm": "osx-kvm"
       },
       "locked": {
-        "lastModified": 1702232935,
-        "narHash": "sha256-dLDkdeDPA7BZl15Xg6YGC8Y3r3F+oFJ9zhL3i4CZC7c=",
+        "lastModified": 1702308270,
+        "narHash": "sha256-yHfRDaaUUAzVTnmm+l0b0HRy1DCfjUsiUZGufBcfTCI=",
         "owner": "matthewcroughan",
         "repo": "nixtheplanet",
-        "rev": "dbd17cc421e0935b5c18ad5754e292057be395c9",
+        "rev": "1c05db4c929d8e1617c3c9f8f4fa1a5a9aca97ec",
         "type": "github"
       },
       "original": {
@@ -513,11 +513,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1702237445,
-        "narHash": "sha256-gCfV7eIdLghN/1NG2xngn4q0SXPO92cZ4/hPJepCw1w=",
+        "lastModified": 1702374333,
+        "narHash": "sha256-XMTl+mhxt3Gu+gID/ZSuESjs6vRV6YTMZdyQWklZasA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "444a9b5c426db74aea5e9dc8123705e4cf757815",
+        "rev": "afac0dcdeb4bcfd484dee11afa7c9ab0b354d251",
         "type": "github"
       },
       "original": {
diff --git a/systems/nixos-pulse/default.nix b/systems/nixos-pulse/default.nix
index 4e65bfe..c713e2a 100644
--- a/systems/nixos-pulse/default.nix
+++ b/systems/nixos-pulse/default.nix
@@ -77,6 +77,7 @@
       192.168.0.91    puppet.oekonzept.de
       192.168.0.245   cloud.oekonzept.net
       192.168.0.245   office.oekonzept.net
+      192.168.0.245   llama.oekonzept.net
       192.168.0.245   nixos-karl-kvm-guest.oekonzept.de
     '';
     interfaces = {