From 8b40db5f6ec58bf2df637e5f74ded835133f4c27 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Mon, 17 Mar 2025 14:14:36 -0400 Subject: [PATCH] changes --- etcnixos/flake.lock | 18 ++++++------- home-manager/flake.lock | 36 +++++++++++++------------- home-manager/progs/gpt4all/gpt4all.nix | 12 +++++++++ home-manager/progs/niri.nix | 4 +-- 4 files changed, 41 insertions(+), 29 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index fdc285e..3290937 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -34,11 +34,11 @@ ] }, "locked": { - "lastModified": 1741962175, - "narHash": "sha256-ZydxDII0DOv1Ut/QXFL9WtKLs9D+rS/khV8Nu0X+D3I=", + "lastModified": 1742213066, + "narHash": "sha256-zQHn+4moKz4XTf1qvGEi9eVABikPdnwFfOotqk9QMwE=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "30d7b193ce1e6d39390d7f6ffb700d33aedeffe6", + "rev": "be765082e305296cc99dc2f2ed031b1d10133233", "type": "github" }, "original": { @@ -315,11 +315,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1741792691, - "narHash": "sha256-f0BVt1/cvA0DQ/q3rB+HY4g4tKksd03ZkzI4xehC2Ew=", + "lastModified": 1742217307, + "narHash": "sha256-3fwpN7KN226ghLlpO9TR0/WpgQOmOj1e8bieUxpIYSk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e1f12151258b12c567f456d8248e4694e9390613", + "rev": "4f4d97d7b7be387286cc9c988760a7ebaa5be1f1", "type": "github" }, "original": { @@ -331,11 +331,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741851582, - "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index 4db8ad1..96a1c4e 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1741945905, - "narHash": "sha256-4rDjlQmeMrcJOZx4Crcnj/8C02dvO9y6AexM2UOZbH8=", + "lastModified": 1742220949, + "narHash": "sha256-ZlPrKLM0FWUP36MNCJYGTlN4ZvoXZ4WY/ENKoaGU6yg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "caef77a524e2e86ef578b83688a99a373bb9fc2c", + "rev": "5d8d116ac90f54e4c95bd5c9de31b8df477b12b9", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1741941540, - "narHash": "sha256-e3j+pdOUy4ZcjxUmlTNTOwKeQE1e2n1RQNvPA1g5nV0=", + "lastModified": 1742103165, + "narHash": "sha256-zAzMwvozlS2gmqdhrgeMz0PNp3kRDkwxIEfqWT3Hj6g=", "owner": "YaLTeR", "repo": "niri", - "rev": "b4922086ce298bb3d7806437c6dbea4a86f52c38", + "rev": "287480b541e85b13ff6419d372f82fa8e42c603c", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741851582, - "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "lastModified": 1742069588, + "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5", "type": "github" }, "original": { @@ -174,11 +174,11 @@ ] }, "locked": { - "lastModified": 1741919466, - "narHash": "sha256-xto0Oq+WItjDZvafo6ZVI4TZa6/2oxJHb0tkcSGVUJI=", + "lastModified": 1742178793, + "narHash": "sha256-S2onMdoDS4tIYd3/Jc5oFEZBr2dJOgPrh9KzSO/bfDw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "8b137260b776525542d47d3a4dbac753df478a42", + "rev": "954582a766a50ebef5695a9616c93b5386418c08", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1741910413, - "narHash": "sha256-z9bvteu0rf+xmUDj4VifN06XAFJZQGRSOvdN7rn/oDs=", + "lastModified": 1742083780, + "narHash": "sha256-cVLagXvI4jFbCe76tpvAWA2N2WF94Pl0PpgsGp2P6rM=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0325cb1f48a292d873a6844772cca00251cbf945", + "rev": "f9ec97b007547ad80147404335ed22e880dbd69d", "type": "github" }, "original": { @@ -242,11 +242,11 @@ ] }, "locked": { - "lastModified": 1741554872, - "narHash": "sha256-A/Iim9o0hHJjDJVynwtLzkox7NquvPc8CsJ/8OB4dDw=", + "lastModified": 1742180312, + "narHash": "sha256-67nyifSJu0TnXReokhA+pQhqswg0ZOp033k+QboSL8s=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "a4408170c5a2168bb79abcf587c5072e2ee5fb90", + "rev": "4dd2f79d89dc0ebbb1b3ebf96776383cc6d6989a", "type": "github" }, "original": { diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index 674dadd..106d123 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -16,6 +16,18 @@ let sha256 = "031b190e7aa81770b5d069de181dcfe4b284bf5d75fa12f82f5e54a3178adcfd"; }; } + + # https://github.com/nomic-ai/gpt4all/issues/3540 + # rec { + # name = "Gemma_3_27b_it"; + # filename = src.name; + # context_length = 131072; + # gen_length = 32768; + # src = pkgs.fetchurl { + # url = "https://huggingface.co/bartowski/google_gemma-3-27b-it-GGUF/resolve/main/google_gemma-3-27b-it-IQ4_XS.gguf"; + # sha256 = "bd2f188c66d8ccb0bffcb0c91e4dbbb72754bb1732e0bca323a2f266a35e01c8"; + # }; + # } ]; gpt4all_package = ( diff --git a/home-manager/progs/niri.nix b/home-manager/progs/niri.nix index 5645524..ecda129 100644 --- a/home-manager/progs/niri.nix +++ b/home-manager/progs/niri.nix @@ -6,7 +6,7 @@ }: { programs.niri = { - package = pkgs.niri-stable; + package = pkgs.niri; settings = { prefer-no-csd = true; @@ -92,7 +92,7 @@ { matches = [ { - app-id = "Zen Browser$"; + app-id = "zen$"; title = "^Picture-in-Picture$"; } ];