diff --git a/flake.lock b/flake.lock index 8bc63cf..423b329 100644 --- a/flake.lock +++ b/flake.lock @@ -128,11 +128,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1696983906, - "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", + "lastModified": 1699291058, + "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", + "rev": "41de143fda10e33be0f47eab2bfe08a50f234267", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c9aada9..f89408f 100644 --- a/flake.nix +++ b/flake.nix @@ -89,7 +89,14 @@ [ agenix.nixosModules.default home-manager.nixosModules.default - {nixpkgs.overlays = shared_overlays;} + { + nixpkgs = { + overlays = shared_overlays; + config.permittedInsecurePackages = [ + "zotero-6.0.26" + ]; + }; + } ] ++ (nixpkgs.lib.attrValues self.nixosModules); in { diff --git a/overlays/chrysalis/default.nix b/overlays/chrysalis/default.nix deleted file mode 100644 index ab21b0e..0000000 --- a/overlays/chrysalis/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -final: prev: { - chrysalis = let - pname = "chrysalis"; - version = "0.12.0"; - name = "${pname}-${version}-binary"; - in - prev.appimageTools.wrapAppImage rec { - inherit name; - - src = prev.appimageTools.extract { - inherit name; - src = prev.fetchurl { - url = "https://github.com/keyboardio/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; - sha256 = "sha256-sQoEO1UII4Gbp7UbHCCyejsd94lkBbi93TH325EamFc="; - }; - }; - - multiPkgs = null; - extraPkgs = p: - (prev.appimageTools.defaultFhsEnvArgs.multiPkgs p) - ++ [ - p.glib - ]; - - # Also expose the udev rules here, so it can be used as: - # services.udev.packages = [ pkgs.chrysalis ]; - # to allow non-root modifications to the keyboards. - - extraInstallCommands = '' - mv $out/bin/${name} $out/bin/${pname} - mkdir -p $out/lib/udev/rules.d - ln -s \ - --target-directory=$out/lib/udev/rules.d \ - ${src}/resources/static/udev/60-kaleidoscope.rules - ''; - }; -} diff --git a/overlays/default.nix b/overlays/default.nix index daf02d0..a11d035 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,4 +1,3 @@ { - chrysalis = import ./chrysalis; hugin = import ./hugin; }