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

updates + remove factorio + disable gpt4all (broken)

Browse Source
This commit is contained in:
Simon Gardling
2024-10-15 23:20:26 -04:00
parent d96d1e2367
commit fddb34888a
8 changed files with 83 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
etcnixos/common.nix
View File

@@ -46,11 +46,12 @@
loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
timeout = 1;
};
initrd = {
compressor = "zstd";
compressorArgs = [ "-19" ];
};
};

42
etcnixos/flake.lock generated
View File

@@ -65,18 +65,12 @@
}
},
"crane": {
"inputs": {
"nixpkgs": [
"lanzaboote",
"nixpkgs"
]
},
"locked": {
"lastModified": 1721842668,
"narHash": "sha256-k3oiD2z2AAwBFLa4+xfU+7G5fisRXfkvrMTCJrjZzXo=",
"lastModified": 1728776144,
"narHash": "sha256-fROVjMcKRoGHofDm8dY3uDUtCMwUICh/KjBFQnuBzfg=",
"owner": "ipetkov",
"repo": "crane",
"rev": "529c1a0b1f29f0d78fa3086b8f6a134c71ef3aaf",
"rev": "f876e3d905b922502f031aeec1a84490122254b7",
"type": "github"
},
"original": {
@@ -153,11 +147,11 @@
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"lastModified": 1727826117,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"type": "github"
},
"original": {
@@ -278,11 +272,11 @@
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1728833717,
"narHash": "sha256-GkS9SnKRb/PrdcqptLPNxweDdf3Zx2Lk5szEt07P4mE=",
"lastModified": 1729028850,
"narHash": "sha256-eOhjiU+3TCaSYZESYhU2ZTUQKrBcer9cQ/XpVkergAg=",
"owner": "nix-community",
"repo": "lanzaboote",
"rev": "6634ab618862f1d041c286567a58c554e6136068",
"rev": "bd01eac8c7cfa9b7e25304f0e7f0fed80de63f9d",
"type": "github"
},
"original": {
@@ -332,11 +326,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1728492678,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
"lastModified": 1728888510,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
"type": "github"
},
"original": {
@@ -376,11 +370,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1721042469,
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
"lastModified": 1728778939,
"narHash": "sha256-WybK5E3hpGxtCYtBwpRj1E9JoiVxe+8kX83snTNaFHE=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
"rev": "ff68f91754be6f3427e4986d7949e6273659be1d",
"type": "github"
},
"original": {
@@ -424,11 +418,11 @@
]
},
"locked": {
"lastModified": 1722219664,
"narHash": "sha256-xMOJ+HW4yj6e69PvieohUJ3dBSdgCfvI0nnCEe6/yVc=",
"lastModified": 1728959392,
"narHash": "sha256-fp4he1QQjE+vasDMspZYeXrwTm9otwEqLwEN6FKZ5v0=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a6fbda5d9a14fb5f7c69b8489d24afeb349c7bb4",
"rev": "4c6e317300f05b8871f585b826b6f583e7dc4a9b",
"type": "github"
},
"original": {

42
home-manager/flake.lock generated
View File

@@ -72,11 +72,11 @@
]
},
"locked": {
"lastModified": 1728791962,
"narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=",
"lastModified": 1729027341,
"narHash": "sha256-IqWD7bA9iJVifvJlB4vs2KUXVhN+d9lECWdNB4jJ0tE=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "64c6325b28ebd708653dd41d88f306023f296184",
"rev": "2a4fd1cfd8ed5648583dadef86966a8231024221",
"type": "github"
},
"original": {
@@ -98,11 +98,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1728829629,
"narHash": "sha256-y3fWim/0mDCSLjvqkmylN5mmVOfvwJG9Mt+Z8qIn44U=",
"lastModified": 1729023891,
"narHash": "sha256-8NCqlnMnKldeLEWUyXG8UYbu1Wx2wctsA3+fFnMhNO4=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "0a50b261ac5b6cdcc8eb7921a4f022c92b29d1ab",
"rev": "7084b0221f3dec7ea1f1c5203d9e389eb9908d07",
"type": "github"
},
"original": {
@@ -131,11 +131,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1728822376,
"narHash": "sha256-HQc10OfFNie5YocsrJQCN6BOi+CZ0uuGGHGbJFXjgUI=",
"lastModified": 1728979917,
"narHash": "sha256-NWt6gwVP6072BcV2FvuZD8fikyDcT5WSBrs+6w9hTsk=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "d7156df8428cb9e6665a212e66c74bdb25842be8",
"rev": "a13b9298c66f45e571533731e2a690a23534df01",
"type": "github"
},
"original": {
@@ -146,11 +146,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1728492678,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
"lastModified": 1728888510,
"narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
"rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c",
"type": "github"
},
"original": {
@@ -174,11 +174,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1728740863,
"narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=",
"lastModified": 1728909085,
"narHash": "sha256-WLxED18lodtQiayIPDE5zwAfkPJSjHJ35UhZ8h3cJUg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077",
"rev": "c0b1da36f7c34a7146501f684e9ebdf15d2bebf8",
"type": "github"
},
"original": {
@@ -205,11 +205,11 @@
]
},
"locked": {
"lastModified": 1728786660,
"narHash": "sha256-qY+1e0o6oV5ySlErhj/dsWsPLWjrMKzq4QI7a1t9/Ps=",
"lastModified": 1729045942,
"narHash": "sha256-HjmK0x5Zm2TK2vFpC7XBM2e3EDNVnAIuEoU2FkeN8xw=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "174a8d9cec9e2c23877a7b887c52b68ef0421d8b",
"rev": "9de3cea452d2401d6f93c06ad985178a4e11d1fc",
"type": "github"
},
"original": {
@@ -268,11 +268,11 @@
},
"zen-browser": {
"locked": {
"lastModified": 1728678863,
"narHash": "sha256-SsHAlGs227Ffnaujj/bSs8QT1nGZFMCNh23vqh1F7YQ=",
"lastModified": 1729025440,
"narHash": "sha256-DUhI5F7bOf5x5q5dpBdLZOnFNi3My/ucqkJQ5j1FFjg=",
"owner": "matthewpi",
"repo": "nixpkgs",
"rev": "7bb3386ee928e23fafb333dbe733b5cae56f6d31",
"rev": "98eabdf0903f10fc768aebcbe356cd1621bcee8b",
"type": "github"
},
"original": {

22
home-manager/flake.nix
View File

@@ -46,12 +46,32 @@
homeDirectory = "/home/${username}";
hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname);
pkgs = import nixpkgs { };
# stolen from: https://stackoverflow.com/a/42398526
optimizeWithFlags =
pkg: flags:
pkgs.lib.overrideDerivation pkg (
old:
let
newflags = pkgs.lib.foldl' (acc: x: "${acc} ${x}") "" flags;
oldflags = if (pkgs.lib.hasAttr "NIX_CFLAGS_COMPILE" old) then "${old.NIX_CFLAGS_COMPILE}" else "";
in
{
NIX_CFLAGS_COMPILE = "${oldflags} ${newflags}";
stdenv = pkgs.clang19Stdenv;
}
);
in
{
homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
extraSpecialArgs = {
inherit inputs username homeDirectory;
inherit
inputs
username
homeDirectory
optimizeWithFlags
;
};
modules = [
./system-${hostname}.nix

10
home-manager/gui.nix
View File

@@ -2,20 +2,22 @@
pkgs,
lib,
inputs,
optimizeWithFlags,
...
}:
{
imports = [
./no-gui.nix
./progs/gpt4all/gpt4all.nix
./progs/alacritty.nix
# gpt4all broken https://github.com/NixOS/nixpkgs/pull/346185
# ./progs/gpt4all/gpt4all.nix
];
nixpkgs.config.allowUnfreePredicate =
pkg:
builtins.elem (lib.getName pkg) [
"apple_cursor"
"factorio-alpha"
];
home.packages = with pkgs; [
@@ -70,7 +72,6 @@
gnucash
# image tools
imagemagick
inkscape
nomacs
@@ -89,11 +90,8 @@
# music lyric fetcher
lrcget
# inputs.zen-browser.packages."${pkgs.system}".specific
inputs.zen-browser.legacyPackages.${pkgs.system}.zen-browser
(factorio.override (import ./secrets/factorio.nix))
freecad-wayland
];

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

@@ -130,6 +130,8 @@
git-crypt
clang
imagemagick
];
home.file.".cargo/config.toml".text = ''

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

@@ -1,4 +1,9 @@
{ pkgs, lib, ... }:
{
pkgs,
lib,
optimizeWithFlags,
...
}:
let
models = [
{
@@ -10,22 +15,16 @@ let
sha256 = "+AHt49no0qQ48MoNsqGJV4FeJ3Cf2hSZqTMjNUIHaO4=";
};
}
];
# stolen from: https://stackoverflow.com/a/42398526
optimizeWithFlags =
pkg: flags:
pkgs.lib.overrideDerivation pkg (
old:
let
newflags = pkgs.lib.foldl' (acc: x: "${acc} ${x}") "" flags;
oldflags = if (pkgs.lib.hasAttr "NIX_CFLAGS_COMPILE" old) then "${old.NIX_CFLAGS_COMPILE}" else "";
in
{
NIX_CFLAGS_COMPILE = "${oldflags} ${newflags}";
stdenv = pkgs.clangStdenv;
name = "Rombos-LLM-V2.6-Qwen-14b.IQ4_XS.gguf";
context_length = "32768";
gen_length = "8192";
source = pkgs.fetchurl {
url = "https://huggingface.co/mradermacher/Rombos-LLM-V2.6-Qwen-14b-GGUF/resolve/main/Rombos-LLM-V2.6-Qwen-14b.IQ4_XS.gguf?download=true";
sha256 = "InSndYkZx6pZux1SWn/pjQUc0tvUigjsw+JdXc3Dsdg=";
};
}
);
];
gpt4all_package = (
optimizeWithFlags

BIN
home-manager/secrets/factorio.nix
View File

Binary file not shown.