From 7bb0b8a312d020e9f6c88b323256f2c4ef78b8e6 Mon Sep 17 00:00:00 2001 From: Simon Gardling Date: Thu, 6 Feb 2025 11:35:35 -0500 Subject: [PATCH] a --- etcnixos/flake.lock | 6 +++--- home-manager/flake.lock | 18 +++++++++--------- home-manager/flake.nix | 26 +++++++++++++------------- home-manager/system-mreow.nix | 1 - 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/etcnixos/flake.lock b/etcnixos/flake.lock index 756bf62..9c0a390 100644 --- a/etcnixos/flake.lock +++ b/etcnixos/flake.lock @@ -294,11 +294,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1738815599, - "narHash": "sha256-gpDGrlNANp8+Ag7oAHiXtUIJ1kWHqTN/6G686PpkNl0=", + "lastModified": 1738816619, + "narHash": "sha256-5yRlg48XmpcX5b5HesdGMOte+YuCy9rzQkJz+imcu6I=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1f201fc627098d764ed00f736864ce673f5975e", + "rev": "2eccff41bab80839b1d25b303b53d339fbb07087", "type": "github" }, "original": { diff --git a/home-manager/flake.lock b/home-manager/flake.lock index cf254d4..3f7091b 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1738789832, - "narHash": "sha256-HdlMPfObPu5y7oDfH/w3vvlU3UTQ/bQjSULChZARm5M=", + "lastModified": 1738841109, + "narHash": "sha256-sEgE3nifaRU5gfAx33ds0tx/j+qM0/5/bHopv/w6c0c=", "owner": "nix-community", "repo": "home-manager", - "rev": "30ea6fed4e4b41693cebc2263373dd810de4de49", + "rev": "f99c704fe3a4cf8d72b2d568ec80bc38be1a9407", "type": "github" }, "original": { @@ -79,11 +79,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1738770770, - "narHash": "sha256-nfapp7C4BbdvHTRA1HSRVYjD5Fk2FCKoyxQLzcL5X50=", + "lastModified": 1738835520, + "narHash": "sha256-qvaWZ3PDJ0MC7t0wD8MdoGdVnMu0ps/ZWCXGepCFo5s=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "83abbde7c8164ee4b42a8647e4e61015c3f45816", + "rev": "4e72debdb5675b41278ddd492168b6c9c9ed09a0", "type": "github" }, "original": { @@ -112,11 +112,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1738768006, - "narHash": "sha256-56jDYr/vqX4fobMJO2nWLjih03i6UV5bKtxI0nR4ZZA=", + "lastModified": 1738827003, + "narHash": "sha256-s3bBfzPRRWybVSzRYStIwQxSOH5/9kR0Kfqi4IsvG7E=", "owner": "YaLTeR", "repo": "niri", - "rev": "690d6355057ebeba03cbd8ce4905145b834c72f8", + "rev": "b31c0359ebce114ae2f9b4e5df3dc37a93f5115e", "type": "github" }, "original": { diff --git a/home-manager/flake.nix b/home-manager/flake.nix index c549a7e..80b76cc 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -61,21 +61,21 @@ } ); - pkgs' = (import nixpkgs { }).applyPatches { - name = "gpt4all 3.9.0"; - src = inputs.nixpkgs; - patches = [ - (builtins.fetchurl { - url = "https://github.com/NixOS/nixpkgs/pull/372723.diff"; - sha256 = "1zzrs058i9p89qy8r22n8i5wff5s0s6w56c7d37nvs6b0jwp5qhm"; - }) - ]; - }; - - pkgs = (import pkgs' { }); + pkgs = ( + import ((import nixpkgs { }).applyPatches { + name = "gpt4all 3.9.0"; + src = inputs.nixpkgs; + patches = [ + (builtins.fetchurl { + url = "https://github.com/NixOS/nixpkgs/pull/372723.diff"; + sha256 = "1vq035iwmc8dhi4zfhgivm1vr14yjjv8fgp00dk5wh3j401p6s6k"; + }) + ]; + }) { } + ); in { - homeConfigurations.${username} = home-manager.lib.homeManagerConfiguration { + homeConfigurations."${username}" = home-manager.lib.homeManagerConfiguration { inherit pkgs; extraSpecialArgs = { inherit diff --git a/home-manager/system-mreow.nix b/home-manager/system-mreow.nix index a7354c7..be8dff3 100644 --- a/home-manager/system-mreow.nix +++ b/home-manager/system-mreow.nix @@ -60,5 +60,4 @@ in import ./progs/borg.nix { inherit homeDirectory borgPasswordFile; }; }; - }