Compare commits
3 Commits
22458bb31e
...
5fbbd9df03
| Author | SHA1 | Date | |
|---|---|---|---|
5fbbd9df03
|
|||
|
7c49e1900b
|
|||
|
1979b59b15
|
@@ -12,7 +12,7 @@
|
||||
"nvme"
|
||||
];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
disko.devices = {
|
||||
@@ -71,5 +71,5 @@
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
|
||||
hardware.enableRedistributableFirmware = true;
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
|
||||
@@ -5,20 +5,6 @@
|
||||
...
|
||||
}:
|
||||
{
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
# https://github.com/quickemu-project/quickemu
|
||||
(quickemu.overrideAttrs (old: {
|
||||
patches = [
|
||||
# patch to allow forcing a specific ISO file via an environment variable `FILE_NAME`
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/Titaniumtown/quickemu/commit/f96d52a6b6f4b3187171d8cab61a273475da3b6c.diff";
|
||||
sha256 = "vXVI4EeJGhOlx8ARTCvB98Ajalk0bVakL98WojqcI3c=";
|
||||
})
|
||||
];
|
||||
}))
|
||||
];
|
||||
|
||||
programs.virt-manager.enable = true;
|
||||
|
||||
users.groups.libvirtd.members = [ username ];
|
||||
@@ -33,16 +19,18 @@
|
||||
pkgs.qemu_kvm.overrideAttrs (old: {
|
||||
patches = old.patches ++ [
|
||||
# amd?
|
||||
# (pkgs.fetchpatch {
|
||||
# url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/amd-qemu-9.2.0.patch";
|
||||
# sha256 = "BbzgjRa3qaYH1yXXqU6M/S68SxXWpAc9ObTG5qXu6YA=";
|
||||
# })
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/amd-qemu-9.2.0.patch";
|
||||
sha256 = "BbzgjRa3qaYH1yXXqU6M/S68SxXWpAc9ObTG5qXu6YA=";
|
||||
})
|
||||
|
||||
# or intel!
|
||||
/*
|
||||
(pkgs.fetchpatch {
|
||||
url = "https://github.com/Scrut1ny/Hypervisor-Phantom/raw/d09d66813570704e2b05440f290d6f9bdf2d26c7/Hypervisor-Phantom/patches/QEMU/intel-qemu-9.2.0.patch";
|
||||
sha256 = "kXY6R/0Tsotf0mGUIevDLlLWHEznnF1dt0K2ayX7XAg=";
|
||||
})
|
||||
*/
|
||||
];
|
||||
})
|
||||
);
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
# ./progs/alacritty.nix
|
||||
./progs/ghostty.nix
|
||||
./progs/emacs.nix
|
||||
# ./progs/gpt4all/gpt4all.nix
|
||||
# ./progs/trezor.nix # - broken
|
||||
];
|
||||
|
||||
|
||||
@@ -23,8 +23,6 @@
|
||||
|
||||
home.packages = with pkgs; [
|
||||
wdisplays
|
||||
intel-gpu-tools
|
||||
|
||||
blueman
|
||||
|
||||
# used by /etc/nixos logic to launch niri
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
}:
|
||||
let
|
||||
rust_pkgs = with pkgs; [
|
||||
|
||||
(rust-bin.stable.latest.default.override ({
|
||||
extensions = [
|
||||
"rust-src"
|
||||
@@ -104,9 +103,6 @@ in
|
||||
# adds `sensors` command
|
||||
lm_sensors
|
||||
|
||||
# rssfeed
|
||||
newsboat
|
||||
|
||||
just
|
||||
|
||||
pfetch-rs
|
||||
@@ -180,8 +176,6 @@ in
|
||||
|
||||
tcpdump
|
||||
|
||||
linuxKernel.packages.linux_6_14.perf
|
||||
|
||||
borgbackup
|
||||
|
||||
tinyxxd
|
||||
@@ -213,13 +207,6 @@ in
|
||||
EDITOR = "hx";
|
||||
};
|
||||
|
||||
# feed reader
|
||||
programs.newsboat = {
|
||||
enable = true;
|
||||
# store rss feeds in a separate file because it's *a lot*
|
||||
urls = import ./progs/rss.nix;
|
||||
};
|
||||
|
||||
# git (self explanatory)
|
||||
programs.git = {
|
||||
enable = true;
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
diff --git a/main.qml b/main.qml
|
||||
index 1e685385..7c747eba 100644
|
||||
--- a/main.qml
|
||||
+++ b/main.qml
|
||||
@@ -72,12 +72,14 @@ Window {
|
||||
return;
|
||||
}
|
||||
|
||||
+ /*
|
||||
// check if we have access to settings and if not show an error
|
||||
if (!hasShownSettingsAccess && !LLM.hasSettingsAccess()) {
|
||||
errorSettingsAccess.open();
|
||||
hasShownSettingsAccess = true;
|
||||
return;
|
||||
}
|
||||
+ */
|
||||
|
||||
// check for first time start of this version
|
||||
if (!hasCheckedFirstStart) {
|
||||
@@ -1,17 +0,0 @@
|
||||
diff --git a/gpt4all-chat/main.qml b/gpt4all-chat/main.qml
|
||||
index 1e685385..31cf7efd 100644
|
||||
--- a/main.qml
|
||||
+++ b/main.qml
|
||||
@@ -95,10 +95,12 @@ Window {
|
||||
}
|
||||
|
||||
// check for new version
|
||||
+ /*
|
||||
if (Download.hasNewerRelease && !firstStartDialog.opened) {
|
||||
newVersionDialog.open();
|
||||
return;
|
||||
}
|
||||
+ */
|
||||
}
|
||||
|
||||
PopupDialog {
|
||||
@@ -1,106 +0,0 @@
|
||||
{
|
||||
pkgs,
|
||||
lib,
|
||||
optimizeWithFlags,
|
||||
...
|
||||
}:
|
||||
let
|
||||
models = [
|
||||
rec {
|
||||
name = "DeepSeek-R1-Distill-Qwen-14B-IQ4_XS";
|
||||
filename = src.name;
|
||||
context_length = 131072;
|
||||
gen_length = 32768;
|
||||
src = pkgs.fetchurl {
|
||||
url = "https://huggingface.co/bartowski/DeepSeek-R1-Distill-Qwen-14B-GGUF/resolve/main/DeepSeek-R1-Distill-Qwen-14B-IQ4_XS.gguf";
|
||||
sha256 = "031b190e7aa81770b5d069de181dcfe4b284bf5d75fa12f82f5e54a3178adcfd";
|
||||
};
|
||||
}
|
||||
|
||||
# https://github.com/nomic-ai/gpt4all/issues/3540
|
||||
# rec {
|
||||
# name = "Gemma_3_27b_it";
|
||||
# filename = src.name;
|
||||
# context_length = 131072;
|
||||
# gen_length = 32768;
|
||||
# src = pkgs.fetchurl {
|
||||
# url = "https://huggingface.co/bartowski/google_gemma-3-27b-it-GGUF/resolve/main/google_gemma-3-27b-it-IQ4_XS.gguf";
|
||||
# sha256 = "bd2f188c66d8ccb0bffcb0c91e4dbbb72754bb1732e0bca323a2f266a35e01c8";
|
||||
# };
|
||||
# }
|
||||
];
|
||||
|
||||
gpt4all_package = (
|
||||
pkgs.gpt4all.overrideAttrs (old: {
|
||||
patches = old.patches ++ [
|
||||
./disable-settings-err.patch
|
||||
./disable-version-check.patch
|
||||
];
|
||||
})
|
||||
);
|
||||
|
||||
system_prompt = "You are a helpful and harmless assistant. You should think step-by-step. Explore multiple trains of thought and methods (to completion) in order to derive the correct answer.";
|
||||
chat_name_prompt = "Make a 3 word headline for this conversation";
|
||||
in
|
||||
{
|
||||
home.packages = [
|
||||
gpt4all_package
|
||||
];
|
||||
|
||||
home.file =
|
||||
lib.recursiveUpdate
|
||||
{
|
||||
".config/nomic.ai/GPT4All.ini".text =
|
||||
''
|
||||
[General]
|
||||
chatTheme=Dark
|
||||
suggestionMode=Off
|
||||
threadCount=8
|
||||
userDefaultModel=${
|
||||
# select the first element of `models` to be the default model
|
||||
(builtins.elemAt models 0).name
|
||||
}
|
||||
|
||||
[download]
|
||||
lastVersionStarted=${gpt4all_package.version}
|
||||
''
|
||||
+ (lib.concatMapStringsSep "\n" (model: ''
|
||||
[model-${model.name}]
|
||||
contextLength=${builtins.toString model.context_length}
|
||||
filename=${model.filename}
|
||||
maxLength=${builtins.toString model.gen_length}
|
||||
promptBatchSize=256
|
||||
chatNamePrompt=${chat_name_prompt}
|
||||
systemMessage="${
|
||||
# replace newlines with the string literal "\n" for gpt4all to properly parse
|
||||
builtins.replaceStrings [ "\n" ] [ "\\n" ] system_prompt
|
||||
}"
|
||||
'') models)
|
||||
+ ''
|
||||
|
||||
[network]
|
||||
isActive=false
|
||||
usageStatsActive=false
|
||||
|
||||
[localdocs]
|
||||
fileExtensions=${
|
||||
lib.concatStringsSep ", " [
|
||||
"docx"
|
||||
"pdf"
|
||||
"txt"
|
||||
"md"
|
||||
"rst"
|
||||
"rs"
|
||||
]
|
||||
}
|
||||
'';
|
||||
}
|
||||
(
|
||||
builtins.listToAttrs (
|
||||
map (f: {
|
||||
name = ".local/share/nomic.ai/GPT4All/${f.filename}";
|
||||
value.source = f.src;
|
||||
}) models
|
||||
)
|
||||
);
|
||||
}
|
||||
@@ -1,81 +0,0 @@
|
||||
[
|
||||
{
|
||||
title = "Stratechery";
|
||||
url = "https://stratechery.passport.online/feed/rss/2gi1tPZ8Ta36Tsx7rDLM5P";
|
||||
}
|
||||
|
||||
{
|
||||
title = "Factorio Blog";
|
||||
url = "https://www.factorio.com/blog/rss";
|
||||
}
|
||||
|
||||
{
|
||||
title = "Servo Blog";
|
||||
url = "https://servo.org/blog/feed.xml";
|
||||
}
|
||||
|
||||
{
|
||||
title = "Alyssa Rosenzweig";
|
||||
url = "https://rosenzweig.io/feed.xml";
|
||||
}
|
||||
|
||||
{
|
||||
title = "Marc's Blog";
|
||||
url = "https://brooker.co.za/blog/rss.xml";
|
||||
}
|
||||
|
||||
{
|
||||
title = "Fabien Sanglard";
|
||||
url = "https://fabiensanglard.net/rss.xml";
|
||||
}
|
||||
|
||||
{
|
||||
title = "Xuanwo's Blog";
|
||||
url = "https://xuanwo.io/index.xml";
|
||||
}
|
||||
|
||||
{
|
||||
title = "Carlos Galdino";
|
||||
url = "https://blog.carlosgaldino.com/atom.xml";
|
||||
}
|
||||
|
||||
{
|
||||
title = "soatok";
|
||||
url = "https://soatok.blog/feed/";
|
||||
}
|
||||
|
||||
{
|
||||
title = "Jack Garbus";
|
||||
url = "https://jarbus.net/index.xml";
|
||||
}
|
||||
|
||||
{
|
||||
title = "GioCities";
|
||||
url = "https://blog.giovanh.com/feeds/atom.xml";
|
||||
}
|
||||
|
||||
{
|
||||
title = "mcyoung";
|
||||
url = "https://mcyoung.xyz/atom.xml";
|
||||
}
|
||||
|
||||
{
|
||||
title = "Chips and Cheese";
|
||||
url = "https://chipsandcheese.com/feed/";
|
||||
}
|
||||
|
||||
{
|
||||
title = "System5";
|
||||
url = "https://blogsystem5.substack.com/feed";
|
||||
}
|
||||
|
||||
{
|
||||
title = "lwn";
|
||||
url = "https://lwn.net/headlines/Features";
|
||||
}
|
||||
|
||||
{
|
||||
title = "Jellyfin Blog";
|
||||
url = "https://jellyfin.org/posts/rss.xml";
|
||||
}
|
||||
]
|
||||
Reference in New Issue
Block a user