feat(vicinae): update nixpkgs and adjust keybinding patch for Ctrl+N/P support
Some checks failed
Flake checker / Build Nix targets (push) Has been cancelled

This commit is contained in:
uttarayan21
2025-12-02 11:44:41 +05:30
parent 630c087308
commit 7e9a64023f
5 changed files with 58 additions and 4 deletions

20
flake.lock generated
View File

@@ -2947,6 +2947,22 @@
"type": "github"
}
},
"nixpkgs_13": {
"locked": {
"lastModified": 1764517877,
"narHash": "sha256-pp3uT4hHijIC8JUK5MEqeAWmParJrgBVzHLNfJDZxg4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2d293cbfa5a793b4c50d17c05ef9e385b90edf6c",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 315532800,
@@ -4534,9 +4550,7 @@
},
"vicinae": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"nixpkgs": "nixpkgs_13",
"systems": "systems_26"
},
"locked": {

View File

@@ -237,7 +237,7 @@
};
vicinae = {
url = "github:vicinaehq/vicinae";
inputs.nixpkgs.follows = "nixpkgs";
# inputs.nixpkgs.follows = "nixpkgs";
};
};

View File

@@ -1,4 +1,5 @@
{
pkgs,
inputs,
device,
...
@@ -8,5 +9,8 @@
enable = device.is "ryu";
autoStart = true;
extensions = [];
# package = pkgs.vicinae.overrideAttrs (old: {
# patches = [../../patches/vicinae-ctrl-np.patch];
# });
};
}

View File

@@ -285,6 +285,7 @@ in
inputs.rust-overlay.overlays.default
inputs.handoff.overlays.default
inputs.headplane.overlays.default
inputs.vicinae.overlays.default
jellyfin
libfprint
misc-applications

View File

@@ -0,0 +1,35 @@
diff --git a/vicinae/src/services/keybinding/keybinding-service.hpp b/vicinae/src/services/keybinding/keybinding-service.hpp
index 61b31590..1df8c548 100644
--- a/vicinae/src/services/keybinding/keybinding-service.hpp
+++ b/vicinae/src/services/keybinding/keybinding-service.hpp
@@ -22,28 +22,14 @@ public:
KeyBindingMode mode = getMode(keybinding);
if (!usesOnly(event, Qt::ControlModifier)) { return false; }
-
- switch (mode) {
- case KeyBindingMode::Default:
- return event->key() == Qt::Key_J;
- case KeyBindingMode::Emacs:
- return event->key() == Qt::Key_N;
- }
- return false;
+ return (event->key() == Qt::Key_N);
}
static bool isUpKey(QKeyEvent *event, const QString &keybinding) {
KeyBindingMode mode = getMode(keybinding);
if (!usesOnly(event, Qt::ControlModifier)) { return false; }
-
- switch (mode) {
- case KeyBindingMode::Default:
- return event->key() == Qt::Key_K;
- case KeyBindingMode::Emacs:
- return event->key() == Qt::Key_P;
- }
- return false;
+ return (event->key() == Qt::Key_P)
}
static bool isLeftKey(QKeyEvent *event, const QString &keybinding) {