From 8f2d53777bd7fb456fe9cc3d814e6d4b3b13b0c5 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Sat, 21 Sep 2024 17:42:24 -0400 Subject: [PATCH] update --- nix/etcnixos/flake.lock | 36 +++++++++++----------- nix/etcnixos/flake.nix | 10 +++++- nix/etcnixos/hardware_desktop.nix | 1 + nix/etcnixos/system-nixos.nix | 8 ----- nix/home-manager/flake.lock | 36 +++++++++++----------- nix/home-manager/progs/gpt4all/gpt4all.nix | 4 +-- 6 files changed, 48 insertions(+), 47 deletions(-) diff --git a/nix/etcnixos/flake.lock b/nix/etcnixos/flake.lock index b1d0719..cb51acf 100644 --- a/nix/etcnixos/flake.lock +++ b/nix/etcnixos/flake.lock @@ -50,11 +50,11 @@ ] }, "locked": { - "lastModified": 1726576520, - "narHash": "sha256-qkaiUpE3qRXunKbUzMaTGTMzF8nv534oglJY4a2hxNY=", + "lastModified": 1726952766, + "narHash": "sha256-w/1jB99f0eaQp5hVbJgkUl/PTrUN/XGxRVKBQZlZ43A=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "4409a04839fc8c911ef3e461bb5f422ae1d03a85", + "rev": "a8b5d65ffe5c987dc7ab790588d011005e440d58", "type": "github" }, "original": { @@ -116,11 +116,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1726468443, - "narHash": "sha256-O1VcbVBrqIf58U05yFXl9+J7XM2qh0I+7vqMbNwZPq0=", + "lastModified": 1726900127, + "narHash": "sha256-v3r7yJY8YE4HAzD5DXOxLkzj8YZKQ0xuccp9yppGW1U=", "owner": "nix-community", "repo": "fenix", - "rev": "effac20e9560aab202e82b6d833f685163a9c138", + "rev": "18eefba7fd0bf03e115785948758a44125a9fd68", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1726440980, - "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=", + "lastModified": 1726902823, + "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff", + "rev": "14929f7089268481d86b83ed31ffd88713dcd415", "type": "github" }, "original": { @@ -253,11 +253,11 @@ ] }, "locked": { - "lastModified": 1726115155, - "narHash": "sha256-VDylz5VX4JD4/TZv6xUJDwuvNdgLRGoOpue1dlZGdIQ=", + "lastModified": 1726902390, + "narHash": "sha256-ESAD6AkxsQdV/j5ZBcO4Vg94J7Xd0nfpiEZpJtwSEhg=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "02cf60ce20b6034fc0459e5116cec7016aaff6e4", + "rev": "faf4c746c068dd8e41b1fa5f18beeabd34d4064c", "type": "github" }, "original": { @@ -316,11 +316,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1726724509, - "narHash": "sha256-sVeAM1tgVi52S1e29fFBTPUAFSzgQwgLon3CrztXGm8=", + "lastModified": 1726905744, + "narHash": "sha256-xyNtG5C+xvfsnOVEamFe9zCCnuNwk93K/TlFC/4DmCI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "10d5e0ecc32984c1bf1a9a46586be3451c42fd94", + "rev": "b493dfd4a8cf9552932179e56ff3b5819a9b8381", "type": "github" }, "original": { @@ -332,11 +332,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726856061, - "narHash": "sha256-aHq3GDX5dNDuNy37TKTY/BD3+2vakPP8W+kNt7p0PZk=", + "lastModified": 1726953717, + "narHash": "sha256-FwwoaRi8tatStzCkz7Wrdyv0XI+xKqPPc0iru1oNQCk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a0d059de3645c1b598d258675aaaa9ffdb0039b1", + "rev": "b1b7d7f3c5d3f898ca9646593cdeb378a655b446", "type": "github" }, "original": { diff --git a/nix/etcnixos/flake.nix b/nix/etcnixos/flake.nix index 9ac833a..b2c9c69 100644 --- a/nix/etcnixos/flake.nix +++ b/nix/etcnixos/flake.nix @@ -42,7 +42,15 @@ # pkgs = import nixpkgs { # config.replaceStdenv = { pkgs }: pkgs.clangStdenv; # }; - pkgs = import nixpkgs { }; + pkgs = import nixpkgs { + config.allowUnfreePredicate = + pkg: + builtins.elem (nixpkgs.lib.getName pkg) [ + "steam" + "steam-original" + "steam-run" + ]; + }; in { nixosConfigurations.${hostname} = nixpkgs.lib.nixosSystem { diff --git a/nix/etcnixos/hardware_desktop.nix b/nix/etcnixos/hardware_desktop.nix index c7ee556..3f45ceb 100644 --- a/nix/etcnixos/hardware_desktop.nix +++ b/nix/etcnixos/hardware_desktop.nix @@ -41,6 +41,7 @@ fileSystems."/media/steam" = { device = "/dev/disk/by-uuid/df865fc2-6b26-4689-809b-1615f860507e"; fsType = "btrfs"; + options = [ "nofail" ]; }; swapDevices = [ ]; diff --git a/nix/etcnixos/system-nixos.nix b/nix/etcnixos/system-nixos.nix index 8d1c903..00ab1a7 100644 --- a/nix/etcnixos/system-nixos.nix +++ b/nix/etcnixos/system-nixos.nix @@ -92,14 +92,6 @@ 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 diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index d4082d5..6147557 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -71,11 +71,11 @@ "firefox-mod-theme": { "flake": false, "locked": { - "lastModified": 1726763363, - "narHash": "sha256-K0yCg/bCvDU3cU7ZzSsfRAQJLgoaBmp5g2GkxRB3bBo=", + "lastModified": 1726951192, + "narHash": "sha256-Drfi/VnTbVARiVkE0Uz7qkLy/VbjTajpke9bCCnFwRQ=", "owner": "datguypiko", "repo": "Firefox-Mod-Blur", - "rev": "1451f0110798f34ec157b29554572236621adcd5", + "rev": "a765d59b97ade3d3a12658e67266d3bc914ab07a", "type": "github" }, "original": { @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1726825546, - "narHash": "sha256-HiBzfzgqojA9OjPB+vdi2o+gy4Zw/MEipuGopgGsZEw=", + "lastModified": 1726902823, + "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", "owner": "nix-community", "repo": "home-manager", - "rev": "0b052dd8119005c6ba819db48bcc657e48f401b7", + "rev": "14929f7089268481d86b83ed31ffd88713dcd415", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1726854506, - "narHash": "sha256-GiNELLwy79Gr7IhlDeydbAxOHMIy9RzqsYzQzslXo+Q=", + "lastModified": 1726910621, + "narHash": "sha256-g9c/jW5CUV7k9qVlhw0qez3VNtHkUm/3HPe001+UPMI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "0f18e6a6a591267c8b9e9a7b142f8073a4a91e61", + "rev": "e2c07baf7baadb727de0bced965f154d2a8c84a9", "type": "github" }, "original": { @@ -201,11 +201,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726858900, - "narHash": "sha256-4EI5BtmTC1KW/TEiqLtwnvHOdtdDiek7C55dnYwiv/E=", + "lastModified": 1726953717, + "narHash": "sha256-FwwoaRi8tatStzCkz7Wrdyv0XI+xKqPPc0iru1oNQCk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01e6f3a3316f32d8d792b96e263bab2ed14225b4", + "rev": "b1b7d7f3c5d3f898ca9646593cdeb378a655b446", "type": "github" }, "original": { @@ -229,11 +229,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1726688310, - "narHash": "sha256-Xc9lEtentPCEtxc/F1e6jIZsd4MPDYv4Kugl9WtXlz0=", + "lastModified": 1726838390, + "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dbebdd67a6006bb145d98c8debf9140ac7e651d0", + "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", "type": "github" }, "original": { @@ -281,11 +281,11 @@ ] }, "locked": { - "lastModified": 1726799228, - "narHash": "sha256-wn1leQyMAc/TrLRKcPc0GX6YtoziKQpc/MtZjPNiJ2Q=", + "lastModified": 1726885519, + "narHash": "sha256-wrXknshJMRLv91KQD5d7ovUqJ70FlDM7XeG/upSsKgM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ab150c7412db7bea5879ce2776718f53fba37aa2", + "rev": "a66e16cb21e4428224925dbf1b66238c727dda0a", "type": "github" }, "original": { diff --git a/nix/home-manager/progs/gpt4all/gpt4all.nix b/nix/home-manager/progs/gpt4all/gpt4all.nix index eb98434..7557f60 100644 --- a/nix/home-manager/progs/gpt4all/gpt4all.nix +++ b/nix/home-manager/progs/gpt4all/gpt4all.nix @@ -65,8 +65,8 @@ in # compile flags [ "-Ofast" - "-march=alderlake" - "-mtune=alderlake" + "-march=native" + "-mtune=native" "-fno-protect-parens" "-fno-finite-math-only" # https://github.com/ggerganov/llama.cpp/pull/7154#issuecomment-2143844461 ]