diff --git a/flake.lock b/flake.lock index 5e187c4..c1406a7 100644 --- a/flake.lock +++ b/flake.lock @@ -23,25 +23,6 @@ "type": "github" } }, - "crowe": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1723845581, - "narHash": "sha256-NmM1bhFtWiWrfFfRDCCRW9u9wu/2uX2qVPog7q8+zyI=", - "owner": "drmikecrowe", - "repo": "nur-packages", - "rev": "272d92f5b685c6e29db40b12c94ec856565da1cc", - "type": "github" - }, - "original": { - "owner": "drmikecrowe", - "ref": "overlay", - "repo": "nur-packages", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -412,11 +393,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -549,22 +530,6 @@ } }, "nixpkgs": { - "locked": { - "lastModified": 1712449641, - "narHash": "sha256-U9DDWMexN6o5Td2DznEgguh8TRIUnIl9levmit43GcI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "600b15aea1b36eeb43833a50b0e96579147099ff", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { "locked": { "lastModified": 1723282977, "narHash": "sha256-oTK91aOlA/4IsjNAZGMEBz7Sq1zBS0Ltu4/nIQdYDOg=", @@ -580,7 +545,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_2": { "locked": { "lastModified": 1723175592, "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", @@ -614,11 +579,11 @@ }, "nixunstable": { "locked": { - "lastModified": 1723637854, - "narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -636,7 +601,7 @@ "git-hooks": "git-hooks", "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -662,7 +627,7 @@ "git-hooks": "git-hooks_2", "home-manager": "home-manager_3", "nix-darwin": "nix-darwin_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix_2" }, @@ -683,11 +648,11 @@ }, "nurpkgs": { "locked": { - "lastModified": 1723825553, - "narHash": "sha256-M7w/KcMfA4iQE9dJrCRk/vbBBH2fbuJEeiu1pod7HwI=", + "lastModified": 1724159175, + "narHash": "sha256-3z9wRL+h+gTVFtecCUGrRaW6nvPPAtBCIDE9KAmZj7c=", "owner": "nix-community", "repo": "NUR", - "rev": "27fff3e7e6d489968a48a2348b712ffaaf04b50b", + "rev": "0b86d5643d99e3982471f0d79e553871c6f35396", "type": "github" }, "original": { @@ -721,7 +686,6 @@ "root": { "inputs": { "agenix": "agenix", - "crowe": "crowe", "darwin": "darwin_2", "flake-utils": "flake-utils", "hm": "hm", diff --git a/flake.nix b/flake.nix index de1ff0c..d6a4169 100644 --- a/flake.nix +++ b/flake.nix @@ -32,13 +32,10 @@ url = "github:nix-community/NixOS-WSL"; inputs.nixpkgs.follows = "nixunstable"; }; - - crowe.url = "github:drmikecrowe/nur-packages/overlay"; }; outputs = { agenix, - crowe, darwin, flake-utils, hm, @@ -61,7 +58,6 @@ pkg-sets local_overlay nurpkgs.overlay - crowe.overlays ]; in { diff --git a/modules/baseline.nix b/modules/baseline.nix index a054a77..04531d2 100644 --- a/modules/baseline.nix +++ b/modules/baseline.nix @@ -31,6 +31,9 @@ in nixpkgs.config = { allowUnfree = true; + permittedInsecurePackages = [ + "jitsi-meet-1.0.8043" + ]; }; # Base packages that need to be in all my hosts diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 3bff028..4bbe0f1 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,9 +1,9 @@ { config, pkgs, inputs, lib, ... }: let - x = if builtins.hasAttr "wrapper" pkgs.xonsh.passthru then - pkgs.xonsh.passthru.wrapper else - pkgs.xonsh; + x = if builtins.hasAttr "xonsh-unwrapped" pkgs then + pkgs.xonsh else + pkgs.xonsh.passthru.wrapper; in { imports = [ ../baseline.nix @@ -59,8 +59,8 @@ in { requests ruamel-yaml xonsh-apipenv - xonsh-direnv - xontrib-vox + pkgs.nur.repos.xonsh-xontribs.xonsh-direnv + pkgs.nur.repos.xonsh-xontribs.xontrib-vox ]); }); }; diff --git a/overlays/xonsh-direnv.nix b/overlays/xonsh-direnv.nix deleted file mode 100644 index 2d91acf..0000000 --- a/overlays/xonsh-direnv.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, pkgs}: - -buildPythonPackage rec { - pname = "xonsh-direnv"; - version = "1.6.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "Nt8Da1EtMVWZ9mbBDjys7HDutLYifwoQ1HVmI5CN2Ww="; - }; - - meta = with lib; { - description = "Direnv support for Xonsh"; - homepage = "https://github.com/74th/xonsh-direnv/"; - license = licenses.mit; - maintainers = []; - }; - - doCheck = false; - - nativeBuildInputs = [ - pkgs.git - ]; -} diff --git a/overlays/xonsh-vox.nix b/overlays/xonsh-vox.nix deleted file mode 100644 index 4b7802e..0000000 --- a/overlays/xonsh-vox.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pkgs}: - -buildPythonPackage rec { - pname = "xontrib-vox"; - version = "0.0.1"; - - src = fetchFromGitHub { - owner = "xonsh"; - repo = "xontrib-vox"; - rev = "0.0.1"; - hash = "sha256-OB1O5GZYkg7Ucaqak3MncnQWXhMD4BM4wXsYCDD0mhk="; - }; - - prePatch = '' - substituteInPlace pyproject.toml --replace '"xonsh>=0.12.5"' "" - ''; - - meta = with lib; { - description = "Direnv support for Xonsh"; - homepage = "https://github.com/74th/xonsh-direnv/"; - license = licenses.mit; - maintainers = []; - }; - - patchPhase = "sed -i -e 's/^dependencies.*$/dependencies = []/' pyproject.toml"; - - doCheck = false; - - nativeBuildInputs = [ - pkgs.git - ]; -}