From 88ce36b3af2b0a13f9e5c90f6b08710284916b3f Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Wed, 29 Apr 2026 17:24:25 +0200 Subject: [PATCH] Fix bluetooth --- flake.lock | 54 +++--- hosts/fuhen/hardware-configuration.nix | 2 +- modules/cli/tools/jujutsu.nix | 233 ++++++++++++++++++++++++- modules/wm/default.nix | 3 +- 4 files changed, 260 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index 3f0c99e..fe1a886 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1777678872, - "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=", + "lastModified": 1777988971, + "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16", + "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", "type": "github" }, "original": { @@ -44,11 +44,11 @@ ] }, "locked": { - "lastModified": 1777733408, - "narHash": "sha256-lyKV2GtkMPS1Mp8bKJ8sBr7LPCzL4GnVnQQYa4e7UsQ=", + "lastModified": 1778009629, + "narHash": "sha256-nUoQtf4Zq7DRYJrfv904hjrxjAlWVP6a1pNNFKx3FCg=", "owner": "nix-community", "repo": "home-manager", - "rev": "9ce9f7f128c5834bb71a4f5c62232187371379b6", + "rev": "00ed86e58bb6979a7921859fd1615d19382eac5c", "type": "github" }, "original": { @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1777681657, - "narHash": "sha256-LaHz8tExvJg1JT0RJubPjWffBWUmhX5uCQnIIbEp8SM=", + "lastModified": 1778025881, + "narHash": "sha256-sN4rYYhk5gK5CSqkO5p+eqFyBww4wXStUqdrKdedwMo=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "69942be4a5ffc37cd83f568ab5d1955721021eb5", + "rev": "139134f5ae988ee21ec268b743a7552e0e13bd76", "type": "github" }, "original": { @@ -122,11 +122,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1777655539, - "narHash": "sha256-csYI4zuLVyrebqsvJilUkHe7GC4KHpl5pNzO+CiOPLE=", + "lastModified": 1778023041, + "narHash": "sha256-sFr+wxSX3+IbKG428E5FenMEHWRYRy5epMutdUcPHF4=", "owner": "neovim", "repo": "neovim", - "rev": "085bb518c894a6b03aaf23ba81242c2c6126bea8", + "rev": "d0582fcc742ce61e5e22f19d7b097fb79ade40e7", "type": "github" }, "original": { @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1775037210, - "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=", + "lastModified": 1777780666, + "narHash": "sha256-8wURyQMdDkGUarSTKOGdCuFfYiwa3HbzwscUfn3STDE=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "06648f4902343228ce2de79f291dd5a58ee12146", + "rev": "8c62fba0854ba15c8917aed18894dbccb48a3777", "type": "github" }, "original": { @@ -162,11 +162,11 @@ ] }, "locked": { - "lastModified": 1777181277, - "narHash": "sha256-yVJbd07ortDRAttDFmDV5p220aOLTHgVAx//0nW/xW8=", + "lastModified": 1777787189, + "narHash": "sha256-2KUbS/HhzWW3kkkY1+RiWj9mJ76VEXw8lBJzcCFKzfY=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "b8eb7acee0f7604fe1bf6a5b3dcf5254369180fa", + "rev": "2dea2b920e7127b3afa8506713f23536651de312", "type": "github" }, "original": { @@ -195,11 +195,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1776983936, - "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=", + "lastModified": 1777917524, + "narHash": "sha256-k+LVe9YaO2BEPB9AaCtTtOMCeGi4dxDo6gt4Un3qoPY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61", + "rev": "df7783100babf59001340a7a874ba3824e441ecb", "type": "github" }, "original": { @@ -264,11 +264,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1777641297, - "narHash": "sha256-WNGcmeOZ8Tr9dq6ztCspYbzWFswr2mPebM9LpsfGxPk=", + "lastModified": 1777946660, + "narHash": "sha256-iw3XDIG6xxk+AZTcawCLHf6i9i4tXRzLZEoV9xhRToQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c6d65881c5624c9cae5ea6cedef24699b0c0a4c0", + "rev": "bc57abace07689cfd34203aa5fb4027514895987", "type": "github" }, "original": { @@ -316,11 +316,11 @@ "tmux": { "flake": false, "locked": { - "lastModified": 1777647669, - "narHash": "sha256-5jt9Ph6byfsbq6x87mcoWr2AV1R11yyeZSsoT9a2g/0=", + "lastModified": 1778052225, + "narHash": "sha256-Lf9MYTdW7CKtRMnkXu6QQL88x5EUxdOpQBVN/fgEbvA=", "owner": "tmux", "repo": "tmux", - "rev": "9a94f48663b037aa348fa789c04b2d10628b0a9d", + "rev": "2aad2cfc537480a7edd6eb670732b3227906f6aa", "type": "github" }, "original": { diff --git a/hosts/fuhen/hardware-configuration.nix b/hosts/fuhen/hardware-configuration.nix index 61095e4..0c44eea 100644 --- a/hosts/fuhen/hardware-configuration.nix +++ b/hosts/fuhen/hardware-configuration.nix @@ -53,7 +53,7 @@ swapDevices = [ { - device = "/nix/persist/var/cache/swapfile"; + device = "/nix/swapfile"; size = 64 * 1024; } ]; diff --git a/modules/cli/tools/jujutsu.nix b/modules/cli/tools/jujutsu.nix index 9becbed..cd2cfe6 100644 --- a/modules/cli/tools/jujutsu.nix +++ b/modules/cli/tools/jujutsu.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{ programs.jujutsu = { enable = true; settings = { @@ -45,5 +45,234 @@ }; }; }; - home.packages = with pkgs; [jjui]; + + programs.jjui = { + enable = true; + settings = { + bindings = [ + { + key = ["esc" "ctrl+c"]; + action = "ui.cancel"; + scope = "ui"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "help.cancel"; + scope = "help"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "help.cancel"; + scope = "help.filter"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "revset.cancel"; + scope = "revset"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.cancel"; + scope = "revisions"; + desc = "clear selection"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.quick_search.clear"; + scope = "revisions.quick_search"; + desc = "clear"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.rebase.cancel"; + scope = "revisions.rebase"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.squash.cancel"; + scope = "revisions.squash"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.revert.cancel"; + scope = "revisions.revert"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.duplicate.cancel"; + scope = "revisions.duplicate"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c" "left" "h"]; + action = "revisions.details.cancel"; + scope = "revisions.details"; + desc = "close"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.details.confirmation.cancel"; + scope = "revisions.details.confirmation"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.evolog.cancel"; + scope = "revisions.evolog"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.abandon.cancel"; + scope = "revisions.abandon"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.absorb.cancel"; + scope = "revisions.absorb"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.set_parents.cancel"; + scope = "revisions.set_parents"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.inline_describe.cancel"; + scope = "revisions.inline_describe"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.set_bookmark.cancel"; + scope = "revisions.set_bookmark"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.target_picker.cancel"; + scope = "revisions.target_picker"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.ace_jump.cancel"; + scope = "revisions.ace_jump"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "revisions.quick_search.input.cancel"; + scope = "revisions.quick_search.input"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "status.input.cancel"; + scope = "status.input"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "file_search.cancel"; + scope = "file_search"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "bookmarks.cancel"; + scope = "bookmarks"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "bookmarks.cancel"; + scope = "bookmarks.filter"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "git.cancel"; + scope = "git"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "git.cancel"; + scope = "git.filter"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "oplog.close"; + scope = "oplog"; + desc = "close"; + } + { + key = ["esc" "ctrl+c"]; + action = "oplog.quick_search.clear"; + scope = "oplog.quick_search"; + desc = "clear"; + } + { + key = ["esc" "ctrl+c"]; + action = "undo.cancel"; + scope = "undo"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "redo.cancel"; + scope = "redo"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "ui.cancel"; + scope = "diff"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "command_history.close"; + scope = "command_history"; + desc = "close"; + } + { + key = ["esc" "ctrl+c"]; + action = "input.cancel"; + scope = "input"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "password.cancel"; + scope = "password"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "choose.cancel"; + scope = "choose"; + desc = "cancel"; + } + { + key = ["esc" "ctrl+c"]; + action = "choose.cancel"; + scope = "choose.filter"; + desc = "cancel"; + } + ]; + }; + }; } diff --git a/modules/wm/default.nix b/modules/wm/default.nix index c71c4b2..e28d755 100644 --- a/modules/wm/default.nix +++ b/modules/wm/default.nix @@ -36,9 +36,8 @@ services.gnome.gnome-settings-daemon.enable = true; environment.systemPackages = with pkgs; [ - gnome-bluetooth + overskride polkit_gnome - blueman ]; security.pam.services.hyprlock = {};