From 4ac09c1fb4e9f3a769adc68c05bf0a764b4e2cc3 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Fri, 20 Oct 2023 13:41:51 +0200 Subject: [PATCH 1/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/bd1cde45c77891214131cbbea5b1203e485a9d51' (2023-10-11) → 'github:NixOS/nixpkgs/80c1aab725151632ddc2a20caeb914e76dd0673c' (2023-10-18) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8bc63cf..9c2e1c5 100644 --- a/flake.lock +++ b/flake.lock @@ -128,11 +128,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1696983906, - "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", + "lastModified": 1697655685, + "narHash": "sha256-79Kuv+QdgsVc+rkibuAgWHnh8IXrLBTOKg5nM0Qvux0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", + "rev": "80c1aab725151632ddc2a20caeb914e76dd0673c", "type": "github" }, "original": { From bfd439a2c491eecd3884e968acde4a691de3ca74 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 25 Oct 2023 18:42:11 +0200 Subject: [PATCH 2/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/80c1aab725151632ddc2a20caeb914e76dd0673c' (2023-10-18) → 'github:NixOS/nixpkgs/b3ddf9649fdac7db15aeea95cb3114c13594d265' (2023-10-22) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 9c2e1c5..d4256c8 100644 --- a/flake.lock +++ b/flake.lock @@ -128,11 +128,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1697655685, - "narHash": "sha256-79Kuv+QdgsVc+rkibuAgWHnh8IXrLBTOKg5nM0Qvux0=", + "lastModified": 1697957990, + "narHash": "sha256-LlyEQ4z1immaiZV+MQMUXM3KpNoRY/xZVm8mmN5j3yg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "80c1aab725151632ddc2a20caeb914e76dd0673c", + "rev": "b3ddf9649fdac7db15aeea95cb3114c13594d265", "type": "github" }, "original": { From c19bed53e491c365eeb8e0468c71537cade726af Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 9 Nov 2023 10:04:48 +0100 Subject: [PATCH 3/5] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/b3ddf9649fdac7db15aeea95cb3114c13594d265' (2023-10-22) → 'github:NixOS/nixpkgs/41de143fda10e33be0f47eab2bfe08a50f234267' (2023-11-06) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d4256c8..423b329 100644 --- a/flake.lock +++ b/flake.lock @@ -128,11 +128,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1697957990, - "narHash": "sha256-LlyEQ4z1immaiZV+MQMUXM3KpNoRY/xZVm8mmN5j3yg=", + "lastModified": 1699291058, + "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b3ddf9649fdac7db15aeea95cb3114c13594d265", + "rev": "41de143fda10e33be0f47eab2bfe08a50f234267", "type": "github" }, "original": { From 4db861150af8f08684ffc1812d7d769395fe5a26 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 9 Nov 2023 11:24:20 +0100 Subject: [PATCH 4/5] flake: allow insecure zotero package marked insecure because of a chromium CVE --- flake.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 { From aa26fcd6111380896b7598cbb1a991a6c8f4da82 Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Thu, 9 Nov 2023 11:25:11 +0100 Subject: [PATCH 5/5] overlays: remove chrysalis --- overlays/chrysalis/default.nix | 37 ---------------------------------- overlays/default.nix | 1 - 2 files changed, 38 deletions(-) delete mode 100644 overlays/chrysalis/default.nix 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; }