diff --git a/flake.lock b/flake.lock index 31ace4d5..fc3f4fbf 100644 --- a/flake.lock +++ b/flake.lock @@ -169,11 +169,11 @@ ] }, "locked": { - "lastModified": 1698250431, - "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", + "lastModified": 1698670511, + "narHash": "sha256-jQIu3UhBMPHXzVkHQO1O2gg8SVo5lqAVoC6mOaLQcLQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", + "rev": "8e5416b478e465985eec274bc3a018024435c106", "type": "github" }, "original": { @@ -184,11 +184,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { @@ -246,11 +246,11 @@ ] }, "locked": { - "lastModified": 1698085074, - "narHash": "sha256-0lNNuIkkyG5FhJD/I9qIZ9dynZBWfIFSXe/YGUuEzSU=", + "lastModified": 1698499630, + "narHash": "sha256-OGJUX84240wSlhRyXjrJikXmHX1VeN2ZXvfdLvrAh0o=", "owner": "danth", "repo": "stylix", - "rev": "91e46dec675ec37fd3f9745754d10bb7e392db98", + "rev": "7a7987c7828050ef9a8ca6af07ca98485053776b", "type": "github" }, "original": { diff --git a/modules/packages.nix b/modules/packages.nix index 528fb3e0..563ba16f 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -57,7 +57,7 @@ rmlint sd smartmontools - visidata + # visidata scc hwinfo stress @@ -119,8 +119,12 @@ ]; nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "osu-lazer-bin-2023.1008.1" + "osu-lazer-bin-2023.1026.0" ]; environment.defaultPackages = [ ]; + + nixpkgs.config.permittedInsecurePackages = [ + "electron-24.8.6" # logseq + ]; } diff --git a/overlays/cmus.nix b/overlays/cmus.nix new file mode 100644 index 00000000..94ae8d66 --- /dev/null +++ b/overlays/cmus.nix @@ -0,0 +1,17 @@ +{ pkgs, ... }: + +{ + nixpkgs.overlays = [ + (final: prev: { + cmus = prev.cmus.overrideAttrs (oldAttrs: { + patches = (oldAttrs.patches or [ ]) ++ [ + # ffmpeg 6 fix https://github.com/cmus/cmus/pull/1254 + (pkgs.fetchpatch { + url = "https://github.com/cmus/cmus/commit/07b368ff1500e1d2957cad61ced982fa10243fbc.patch"; + hash = "sha256-5gsz3q8R9FPobHoLj8BQPsa9s4ULEA9w2VQR+gmpmgA="; + }) + ]; + }); + }) + ]; +} diff --git a/overlays/default.nix b/overlays/default.nix index 896eb990..ce57bf5d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,7 @@ { imports = [ ./alejandra.nix - ./fzf.nix + ./cmus.nix ./hyprnome.nix ./zola.nix ]; diff --git a/overlays/fzf.nix b/overlays/fzf.nix deleted file mode 100644 index 6bb43817..00000000 --- a/overlays/fzf.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ - nixpkgs.overlays = [ - (final: prev: { - fzf = prev.fzf.overrideAttrs (oldAttrs: { - postInstall = (oldAttrs.postInstall or "") + '' - cat << EOF > $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish - status is-interactive; or exit 0 - fzf_key_bindings - EOF - ''; - }); - }) - ]; -}