From d4abd42b993a96f83b93b5ec71465a3adca02f2c Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Tue, 15 Jul 2025 13:11:29 -0400 Subject: [PATCH] misc updates --- flake.lock | 48 +++++++++++------------ modules/home/shell-conf.nix | 4 ++ modules/home/shell-conf/nushell/config.nu | 8 +++- overlays/rice.nix | 2 +- packages/rbw-latest.nix | 2 +- packages/rmpc-latest.nix | 4 +- 6 files changed, 38 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 564e72e..b6ac91d 100644 --- a/flake.lock +++ b/flake.lock @@ -111,11 +111,11 @@ ] }, "locked": { - "lastModified": 1752113600, - "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=", + "lastModified": 1752541678, + "narHash": "sha256-dyhGzkld6jPqnT/UfGV2oqe7tYn7hppAqFvF3GZTyXY=", "owner": "nix-community", "repo": "disko", - "rev": "79264292b7e3482e5702932949de9cbb69fedf6d", + "rev": "2bf3421f7fed5c84d9392b62dcb9d76ef09796a7", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1752513173, - "narHash": "sha256-sqyKxh/s9eQse5vhThpXqF/b5YHNEXxUxzc1VqQ5dfY=", + "lastModified": 1752596842, + "narHash": "sha256-I0aOu8Am3ehLccOSPAFrzXxdheqW90pMIsTe5yCbm/o=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "23f01b932e0f2f8c7a3f877da0add697cedda30c", + "rev": "6512601b23450a49e84d749bac0026fb94fa5456", "type": "github" }, "original": { @@ -628,11 +628,11 @@ ] }, "locked": { - "lastModified": 1752467539, - "narHash": "sha256-4kaR+xmng9YPASckfvIgl5flF/1nAZOplM+Wp9I5SMI=", + "lastModified": 1752595577, + "narHash": "sha256-slbA7OHi5Q/pl4Lx02EFHVFoAWbpcEYn8YyZTFxWbVs=", "owner": "nix-community", "repo": "home-manager", - "rev": "1e54837569e0b80797c47be4720fab19e0db1616", + "rev": "a1c0a3493867abb0a2da20528e4bff4366ed6fb4", "type": "github" }, "original": { @@ -935,11 +935,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1752521454, - "narHash": "sha256-dsRPUjy/8Wm5kkcQ5+6YvJ1b9Nlj1VDzGjunDvs42YU=", + "lastModified": 1752579552, + "narHash": "sha256-LNdJ3eiCDxBsHe/96Fk/uA29VihmX8Cv6TLTfe190q8=", "owner": "isd-project", "repo": "isd", - "rev": "816e95c50d11bce87a70d7356fc29d47ed497436", + "rev": "cc35c44de8663ab9e8ede3b48bdc6e7edba03a74", "type": "github" }, "original": { @@ -1054,11 +1054,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1752499009, - "narHash": "sha256-GODcHAfq7IWgD+kLPwV2QU6H+iowUJcwijHKvNrSx/g=", + "lastModified": 1752594965, + "narHash": "sha256-jvowoS/UKC+hkn4LHq+aTqs5SezkV+3dWFv0uOxN2UI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "61a97d3ee496bd5e29ec4c93eaf70a1bfc1fb326", + "rev": "abae750f59b12c93644164a5701a00b865ae5782", "type": "github" }, "original": { @@ -1087,11 +1087,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1752494307, - "narHash": "sha256-XLMw4kxrnuvz9BUfPE7DjAlcxS0FKHRnGPAwH5R/9Uw=", + "lastModified": 1752592751, + "narHash": "sha256-Kr//VcmUfgUOEzYhl4DI8d9OuKFcamG1sAc7wyg22J4=", "owner": "YaLTeR", "repo": "niri", - "rev": "56901eed5dbb51d9d669e8ea5a53868896ddeba4", + "rev": "0e3d078a85cec867aa3f49b9fe3d1261e36eb901", "type": "github" }, "original": { @@ -1256,11 +1256,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1752308619, - "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=", + "lastModified": 1752436162, + "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058", + "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8", "type": "github" }, "original": { @@ -2044,11 +2044,11 @@ ] }, "locked": { - "lastModified": 1752488611, - "narHash": "sha256-z10DN88OItOH58fDuC7LsChdwRU6Ut/01fU6/IQt1sg=", + "lastModified": 1752584655, + "narHash": "sha256-nPHrsq0vSh0+BqV2xAAVsfoVqzP9KYG7Zicc6oA0nfk=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "0af030205dcbc89c7de5ebc7fc4a10cbf1134c62", + "rev": "759a7860416dfd8c86f383d4ea4009bb034d869c", "type": "github" }, "original": { diff --git a/modules/home/shell-conf.nix b/modules/home/shell-conf.nix index dd5eb81..3cacccf 100644 --- a/modules/home/shell-conf.nix +++ b/modules/home/shell-conf.nix @@ -94,6 +94,10 @@ visidata vips ffmpegthumbnailer + + termsonic + + hydra-check ]; home.shellAliases = { diff --git a/modules/home/shell-conf/nushell/config.nu b/modules/home/shell-conf/nushell/config.nu index 129be3b..6d4ab23 100644 --- a/modules/home/shell-conf/nushell/config.nu +++ b/modules/home/shell-conf/nushell/config.nu @@ -28,16 +28,20 @@ def dirvish [pattern?: glob] { let eid = niri msg -j windows | from json | where title ends-with "Emacs" | $in.id | to text | into int emacsclient -r -n --eval $"\(dirvish \"($pattern | default '.')\"\)" | niri msg action focus-window --id $eid } - alias "dirv" = dirvish def magit [] { let eid = niri msg -j windows | from json | where title ends-with "Emacs" | $in.id | to text | into int pwd | emacsclient -r -n --eval $"\(magit \"($in)\"\)" | niri msg action focus-window --id $eid } - alias "mg" = magit +def kill-name [name] { + let p = pidof $name | into int + kill $p +} +alias "kn" = kill-name + # List the filenames, sizes, and modification times of items in a directory. @category filesystem @search-terms dir diff --git a/overlays/rice.nix b/overlays/rice.nix index 0e2abee..1a5c257 100644 --- a/overlays/rice.nix +++ b/overlays/rice.nix @@ -81,7 +81,7 @@ in { name = "Bibata-Modern-Classic"; size = 32; }; - corner-radius = 8.0; + corner-radius = 2.0; border-width = 2; }; } diff --git a/packages/rbw-latest.nix b/packages/rbw-latest.nix index f3baf4f..fa0c65f 100644 --- a/packages/rbw-latest.nix +++ b/packages/rbw-latest.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { owner = "doy"; repo = "rbw"; rev = "HEAD"; - hash = "sha256-ZgUjsfUZbvD4aJLS62sGIObzQZgdZg27sccTFvQFerk="; + hash = "sha256-LkxN4FDZ7Gcz8XDdVVdebOC87a0XiGqIZ69ppGX9urw="; }; cargoHash = "sha256-0LRDFT2ElhKtmSCrAeJ4YMUiVe7Ph1EGlmjqpn2GfXw="; diff --git a/packages/rmpc-latest.nix b/packages/rmpc-latest.nix index 32fc3e0..106c634 100644 --- a/packages/rmpc-latest.nix +++ b/packages/rmpc-latest.nix @@ -15,11 +15,11 @@ rustPlatform.buildRustPackage rec { owner = "mierak"; repo = "rmpc"; rev = "master"; - hash = "sha256-EFGC50H74liww9yF2GAIVnuy64CA6H7qoLqlqQ7n3j0="; + hash = "sha256-CY4But12+l/rqPNi7y382I+KQVshjXnR51pX35VeFHM="; }; useFetchCargoVendor = true; - cargoHash = "sha256-xXH/MRQgT/Je/aOCZ26vdC3PtlosXLIrjbOHtnvf9os="; + cargoHash = "sha256-ZHajqTkdw0wkNVws0fr9HFcC3JF1B6TuwP5CTGw/3nQ="; checkFlags = [ # Test currently broken, needs to be removed. See https://github.com/mierak/rmpc/issues/254