diff --git a/common.nix b/common.nix index 4d437a8..55915ae 100644 --- a/common.nix +++ b/common.nix @@ -38,6 +38,6 @@ with lib; # Nix options # Always have flakes enabled! nix.extraOptions = '' - experimental-features = nix-command flakes repl-flake + experimental-features = nix-command flakes ''; } diff --git a/flake.lock b/flake.lock index 6c5b94a..92467b7 100644 --- a/flake.lock +++ b/flake.lock @@ -465,11 +465,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -685,15 +685,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1737234286, - "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=", - "rev": "2837da71ec1588c1187d2e554719b15904a46c8b", + "lastModified": 1746827285, + "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=", + "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz" } }, "lix-module": { @@ -706,15 +706,15 @@ ] }, "locked": { - "lastModified": 1737237494, - "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", - "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", + "lastModified": 1746838955, + "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", + "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz" } }, "mpd-mpris": { diff --git a/flake.nix b/flake.nix index c054cb2..43e0607 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ }; arion.url = "github:hercules-ci/arion/v0.2.2.0"; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/overlay.nix b/overlay.nix index d0043fc..d40fc5f 100644 --- a/overlay.nix +++ b/overlay.nix @@ -82,21 +82,6 @@ let attrs.postFixup; }); - editline-lix = - assert final.lib.assertMsg (final.lix.version == "2.92.0") "we only need to patch this for 2.92"; - final.editline.overrideAttrs (prev: { - configureFlags = (prev.configureFlags or [ ]) ++ [ - # Enable SIGSTOP (Ctrl-Z) behavior. - (final.lib.enableFeature true "sigstop") - # Enable ANSI arrow keys. - (final.lib.enableFeature true "arrow-keys") - # Use termcap library to query terminal size. - (final.lib.enableFeature true "termcap") - ]; - - propagatedBuildInputs = (prev.propagatedBuildInputs or [ ]) ++ [ final.ncurses ]; - }); - rofi-wayland-unwrapped = assert final.lib.assertMsg (builtins.compareVersions prev.rofi-wayland-unwrapped.version "1.7.8+wayland1" <= 0)