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

Compare commits

base: titaniumtown:370279b21e6b3761297d77b19356220b5b800c28
Branches Tags
titaniumtown:main
..
compare: titaniumtown:c0f8f7617bbe2d09d519c0fae4e3bcd8a71c31ce
Branches Tags
titaniumtown:main

No commits in common. "370279b21e6b3761297d77b19356220b5b800c28" and "c0f8f7617bbe2d09d519c0fae4e3bcd8a71c31ce" have entirely different histories.
370279b21e ... c0f8f7617b

14 changed files with 104 additions and 173 deletions
Show Stats Expand all files Collapse all files

6
justfile
View File

@ -4,11 +4,11 @@ format_home:
nixfmt ~/.config/home-manager
format_system:
doas nixfmt /etc/nixos
run0 nixfmt /etc/nixos
system_update:
doas nix flake update /etc/nixos
doas nixos-rebuild boot --impure
run0 nix flake update /etc/nixos
run0 nixos-rebuild boot --impure
home_update:
nix flake update ~/.config/home-manager

20
nix/etcnixos/common.nix
View File

@ -31,10 +31,7 @@
#kernel options
boot = {
# kernelPackages = pkgs.linuxPackages_cachyos-lto;
kernelPackages = pkgs.linuxPackages_6_10;
supportedFilesystems = [ "zfs" ];
kernelPackages = pkgs.linuxPackages_cachyos-lto;
kernel.sysctl = {
#for profiling
@ -92,19 +89,8 @@
# Set your time zone.
time.timeZone = "America/New_York";
security = {
#lets use doas and not sudo!
doas.enable = true;
sudo.enable = false;
# Configure doas
doas.extraRules = [
{
users = [ "${username}" ];
keepEnv = true;
persist = true;
}
];
};
#lets use run0 instead!
security.sudo.enable = false;
age.identityPaths = [ "/home/${username}/.ssh/id_ed25519" ];

44
nix/etcnixos/flake.lock generated
View File

@ -25,11 +25,11 @@
},
"alvr": {
"locked": {
"lastModified": 1727023213,
"narHash": "sha256-KPghRPcTbqCMktw9ahrtiq7a/seajAyLkEI2GS1x+sg=",
"lastModified": 1726175462,
"narHash": "sha256-OWnvv900LI20DypGLMAsceRTFdkahMns6BHO2OKzmM0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "7c2572e5cf4329ad9fa50d33015aa7be394b4026",
"rev": "d5c6dd163d933674a4e3871a89ddddb87036c751",
"type": "github"
},
"original": {
@ -50,11 +50,11 @@
]
},
"locked": {
"lastModified": 1727292492,
"narHash": "sha256-vKkVoZJB35xOb1kmAH6i74ziuP0ZGKnzM6+NVi/OhD8=",
"lastModified": 1726576520,
"narHash": "sha256-qkaiUpE3qRXunKbUzMaTGTMzF8nv534oglJY4a2hxNY=",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "9b30ea4a39c8c5a2b6a6519f85da38f72b7f29f0",
"rev": "4409a04839fc8c911ef3e461bb5f422ae1d03a85",
"type": "github"
},
"original": {
@ -116,11 +116,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1726900127,
"narHash": "sha256-v3r7yJY8YE4HAzD5DXOxLkzj8YZKQ0xuccp9yppGW1U=",
"lastModified": 1726468443,
"narHash": "sha256-O1VcbVBrqIf58U05yFXl9+J7XM2qh0I+7vqMbNwZPq0=",
"owner": "nix-community",
"repo": "fenix",
"rev": "18eefba7fd0bf03e115785948758a44125a9fd68",
"rev": "effac20e9560aab202e82b6d833f685163a9c138",
"type": "github"
},
"original": {
@ -231,11 +231,11 @@
]
},
"locked": {
"lastModified": 1726902823,
"narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=",
"lastModified": 1726440980,
"narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "14929f7089268481d86b83ed31ffd88713dcd415",
"rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
"type": "github"
},
"original": {
@ -253,11 +253,11 @@
]
},
"locked": {
"lastModified": 1726902390,
"narHash": "sha256-ESAD6AkxsQdV/j5ZBcO4Vg94J7Xd0nfpiEZpJtwSEhg=",
"lastModified": 1726115155,
"narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "faf4c746c068dd8e41b1fa5f18beeabd34d4064c",
"rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4",
"type": "github"
},
"original": {
@ -316,11 +316,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1727040444,
"narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=",
"lastModified": 1726724509,
"narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac",
"rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94",
"type": "github"
},
"original": {
@ -332,16 +332,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1727122398,
"narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
"lastModified": 1726856061,
"narHash": "sha256-aHq3GDX5dNDuNy37TKTY/BD3+2vakPP8W+kNt7p0PZk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
"rev": "a0d059de3645c1b598d258675aaaa9ffdb0039b1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}

13
nix/etcnixos/flake.nix
View File

@ -2,7 +2,8 @@
description = "A simple NixOS flake";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/master";
lanzaboote = {
url = "github:nix-community/lanzaboote";
inputs.nixpkgs.follows = "nixpkgs";
@ -41,15 +42,7 @@
# pkgs = import nixpkgs {
# config.replaceStdenv = { pkgs }: pkgs.clangStdenv;
# };
pkgs = import nixpkgs {
config.allowUnfreePredicate =
pkg:
builtins.elem (nixpkgs.lib.getName pkg) [
"steam"
"steam-original"
"steam-run"
];
};
pkgs = import nixpkgs { };
in
{
nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem {

1
nix/etcnixos/hardware_desktop.nix
View File

@ -41,7 +41,6 @@
fileSystems."/media/steam" = {
device = "/dev/disk/by-uuid/df865fc2-6b26-4689-809b-1615f860507e";
fsType = "btrfs";
options = [ "nofail" ];
};
swapDevices = [ ];

2
nix/etcnixos/networking.nix
View File

@ -2,8 +2,6 @@
{
hostName = "${hostname}";
hostId = "cfe0ff46";
networkmanager = {
enable = true;
insertNameservers = [

28
nix/etcnixos/system-nixos.nix
View File

@ -92,6 +92,14 @@
openFirewall = true;
};
nixpkgs.config.allowUnfreePredicate =
pkg:
builtins.elem (lib.getName pkg) [
"steam"
"steam-original"
"steam-run"
];
programs.steam = {
enable = true;
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
@ -99,26 +107,6 @@
localNetworkGameTransfers.openFirewall = true; # Open ports in the firewall for Steam Local Network Game Transfers
};
# services.ollama = {
# enable = true;
# acceleration = "rocm";
# environmentVariables = {
# HCC_AMDGPU_TARGET = "gfx1031"; # used to be necessary, but doesn't seem to anymore
# };
# rocmOverrideGfx = "10.3.1";
# };
# services.open-webui = {
# enable = true;
# openFirewall = true;
# port = 8082;
# environment = {
# # Disable authentication
# WEBUI_AUTH = "False";
# PYDANTIC_SKIP_VALIDATING_CORE_SCHEMAS = "True";
# };
# };
systemd.packages = with pkgs; [ lact ];
systemd.services.lactd.wantedBy = [ "multi-user.target" ];

54
nix/home-manager/flake.lock generated
View File

@ -33,11 +33,11 @@
]
},
"locked": {
"lastModified": 1727190706,
"narHash": "sha256-CUfCWwlZebQyZAQ5bmfmQJhOvc61HgExe1R/U202g2Q=",
"lastModified": 1726750425,
"narHash": "sha256-KiWnHAGtLZZTq96rwH7IJ4fQhJfkNFg7VnfkdIi1R2s=",
"owner": "orhun",
"repo": "binsider",
"rev": "ec8dac79bf7f0d23257a521fc62b2888ebf55b86",
"rev": "3a7dec75482a899aa2b93d8ef5f0d15411811918",
"type": "github"
},
"original": {
@ -71,11 +71,11 @@
"firefox-mod-theme": {
"flake": false,
"locked": {
"lastModified": 1727035403,
"narHash": "sha256-xkVZOZRGrL5YKEXb0R701F71vGJ+K5BFpugtqPwf4XQ=",
"lastModified": 1726763363,
"narHash": "sha256-K0yCg/bCvDU3cU7ZzSsfRAQJLgoaBmp5g2GkxRB3bBo=",
"owner": "datguypiko",
"repo": "Firefox-Mod-Blur",
"rev": "694566afa267fe6d5eb5c97a87e116ba794ea293",
"rev": "1451f0110798f34ec157b29554572236621adcd5",
"type": "github"
},
"original": {
@ -127,11 +127,11 @@
]
},
"locked": {
"lastModified": 1727383923,
"narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=",
"lastModified": 1726825546,
"narHash": "sha256-HiBzfzgqojA9OjPB+vdi2o+gy4Zw/MEipuGopgGsZEw=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "ffe2d07e771580a005e675108212597e5b367d2d",
"rev": "0b052dd8119005c6ba819db48bcc657e48f401b7",
"type": "github"
},
"original": {
@ -153,11 +153,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1727332193,
"narHash": "sha256-XnjG+n42JjrIj2Ts33Xa+Udg1QDp9N8FHYbvAkYL9qg=",
"lastModified": 1726854506,
"narHash": "sha256-GiNELLwy79Gr7IhlDeydbAxOHMIy9RzqsYzQzslXo+Q=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "524000b81ba52f9d5a7b2ac78504468014121ebe",
"rev": "0f18e6a6a591267c8b9e9a7b142f8073a4a91e61",
"type": "github"
},
"original": {
@ -201,16 +201,16 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1727122398,
"narHash": "sha256-o8VBeCWHBxGd4kVMceIayf5GApqTavJbTa44Xcg5Rrk=",
"lastModified": 1726858900,
"narHash": "sha256-4EI5BtmTC1KW/TEiqLtwnvHOdtdDiek7C55dnYwiv/E=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "30439d93eb8b19861ccbe3e581abf97bdc91b093",
"rev": "01e6f3a3316f32d8d792b96e263bab2ed14225b4",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
@ -229,11 +229,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1727264057,
"narHash": "sha256-KQPI8CTTnB9CrJ7LrmLC4VWbKZfljEPBXOFGZFRpxao=",
"lastModified": 1726688310,
"narHash": "sha256-Xc9lEtentPCEtxc/F1e6jIZsd4MPDYv4Kugl9WtXlz0=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "759537f06e6999e141588ff1c9be7f3a5c060106",
"rev": "dbebdd67a6006bb145d98c8debf9140ac7e651d0",
"type": "github"
},
"original": {
@ -281,11 +281,11 @@
]
},
"locked": {
"lastModified": 1727317727,
"narHash": "sha256-yGYahXzCquyYEgf5GTtvtaN5hXbw20Ok2+o8uVxoaFs=",
"lastModified": 1726799228,
"narHash": "sha256-wn1leQyMAc/TrLRKcPc0GX6YtoziKQpc/MtZjPNiJ2Q=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a3d832f389606d7dc61a45b244c72ea472d1fcd4",
"rev": "ab150c7412db7bea5879ce2776718f53fba37aa2",
"type": "github"
},
"original": {
@ -381,15 +381,15 @@
]
},
"locked": {
"lastModified": 1727287465,
"narHash": "sha256-XQAf5M593WmxgaXagtkci/H9DA3jSVx1TJk6F3X5VQo=",
"owner": "MarceColl",
"lastModified": 1726645912,
"narHash": "sha256-2Xdji52Rc+X1iWu9t3aP9THueJ+XSBLd1mXvFZtam/A=",
"owner": "ch4og",
"repo": "zen-browser-flake",
"rev": "96f1b5d80bf7360cb77c9b521f388324f18383a0",
"rev": "b94921efd26954a255862ae9d81146de0c64e071",
"type": "github"
},
"original": {
"owner": "MarceColl",
"owner": "ch4og",
"repo": "zen-browser-flake",
"type": "github"
}

6
nix/home-manager/flake.nix
View File

@ -2,7 +2,8 @@
description = "My nixOS flake for home-manager";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixpkgs.url = "github:NixOS/nixpkgs/master";
home-manager = {
url = "github:nix-community/home-manager";
@ -31,7 +32,8 @@
};
zen-browser = {
url = "github:MarceColl/zen-browser-flake";
# url = "github:MarceColl/zen-browser-flake";
url = "github:ch4og/zen-browser-flake";
inputs.nixpkgs.follows = "nixpkgs";
};

4
nix/home-manager/no-gui.nix
View File

@ -118,11 +118,9 @@
#clang-format and clang-tidy
clang-tools
# inputs.binsider.packages.${pkgs.system}.binsider
inputs.binsider.packages.${pkgs.system}.binsider
lldb
fio
];
home.file.".cargo/config.toml".text = ''

7
nix/home-manager/progs/borg.nix
View File

@ -1,6 +1,5 @@
{ homeDirectory, borgPasswordFile }:
{
home = {
location = {
sourceDirectories =
@ -24,11 +23,7 @@
);
excludeHomeManagerSymlinks = true;
repositories = [ "ssh://server-public/tank/bak/laptop" ];
extraConfig = {
compression = "zstd";
};
repositories = [ "ssh://server-public/mnt/bak/laptop" ];
};
retention = {

19
nix/home-manager/progs/gpt4all-HEAD-disable-settings-err.patch
View File

@ -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) {

6
nix/home-manager/progs/gpt4all/gpt4all-HEAD-disable-settings-err.patch
View File

@ -1,7 +1,7 @@
diff --git a/main.qml b/main.qml
diff --git a/gpt4all-chat/src/main.qml b/gpt4all-chat/src/main.qml
index 1e685385..7c747eba 100644
--- a/main.qml
+++ b/main.qml
--- a/src/main.qml
+++ b/src/main.qml
@@ -72,12 +72,14 @@ Window {
return;
}

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

@ -1,27 +1,27 @@
{ pkgs, lib, ... }:
let
models = [
{
name = "Qwen2.5-14B-Instruct-Q4_K_S.gguf";
context_length = "32768";
gen_length = "8192";
source = pkgs.fetchurl {
url = "https://huggingface.co/bartowski/Qwen2.5-14B-Instruct-GGUF/resolve/main/Qwen2.5-14B-Instruct-Q4_K_S.gguf?download=true";
sha256 = "E1CmWUhMMbTXEjIRczzA3rSrVuR8qOL8BLagw7LiyZk=";
};
}
{
name = "Qwen2.5-7B-Instruct-Q6_K_L.gguf";
context_length = "32768";
context_length = "131072";
gen_length = "8192";
source = pkgs.fetchurl {
url = "https://huggingface.co/bartowski/Qwen2.5-7B-Instruct-GGUF/resolve/main/Qwen2.5-7B-Instruct-Q6_K_L.gguf?download=true";
sha256 = "thEXN06T/UVGfzdB83jlgpG7kuTzZtz1ZUAdupAnErM=";
};
}
{
name = "Qwen2.5-14B-Instruct-Q4_K_S.gguf";
context_length = "131072";
gen_length = "8192";
source = pkgs.fetchurl {
url = "https://huggingface.co/bartowski/Qwen2.5-14B-Instruct-GGUF/resolve/main/Qwen2.5-14B-Instruct-Q4_K_S.gguf?download=true";
sha256 = "E1CmWUhMMbTXEjIRczzA3rSrVuR8qOL8BLagw7LiyZk=";
};
}
];
# stolen from: https://stackoverflow.com/a/42398526
#stolen from: https://stackoverflow.com/a/42398526
optimizeWithFlags =
pkg: flags:
pkgs.lib.overrideDerivation pkg (
@ -44,46 +44,39 @@ let
};
}) models
);
gpt4all_package = (
optimizeWithFlags
(pkgs.gpt4all.overrideAttrs (old: {
# https://github.com/NixOS/nixpkgs/pull/344001 3.2.1 -> 3.3.0
version = "3.3.0";
src = pkgs.fetchFromGitHub {
in
{
home.packages = with pkgs; [
(optimizeWithFlags
(gpt4all.overrideAttrs {
src = fetchFromGitHub {
fetchSubmodules = true;
owner = "nomic-ai";
repo = "gpt4all";
rev = "HEAD";
sha256 = "RDYf+VaI5pl46Cd04ADvvi4ygNfYa4fY9rTv9Ui3qUk=";
sha256 = "lGvxTOBg7/UgrCqeAFNFFXD9VjpUk3IVCktdUYuF6Eo=";
};
patches = [
./gpt4all-HEAD-embeddings-model.patch
./gpt4all-HEAD-disable-settings-err.patch
];
}))
})
# compile flags
[
"-Ofast"
"-march=native"
"-mtune=native"
"-march=alderlake"
"-mtune=alderlake"
"-fno-protect-parens"
"-fno-finite-math-only" # https://github.com/ggerganov/llama.cpp/pull/7154#issuecomment-2143844461
]
);
in
{
home.packages = [
gpt4all_package
)
];
home.file = lib.recursiveUpdate {
".config/nomic.ai/GPT4All.ini".text =
let
system_prompt = "You are an expert AI assistant who is thoughtful and works step-by-step from first principles derive an answer to the user's prompt. For each step, provide a title that describes what you're doing in that step, along with the content. Decide if you need another step or if you're ready to provide your answer to the user, make sure to exhaust ALL POSSIBILITIES before providing a response to the user. While your reasoning is not shown to the user, it is under high levels of scrutiny to ensure high-quality reasoning. WHEN YOU DETERMINE THAT YOU ARE READY TO GIVE A FINAL ANSWER TO THE USER GIVEN YOUR REASONING AND STEP-BY-STEP WORK. ONLY TEXT WRITTEN AFTER A SECTION NAMED \"Final Answer\" WILL BE SHOWN TO THE USER. ASSUME THAT NO REASONING STEPS ARE SHOWN TO THE USER. DO NOT THINK THAT THE USER CAN SEE YOUR INTERNAL REASONING STEPS.
USE AS MANY REASONING STEPS AS POSSIBLE. AT LEAST 3. BE AWARE OF YOUR LIMITATIONS AS AN LLM AND WHAT YOU CAN AND CANNOT DO. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. WHEN YOU SAY YOU ARE RE-EXAMINING, ACTUALLY RE-EXAMINE, AND USE ANOTHER APPROACH TO DO SO. DO NOT JUST SAY YOU ARE RE-EXAMINING. SHOW ALL YOUR WORK. USE AT LEAST 3 METHODS TO DERIVE THE ANSWER. USE BEST PRACTICES. WORK FROM FIRST PRINCIPLES TO CREATE YOUR ANSWER.";
system_prompt = "You are an expert AI assistant that explains your reasoning step by step. For each step, provide a title that describes what you're doing in that step, along with the content. Decide if you need another step or if you're ready to give the final answer. USE AS MANY REASONING STEPS AS POSSIBLE. AT LEAST 3. BE AWARE OF YOUR LIMITATIONS AS AN LLM AND WHAT YOU CAN AND CANNOT DO. EXPLORE ALTERNATE ANSWERS AND CONSIDER THAT YOUR ANSWER MAY BE WRONG. IDENTIFY POSSIBLE ERRORS IN YOUR REASONING AND WHERE SUCH ERRORS MAY BE. FULLY TEST ALL OTHER POSSIBILITIES. YOU CAN BE WRONG. WHEN YOU SAY YOU ARE RE-EXAMINING, ACTUALLY RE-EXAMINE, AND USE ANOTHER APPROACH TO DO SO. DO NOT JUST SAY YOU ARE RE-EXAMINING. SHOW ALL YOUR WORK. USE AT LEAST 3 METHODS TO DERIVE THE ANSWER. USE BEST PRACTICES. WORK FROM FIRST PRINCIPLES TO CREATE YOUR ANSWER.";
in
''
[General]
@ -98,7 +91,11 @@ in
y=0
[download]
lastVersionStarted=${gpt4all_package.version}
lastVersionStarted=3.3.0-dev0
[network]
isActive=true
usageStatsActive=true
''
+ (lib.concatStrings (
map (model: ''
@ -109,16 +106,10 @@ in
promptBatchSize=256
promptTemplate=<|im_start|>user\n%1<|im_end|>\n<|im_start|>assistant\n
systemPrompt="<|im_start|>system\n${
# replace newlines with the string "\n" for gpt4all to properly parse
builtins.replaceStrings [ "\n" ] [ "\\n" ] system_prompt
}<|im_end|>
\n"
'') models
))
+ ''
[network]
isActive=true
usageStatsActive=true
'';
));
} model_files;
}