This commit is contained in:
Simon Gardling 2024-10-20 13:08:58 -04:00
parent 2981b0bf7e
commit 1ba1355745
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
5 changed files with 26 additions and 45 deletions

12
etcnixos/flake.lock generated
View File

@ -271,11 +271,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1729333370, "lastModified": 1729417461,
"narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=", "narHash": "sha256-p0j/sUs7noqZw0W+SEuZXskzOfgOH7yY80ksIM0fCi4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb", "rev": "8f38d8a4754cf673c2609c4ed399630db87e678b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,11 +287,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729403505, "lastModified": 1729441482,
"narHash": "sha256-1ILT9fxCbNQuToPWBhxC3N+hblIWW3WlEHnwcdoCBHE=", "narHash": "sha256-45Qn8uQUJZZ3Dx1YOZ7nTBQK+pjLSxxLIi9Z4B6EfJA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88d3f02d308cb29a07942d24539f960721a20fe0", "rev": "295fe5fa5ea7159eede65f742cfbb379d94a2745",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -43,17 +43,17 @@
}; };
}; };
services.openssh = { # services.openssh = {
enable = true; # enable = true;
ports = [ 22 ]; # ports = [ 22 ];
settings = { # settings = {
PasswordAuthentication = true; # PasswordAuthentication = true;
AllowUsers = null; # Allows all users by default. Can be [ "user1" "user2" ] # AllowUsers = null; # Allows all users by default. Can be [ "user1" "user2" ]
UseDns = true; # UseDns = true;
X11Forwarding = false; # X11Forwarding = false;
PermitRootLogin = "no"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no" # PermitRootLogin = "no"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no"
}; # };
}; # };
programs.steam = { programs.steam = {
remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play

View File

@ -72,11 +72,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729321331, "lastModified": 1729414726,
"narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", "rev": "fe56302339bb28e3471632379d733547caec8103",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,16 +146,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1729256560, "lastModified": 1729441716,
"narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "narHash": "sha256-Fxgt9QFm2bxDoZgUiDlyJZo+554IQio3Lm8bjlQ8Hn4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "rev": "35f9ccf13b3e213b7d19984023aa75e283b3bced",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "master",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

View File

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

View File

@ -29,30 +29,10 @@ let
gpt4all_package = ( gpt4all_package = (
optimizeWithFlags optimizeWithFlags
(pkgs.gpt4all.overrideAttrs (old: { (pkgs.gpt4all.overrideAttrs (old: {
version = "3.4.2";
src = pkgs.fetchFromGitHub {
fetchSubmodules = true;
owner = "nomic-ai";
repo = "gpt4all";
rev = "v3.4.2";
sha256 = "QzU22y6tt3UhazVSPcFuKejH4AV+mw7JExH61NtAKoM=";
};
cmakeFlags = old.cmakeFlags ++ [
"-DGGML_VULKAN=ON"
"-DGGML_KOMPUTE=ON"
];
patches = old.patches ++ [ patches = old.patches ++ [
./disable-settings-err.patch ./disable-settings-err.patch
./disable-version-check.patch ./disable-version-check.patch
(pkgs.fetchpatch {
url = "https://aur.archlinux.org/cgit/aur.git/plain/004-fix-build-with-qt-6.8.0.diff?h=gpt4all-chat&id=d14b12cb63fae95e578aa839a570189a23833051";
sha256 = "3Zur9KFn45f4dgAzOF7p1q42IdLqXwioN4zMiBbWbVU=";
stripLen = 1;
})
]; ];
})) }))
# compile flags # compile flags
[ [