Compare commits

..

5 commits

Author SHA1 Message Date
Antoine Martin aa26fcd611 overlays: remove chrysalis 2023-11-09 11:25:11 +01:00
Antoine Martin 4db861150a flake: allow insecure zotero package
marked insecure because of a chromium CVE
2023-11-09 11:25:04 +01:00
Antoine Martin c19bed53e4 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/b3ddf9649fdac7db15aeea95cb3114c13594d265' (2023-10-22)
  → 'github:NixOS/nixpkgs/41de143fda10e33be0f47eab2bfe08a50f234267' (2023-11-06)
2023-11-09 10:04:48 +01:00
Antoine Martin bfd439a2c4 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/80c1aab725151632ddc2a20caeb914e76dd0673c' (2023-10-18)
  → 'github:NixOS/nixpkgs/b3ddf9649fdac7db15aeea95cb3114c13594d265' (2023-10-22)
2023-10-25 18:42:11 +02:00
Antoine Martin 4ac09c1fb4 flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/bd1cde45c77891214131cbbea5b1203e485a9d51' (2023-10-11)
  → 'github:NixOS/nixpkgs/80c1aab725151632ddc2a20caeb914e76dd0673c' (2023-10-18)
2023-10-20 13:41:51 +02:00
4 changed files with 11 additions and 42 deletions

View file

@ -128,11 +128,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1696983906, "lastModified": 1699291058,
"narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", "narHash": "sha256-5ggduoaAMPHUy4riL+OrlAZE14Kh7JWX4oLEs22ZqfU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", "rev": "41de143fda10e33be0f47eab2bfe08a50f234267",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -89,7 +89,14 @@
[ [
agenix.nixosModules.default agenix.nixosModules.default
home-manager.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); ++ (nixpkgs.lib.attrValues self.nixosModules);
in { in {

View file

@ -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
'';
};
}

View file

@ -1,4 +1,3 @@
{ {
chrysalis = import ./chrysalis;
hugin = import ./hugin; hugin = import ./hugin;
} }