From 3ffb753d56ccc57a1f8f2c41e6134da909f19289 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 30 Sep 2024 14:11:55 -0400 Subject: [PATCH] update --- etcnixos/common.nix | 1 - etcnixos/flake.lock | 6 +-- etcnixos/networking.nix | 2 +- etcnixos/system-mreow.nix | 2 +- home-manager/flake.lock | 12 ++--- home-manager/gui.nix | 1 + .../gpt4all-HEAD-embeddings-model.patch | 53 ------------------- home-manager/progs/gpt4all/gpt4all.nix | 5 +- home-manager/system-mreow.nix | 2 + 9 files changed, 16 insertions(+), 68 deletions(-) delete mode 100644 home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch diff --git a/etcnixos/common.nix b/etcnixos/common.nix index 8d73567..6ca50d1 100644 --- a/etcnixos/common.nix +++ b/etcnixos/common.nix @@ -32,7 +32,6 @@ #kernel options boot = { kernelPackages = pkgs.linuxPackages_cachyos-lto; - # kernelPackages = pkgs.linuxPackages_6_10; kernel.sysctl = { #for profiling diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index df4f8c8..aa59c16 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -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": { diff --git a/etcnixos/networking.nix b/etcnixos/networking.nix index cbcae80..6cf27b9 100644 --- a/etcnixos/networking.nix +++ b/etcnixos/networking.nix @@ -8,7 +8,7 @@ enable = true; insertNameservers = [ "1.1.1.1" - "8.8.8.8" + "9.9.9.9" ]; wifi = { scanRandMacAddress = true; diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix index 00e4728..04e5ec4 100644 --- a/etcnixos/system-mreow.nix +++ b/etcnixos/system-mreow.nix @@ -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}"; }; }; diff --git a/home-manager/flake.lock b/home-manager/flake.lock index c45c323..de9e670 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -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": { diff --git a/home-manager/gui.nix b/home-manager/gui.nix index 68d11aa..fa8c684 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -87,6 +87,7 @@ xdg-utils # xdg utils puddletag + picard inputs.zen-browser.packages."${pkgs.system}".specific diff --git a/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch b/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch deleted file mode 100644 index fb15635..0000000 --- a/home-manager/progs/gpt4all/gpt4all-HEAD-embeddings-model.patch +++ /dev/null @@ -1,53 +0,0 @@ -commit 425b33877c819dd88f3692aae37452c767371f6b -Author: Simon Gardling -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; - } - diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 93b3f65..87d12fd 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -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 [ diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index b68dab0..c9ba7fd 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -15,6 +15,8 @@ #manage bluetooth devices blueman + + niri ]; #bluetooth manager