titaniumtown/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Simon Gardling
2024-09-30 14:11:55 -04:00
parent e63c95d319
commit 3ffb753d56
9 changed files with 16 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
etcnixos/common.nix
View File

@@ -32,7 +32,6 @@
#kernel options
boot = {
kernelPackages = pkgs.linuxPackages_cachyos-lto;
# kernelPackages = pkgs.linuxPackages_6_10;
kernel.sysctl = {
#for profiling

6
etcnixos/flake.lock generated
View File

@@ -332,11 +332,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1727348695,
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"lastModified": 1727634051,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
"type": "github"
},
"original": {

2
etcnixos/networking.nix
View File

@@ -8,7 +8,7 @@
enable = true;
insertNameservers = [
"1.1.1.1"
"8.8.8.8"
"9.9.9.9"
];
wifi = {
scanRandMacAddress = true;

2
etcnixos/system-mreow.nix
View File

@@ -46,7 +46,7 @@
enable = true;
settings = {
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}";
};
};

12
home-manager/flake.lock generated
View File

@@ -137,11 +137,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1727701561,
"narHash": "sha256-WY8hXcI5835QYQL7aSo2N2mpzt7iZzmt+I+//zqLNcA=",
"lastModified": 1727714074,
"narHash": "sha256-8a75SFeO1y6ynzF4kLZOnbwZCMWZ51GeBo9u+/MF4xc=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "31730f5948bdcbe2f909feb414912f0abdc1fbd7",
"rev": "63a85add825d4bd6ef48780f9c32ac0d31a8929a",
"type": "github"
},
"original": {
@@ -185,11 +185,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1727348695,
"narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=",
"lastModified": 1727634051,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1925c603f17fc89f4c8f6bf6f631a802ad85d784",
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
"type": "github"
},
"original": {

1
home-manager/gui.nix
View File

@@ -87,6 +87,7 @@
xdg-utils # xdg utils
puddletag
picard
inputs.zen-browser.packages."${pkgs.system}".specific

53
home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch
View File

@@ -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;
}

5
home-manager/progs/gpt4all/gpt4all.nix
View File

@@ -46,7 +46,6 @@ let
gpt4all_package = (
optimizeWithFlags
(pkgs.gpt4all.overrideAttrs (old: {
# https://github.com/NixOS/nixpkgs/pull/344001 3.2.1 -> 3.3.0
version = "3.4.0-dev0";
src = pkgs.fetchFromGitHub {
fetchSubmodules = true;
@@ -56,10 +55,10 @@ let
sha256 = "/w1VAfLYlhB5y08cVG2u9RT2kajtFtyTPziQXSwVFcE=";
};
patches = [
./gpt4all-HEAD-embeddings-model.patch
patches = old.patches ++ [
./gpt4all-HEAD-disable-settings-err.patch
];
}))
# compile flags
[

2
home-manager/system-mreow.nix
View File

@@ -15,6 +15,8 @@
#manage bluetooth devices
blueman
niri
];
#bluetooth manager