From 1ba1355745fe3a866b7571702224e86f70586f5e Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sun, 20 Oct 2024 13:08:58 -0400 Subject: [PATCH] update --- etcnixos/flake.lock | 12 ++++++------ etcnixos/system-nixos.nix | 22 +++++++++++----------- home-manager/flake.lock | 14 +++++++------- home-manager/flake.nix | 3 ++- home-manager/progs/gpt4all/gpt4all.nix | 20 -------------------- 5 files changed, 26 insertions(+), 45 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 607f9a8..59082af 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -271,11 +271,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1729333370, - "narHash": "sha256-NU+tYe3QWzDNpB8RagpqR3hNQXn4BNuBd7ZGosMHLL8=", + "lastModified": 1729417461, + "narHash": "sha256-p0j/sUs7noqZw0W+SEuZXskzOfgOH7yY80ksIM0fCi4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "38279034170b1e2929b2be33bdaedbf14a57bfeb", + "rev": "8f38d8a4754cf673c2609c4ed399630db87e678b", "type": "github" }, "original": { @@ -287,11 +287,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729403505, - "narHash": "sha256-1ILT9fxCbNQuToPWBhxC3N+hblIWW3WlEHnwcdoCBHE=", + "lastModified": 1729441482, + "narHash": "sha256-45Qn8uQUJZZ3Dx1YOZ7nTBQK+pjLSxxLIi9Z4B6EfJA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "88d3f02d308cb29a07942d24539f960721a20fe0", + "rev": "295fe5fa5ea7159eede65f742cfbb379d94a2745", "type": "github" }, "original": { diff --git a/etcnixos/system-nixos.nix b/etcnixos/system-nixos.nix index 468858f..ff29462 100644 --- a/etcnixos/system-nixos.nix +++ b/etcnixos/system-nixos.nix @@ -43,17 +43,17 @@ }; }; - services.openssh = { - enable = true; - ports = [ 22 ]; - settings = { - PasswordAuthentication = true; - AllowUsers = null; # Allows all users by default. Can be [ "user1" "user2" ] - UseDns = true; - X11Forwarding = false; - PermitRootLogin = "no"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no" - }; - }; + # services.openssh = { + # enable = true; + # ports = [ 22 ]; + # settings = { + # PasswordAuthentication = true; + # AllowUsers = null; # Allows all users by default. Can be [ "user1" "user2" ] + # UseDns = true; + # X11Forwarding = false; + # PermitRootLogin = "no"; # "yes", "without-password", "prohibit-password", "forced-commands-only", "no" + # }; + # }; programs.steam = { remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play diff --git a/home-manager/flake.lock b/home-manager/flake.lock index e33cacb..ea6e216 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -72,11 +72,11 @@ ] }, "locked": { - "lastModified": 1729321331, - "narHash": "sha256-KVyQq+ez/oB30/WbdNgVD8g/bda34z8NiU187QKQb74=", + "lastModified": 1729414726, + "narHash": "sha256-Dtmm1OU8Ymiy9hVWn/a2B8DhRYo9Eoyx9veERdOBR4o=", "owner": "nix-community", "repo": "home-manager", - "rev": "122f70545b29ccb922e655b08acfe05bfb44ec68", + "rev": "fe56302339bb28e3471632379d733547caec8103", "type": "github" }, "original": { @@ -146,16 +146,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1729256560, - "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", + "lastModified": 1729441716, + "narHash": "sha256-Fxgt9QFm2bxDoZgUiDlyJZo+554IQio3Lm8bjlQ8Hn4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", + "rev": "35f9ccf13b3e213b7d19984023aa75e283b3bced", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "master", "repo": "nixpkgs", "type": "github" } diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 45a8079..b99e053 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -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"; diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 13efc73..602756f 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -29,30 +29,10 @@ let gpt4all_package = ( optimizeWithFlags (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 ++ [ ./disable-settings-err.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 [