diff --git a/home-manager/flake.lock b/home-manager/flake.lock index f31ebcb..4513103 100644 --- a/home-manager/flake.lock +++ b/home-manager/flake.lock @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1733873195, - "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", + "lastModified": 1733951607, + "narHash": "sha256-CN6q6iCzxI1gkNyk4xLdwaMKi10r7n+aJkRzWj8PXwQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", + "rev": "6e5b2d9e8014b5572e3367937a329e7053458d34", "type": "github" }, "original": { @@ -157,22 +157,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1733759999, - "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -253,7 +237,9 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { "lastModified": 1733840403, diff --git a/home-manager/flake.nix b/home-manager/flake.nix index 821e55b..4a6f7c4 100644 --- a/home-manager/flake.nix +++ b/home-manager/flake.nix @@ -26,7 +26,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - zen-browser.url = "github:0xc000022070/zen-browser-flake"; + zen-browser = { + url = "github:0xc000022070/zen-browser-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; diff --git a/home-manager/gui.nix b/home-manager/gui.nix index affeb05..a0c4d4f 100644 --- a/home-manager/gui.nix +++ b/home-manager/gui.nix @@ -97,6 +97,8 @@ epiphany mcaselector + + wireshark ] ++ (builtins.filter lib.isDerivation (builtins.attrValues nerd-fonts)); diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix index 85c988e..390afa2 100644 --- a/home-manager/no-gui.nix +++ b/home-manager/no-gui.nix @@ -132,6 +132,8 @@ git-crypt imagemagick + + nixpkgs-review ]; home.file.".cargo/config.toml".text = '' diff --git a/home-manager/progs/gpt4all/gpt4all.nix b/home-manager/progs/gpt4all/gpt4all.nix index d3e6a7f..a9a8cdf 100644 --- a/home-manager/progs/gpt4all/gpt4all.nix +++ b/home-manager/progs/gpt4all/gpt4all.nix @@ -15,15 +15,6 @@ let sha256 = "+AHt49no0qQ48MoNsqGJV4FeJ3Cf2hSZqTMjNUIHaO4="; }; } - { - name = "QwQ-32B-Preview-IQ4_XS.gguf"; - context_length = 32768; - gen_length = 8192; - source = pkgs.fetchurl { - url = "https://huggingface.co/bartowski/QwQ-32B-Preview-GGUF/resolve/main/QwQ-32B-Preview-IQ4_XS.gguf?download=true"; - sha256 = "0d4na9hyjmq2jan9svzpnjaq7khm86k049kn7yznfww4387c1gvw"; - }; - } ]; gpt4all_package = (