From cf8314dbd0988e354c61fb16175ef357aa8853b2 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Mon, 27 Oct 2025 17:44:50 +0530 Subject: [PATCH] chore: update flake.lock and improve hyprland bindings and neovim config --- flake.lock | 30 +++++++++++++++--------------- home/services/hyprland.nix | 21 +++++++++++++-------- neovim/default.nix | 17 +++++++++++++++++ 3 files changed, 45 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 924c043c..cd2d33db 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ "advisory-db_3": { "flake": false, "locked": { - "lastModified": 1735928634, - "narHash": "sha256-Qg1vJOuEohAbdRmTTOLrbbGsyK9KRB54r3+aBuOMctM=", + "lastModified": 1761495061, + "narHash": "sha256-AnWA+J43s6p3y2dorJeIp5F4P5gleHBLTS/pgEtdKfM=", "owner": "rustsec", "repo": "advisory-db", - "rev": "63a2f39924f66ca89cf5761f299a8a244fe02543", + "rev": "609733e128ab7d6c3ddc6f14e7c6e0fa8a35577e", "type": "github" }, "original": { @@ -411,11 +411,11 @@ }, "crane_3": { "locked": { - "lastModified": 1734808813, - "narHash": "sha256-3aH/0Y6ajIlfy7j52FGZ+s4icVX0oHhqBzRdlOeztqg=", + "lastModified": 1760924934, + "narHash": "sha256-tuuqY5aU7cUkR71sO2TraVKK2boYrdW3gCSXUkF4i44=", "owner": "ipetkov", "repo": "crane", - "rev": "72e2d02dbac80c8c86bf6bf3e785536acf8ee926", + "rev": "c6b4d5308293d0d04fcfeee92705017537cad02f", "type": "github" }, "original": { @@ -589,11 +589,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1739106638, - "narHash": "sha256-ksOqVRo/7L6/1YtfjDuYFfzHq3Y1iL7ZZQgoMo6HV/A=", + "lastModified": 1761564207, + "narHash": "sha256-mNRXD+bsn83AojRw3ZFcy8ucpX80xiWr3IlZZYW7Emg=", "owner": "uttarayan21", "repo": "ddcbacklight", - "rev": "1de1ac3bd0526138a2239b105386b9cf91d1a929", + "rev": "4e09ee2224da199f8d41078cbbf1179279341a49", "type": "github" }, "original": { @@ -2286,11 +2286,11 @@ ] }, "locked": { - "lastModified": 1731952509, - "narHash": "sha256-p4gB3Rhw8R6Ak4eMl8pqjCPOLCZRqaehZxdZ/mbFClM=", + "lastModified": 1737420293, + "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "7b5f051df789b6b20d259924d349a9ba3319b226", + "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9", "type": "github" }, "original": { @@ -3137,11 +3137,11 @@ ] }, "locked": { - "lastModified": 1735871325, - "narHash": "sha256-6Ta5E4mhSfCP6LdkzkG2+BciLOCPeLKuYTJ6lOHW+mI=", + "lastModified": 1761532837, + "narHash": "sha256-78mCSQgC/a6/0vWYrvE/g9E3gGsJLyBBGtmHe3ZOLG4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a599f011db521766cbaf7c2f5874182485554f00", + "rev": "4f5f89f1cfd8553b1285a4a0879ea1b2b05ad286", "type": "github" }, "original": { diff --git a/home/services/hyprland.nix b/home/services/hyprland.nix index e901206d..50226611 100644 --- a/home/services/hyprland.nix +++ b/home/services/hyprland.nix @@ -1,6 +1,7 @@ { pkgs, device, + lib, ... }: # lib.optionalAttrs device.isNix @@ -187,28 +188,32 @@ ]; bind = [ # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more - "$mainMod, Return, exec, ${pkgs.kitty}/bin/kitty" - "$mainModShift, Return, exec, ${pkgs.wezterm}/bin/wezterm" + "$mainMod, Return, exec, ${lib.getExe pkgs.kitty}" + "$mainModShift, Return, exec, ${lib.getExe pkgs.wezterm}" # "$mainModShift, Return, exec, ${pkgs.foot}/bin/foot" "$mainModShift, Q, killactive," - "$mainModShift, s, exec, ${pkgs.hyprshot}/bin/hyprshot -m region" + "$mainModShift, s, exec, ${lib.getExe pkgs.hyprshot} -m region" # "$mainMod, M, exit," "$mainModShift, f, togglefloating," "$mainModShift, f, pin" "$mainModShift, f, alterzorder, top" "$mainMod, f, fullscreen," "$mainMod, g, fullscreenstate,0,2" - "$mainMod, d, exec, ${pkgs.anyrun}/bin/anyrun" - "$mainMod, Space, exec, ${pkgs.anyrun}/bin/anyrun" + "$mainMod, d, exec, ${lib.getExe pkgs.anyrun}" + "$mainMod, Space, exec, ${lib.getExe pkgs.anyrun}" "$mainMod, p, pseudo, # dwindle" "$mainMod, v, togglesplit," # "$mainMod, a, exec, swaync-client -t" "$mainMod, Tab, cyclenext" # Audio ",xf86audiomute, exec, ${pkgs.swayosd}/bin/swayosd-client --output-volume mute-toggle" - # ",xf86audioprev, exec, /home/fs0c131y/.cargo/bin/mctl prev" - # ",xf86audionext, exec, /home/fs0c131y/.cargo/bin/mctl next" - # ",xf86audioplay, exec, /home/fs0c131y/.cargo/bin/mctl toggle" + # replace with later + # https://github.com/uttarayan21/mctl-rs + ",xf86audioprev, exec, ${lib.getExe pkgs.playerctl} previous" + ",xf86audionext, exec, ${lib.getExe pkgs.playerctl} next" + ",xf86audioplay, exec, ${lib.getExe pkgs.playerctl} play-pause" + ",xf86monbrightnessup, exec, ${lib.getExe pkgs.ddcbacklight} inc 10" + ",xf86monbrightnessdown, exec, ${lib.getExe pkgs.ddcbacklight} dec 10" # Screenshot # "$mainMod,Print, exec, grim" diff --git a/neovim/default.nix b/neovim/default.nix index 29d2ed09..4e2b482b 100644 --- a/neovim/default.nix +++ b/neovim/default.nix @@ -143,6 +143,20 @@ in { pattern = "?*"; command = "silent! loadview!"; } + { + event = ["FileType"]; + pattern = "json"; + callback = + rawLua + /* + lua + */ + '' + function(ev) + vim.bo[ev.buf].formatprg = "${pkgs.jq}/bin/jq" + end + ''; + } ]; plugins = { @@ -799,5 +813,8 @@ in { pkgs.sleek pkgs.graphqurl pkgs.sqls + pkgs.lua + pkgs.ripgrep + pkgs.nodejs-slim ]; }