update
This commit is contained in:
@@ -32,7 +32,6 @@
|
|||||||
#kernel options
|
#kernel options
|
||||||
boot = {
|
boot = {
|
||||||
kernelPackages = pkgs.linuxPackages_cachyos-lto;
|
kernelPackages = pkgs.linuxPackages_cachyos-lto;
|
||||||
# kernelPackages = pkgs.linuxPackages_6_10;
|
|
||||||
|
|
||||||
kernel.sysctl = {
|
kernel.sysctl = {
|
||||||
#for profiling
|
#for profiling
|
||||||
|
|||||||
6
etcnixos/flake.lock
generated
6
etcnixos/flake.lock
generated
@@ -332,11 +332,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727348695,
|
"lastModified": 1727634051,
|
||||||
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
|
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
|
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
insertNameservers = [
|
insertNameservers = [
|
||||||
"1.1.1.1"
|
"1.1.1.1"
|
||||||
"8.8.8.8"
|
"9.9.9.9"
|
||||||
];
|
];
|
||||||
wifi = {
|
wifi = {
|
||||||
scanRandMacAddress = true;
|
scanRandMacAddress = true;
|
||||||
|
|||||||
@@ -46,7 +46,7 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
default_session = {
|
default_session = {
|
||||||
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd ${pkgs.niri}/bin/niri-session";
|
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd niri-session";
|
||||||
user = "${username}";
|
user = "${username}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
12
home-manager/flake.lock
generated
12
home-manager/flake.lock
generated
@@ -137,11 +137,11 @@
|
|||||||
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727701561,
|
"lastModified": 1727714074,
|
||||||
"narHash": "sha256-WY8hXcI5835QYQL7aSo2N2mpzt7iZzmt+I+//zqLNcA=",
|
"narHash": "sha256-8a75SFeO1y6ynzF4kLZOnbwZCMWZ51GeBo9u+/MF4xc=",
|
||||||
"owner": "sodiboo",
|
"owner": "sodiboo",
|
||||||
"repo": "niri-flake",
|
"repo": "niri-flake",
|
||||||
"rev": "31730f5948bdcbe2f909feb414912f0abdc1fbd7",
|
"rev": "63a85add825d4bd6ef48780f9c32ac0d31a8929a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -185,11 +185,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1727348695,
|
"lastModified": 1727634051,
|
||||||
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
|
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
|
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -87,6 +87,7 @@
|
|||||||
xdg-utils # xdg utils
|
xdg-utils # xdg utils
|
||||||
|
|
||||||
puddletag
|
puddletag
|
||||||
|
picard
|
||||||
|
|
||||||
inputs.zen-browser.packages."${pkgs.system}".specific
|
inputs.zen-browser.packages."${pkgs.system}".specific
|
||||||
|
|
||||||
|
|||||||
@@ -1,53 +0,0 @@
|
|||||||
commit 425b33877c819dd88f3692aae37452c767371f6b
|
|
||||||
Author: Simon Gardling <titaniumtown@proton.me>
|
|
||||||
Date: Thu Sep 19 10:00:39 2024 -0400
|
|
||||||
|
|
||||||
use locally downloaded embeddings
|
|
||||||
|
|
||||||
diff --git a/gpt4all-chat/CMakeLists.txt b/gpt4all-chat/CMakeLists.txt
|
|
||||||
index 900307ae..802fc31a 100644
|
|
||||||
--- a//CMakeLists.txt
|
|
||||||
+++ b/CMakeLists.txt
|
|
||||||
@@ -120,6 +120,7 @@ elseif (APPLE)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# Embedding model
|
|
||||||
+#[[
|
|
||||||
set(LOCAL_EMBEDDING_MODEL "nomic-embed-text-v1.5.f16.gguf")
|
|
||||||
set(LOCAL_EMBEDDING_MODEL_MD5 "a5401e7f7e46ed9fcaed5b60a281d547")
|
|
||||||
set(LOCAL_EMBEDDING_MODEL_PATH "${CMAKE_BINARY_DIR}/resources/${LOCAL_EMBEDDING_MODEL}")
|
|
||||||
@@ -134,6 +135,7 @@ message(STATUS "Embedding model downloaded to ${LOCAL_EMBEDDING_MODEL_PATH}")
|
|
||||||
if (APPLE)
|
|
||||||
list(APPEND CHAT_EXE_RESOURCES "${LOCAL_EMBEDDING_MODEL_PATH}")
|
|
||||||
endif()
|
|
||||||
+]]
|
|
||||||
|
|
||||||
set(QAPPLICATION_CLASS QGuiApplication)
|
|
||||||
add_subdirectory(deps/SingleApplication)
|
|
||||||
@@ -348,11 +350,13 @@ if (LLMODEL_CUDA)
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
|
|
||||||
+#[[
|
|
||||||
if (NOT APPLE)
|
|
||||||
install(FILES "${LOCAL_EMBEDDING_MODEL_PATH}"
|
|
||||||
DESTINATION resources
|
|
||||||
COMPONENT ${COMPONENT_NAME_MAIN})
|
|
||||||
endif()
|
|
||||||
+]]
|
|
||||||
|
|
||||||
set(CPACK_GENERATOR "IFW")
|
|
||||||
set(CPACK_VERBATIM_VARIABLES YES)
|
|
||||||
diff --git a/gpt4all-chat/src/embllm.cpp b/gpt4all-chat/src/embllm.cpp
|
|
||||||
index 81b1e9e1..e3266cc7 100644
|
|
||||||
--- a/src/embllm.cpp
|
|
||||||
+++ b/src/embllm.cpp
|
|
||||||
@@ -84,7 +84,7 @@ bool EmbeddingLLMWorker::loadModel()
|
|
||||||
|
|
||||||
QString filePath = embPathFmt.arg(QCoreApplication::applicationDirPath(), LOCAL_EMBEDDING_MODEL);
|
|
||||||
if (!QFileInfo::exists(filePath)) {
|
|
||||||
- qWarning() << "embllm WARNING: Local embedding model not found";
|
|
||||||
+ qWarning() << "embllm WARNING: Local embedding model not found: " << filePath;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -46,7 +46,6 @@ let
|
|||||||
gpt4all_package = (
|
gpt4all_package = (
|
||||||
optimizeWithFlags
|
optimizeWithFlags
|
||||||
(pkgs.gpt4all.overrideAttrs (old: {
|
(pkgs.gpt4all.overrideAttrs (old: {
|
||||||
# https://github.com/NixOS/nixpkgs/pull/344001 3.2.1 -> 3.3.0
|
|
||||||
version = "3.4.0-dev0";
|
version = "3.4.0-dev0";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
@@ -56,10 +55,10 @@ let
|
|||||||
sha256 = "/w1VAfLYlhB5y08cVG2u9RT2kajtFtyTPziQXSwVFcE=";
|
sha256 = "/w1VAfLYlhB5y08cVG2u9RT2kajtFtyTPziQXSwVFcE=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = old.patches ++ [
|
||||||
./gpt4all-HEAD-embeddings-model.patch
|
|
||||||
./gpt4all-HEAD-disable-settings-err.patch
|
./gpt4all-HEAD-disable-settings-err.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
}))
|
}))
|
||||||
# compile flags
|
# compile flags
|
||||||
[
|
[
|
||||||
|
|||||||
@@ -15,6 +15,8 @@
|
|||||||
|
|
||||||
#manage bluetooth devices
|
#manage bluetooth devices
|
||||||
blueman
|
blueman
|
||||||
|
|
||||||
|
niri
|
||||||
];
|
];
|
||||||
|
|
||||||
#bluetooth manager
|
#bluetooth manager
|
||||||
|
|||||||
Reference in New Issue
Block a user