diff --git a/flake.lock b/flake.lock index cadb6d5..db1f1b7 100644 --- a/flake.lock +++ b/flake.lock @@ -623,11 +623,11 @@ ] }, "locked": { - "lastModified": 1741791118, - "narHash": "sha256-4Y427uj0eql4yRU5rely3EcOlB9q457UDbG9omPtXiA=", + "lastModified": 1742670145, + "narHash": "sha256-xQ2F9f+ICAGBp/nNv3ddD2U4ZvzuLOci0u/5lyMXPvk=", "owner": "nix-community", "repo": "home-manager", - "rev": "18780912345970e5b546b1b085385789b6935a83", + "rev": "63e77d09a133ac641a0c204e7cfb0c97e133706d", "type": "github" }, "original": { @@ -761,11 +761,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1741170398, - "narHash": "sha256-l0oWdaphJuzGPePsOZG6YBwRxrGqrZPZ3Ee+QPrEEyY=", + "lastModified": 1742676311, + "narHash": "sha256-EZ+/JXbyE7r/e4tNftecWcWtzjb8YBOGLG75Z+rFgZg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "7db97394c187e2a23127a45bf7ce8b969055c0db", + "rev": "d56129adbc7cc099b44eb134d2c25e3e2201ec7f", "type": "github" }, "original": { @@ -794,11 +794,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1741001804, - "narHash": "sha256-rMc6olQE1pT8M9wxapgDLLROBgUUX11SmAcPMRSivsA=", + "lastModified": 1742641057, + "narHash": "sha256-+OhtlQPNOKmwK6YtAaXPu42jXe3ufi7hny78N8dqDKA=", "owner": "YaLTeR", "repo": "niri", - "rev": "26618f8d50dffda41791a211fd2aa02479a6d6a9", + "rev": "ed20822ce947198e4106698d7afffd0a832a7b3c", "type": "github" }, "original": { @@ -941,11 +941,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1741048562, - "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", + "lastModified": 1742512142, + "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", + "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", "type": "github" }, "original": { @@ -957,11 +957,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1741708242, - "narHash": "sha256-cNRqdQD4sZpN7JLqxVOze4+WsWTmv2DGH0wNCOVwrWc=", + "lastModified": 1742578646, + "narHash": "sha256-GiQ40ndXRnmmbDZvuv762vS+gew1uDpFwOfgJ8tLiEs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b62d2a95c72fb068aecd374a7262b37ed92df82b", + "rev": "94c4dbe77c0740ebba36c173672ca15a7926c993", "type": "github" }, "original": { @@ -1005,11 +1005,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1741513245, - "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -1117,11 +1117,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1741010256, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { @@ -1523,11 +1523,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1741140299, - "narHash": "sha256-Y2bPO92Yg5HcH5ORvrVOQb4wRGEapGEteHXGtNvboxk=", + "lastModified": 1742671548, + "narHash": "sha256-nJK70IyhyOXth5Dcyv7DKtv95TTZkqcAYHVj4Uq2Blw=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "10cb041a80bb815cc1789cfa305923f1f9e3713d", + "rev": "0fa13c6fb43ae26a597103989a42e44a03d2d827", "type": "github" }, "original": { @@ -1562,11 +1562,11 @@ "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1741838758, - "narHash": "sha256-nGTC/y9e+1+QIVCzIbiSpPiXM2HfS8YwIDCp52CcOQ4=", + "lastModified": 1742616341, + "narHash": "sha256-4/jpVPcN5VKomVhC/4KG0wU1KPxoDi1zVmu+GuuP6PU=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "03a7fc89bc48344aed00e01b409c1d6ffc4c52ce", + "rev": "33f2c77de9b296992436dc9e17c3580c727511a7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bf55c26..6f30f7a 100644 --- a/flake.nix +++ b/flake.nix @@ -67,7 +67,7 @@ lib = nixpkgs.lib; applyOverlays = { ... }: { - nixpkgs.overlays = lib.mkBefore overlays; + nixpkgs.overlays = lib.mkAfter overlays; }; nixpkgsAsRegistry_ = stable: { lib, ... }: { diff --git a/home/modules/programs/my-niri.nix b/home/modules/programs/my-niri.nix index 71ef4c1..dd4f7e1 100644 --- a/home/modules/programs/my-niri.nix +++ b/home/modules/programs/my-niri.nix @@ -384,7 +384,7 @@ in "Mod+Shift+Space".action = toggle-window-floating; # Sway compat "Print".action = screenshot; - "Ctrl+Print".action = screenshot-screen; + "Ctrl+Print".action.screenshot-screen = [ ]; "Shift+Print".action = screenshot-window; "Mod+Shift+E".action = quit; diff --git a/overlay.nix b/overlay.nix index cfadce4..164194e 100644 --- a/overlay.nix +++ b/overlay.nix @@ -82,6 +82,22 @@ let in builtins.replaceStrings [ "NIXOS_OZONE_WL" flagToReplace ] [ "WAYLAND_DISPLAY" "${flagToReplace} --wayland-text-input-version=3" ] 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 ]; + }); }; overlay-libs = final: prev: {