From 6029892d69da5083d0d84cd43b129082e8d0ff4f Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Mon, 14 Jul 2025 11:58:34 -0400 Subject: [PATCH] flake up, some small tweaks --- flake.lock | 42 +++++++++++------------ homes/emenel/default.nix | 6 +--- modules/home/emacs.nix | 1 + modules/home/niri.nix | 4 +++ modules/home/shell-conf/nushell/config.nu | 4 +-- 5 files changed, 29 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 519a9ba..9ee2590 100644 --- a/flake.lock +++ b/flake.lock @@ -171,11 +171,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1752428432, - "narHash": "sha256-0bXYgrc7ZsRn7SC2CRYuREGGZ4ZBhha04/NND0TmcNs=", + "lastModified": 1752460302, + "narHash": "sha256-/mdSXzHxi6ceep2mrH0UlUUO2enfPLQqRojbM+ZlPA4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9269c21c67d88d2d318d926a5a72ca9a157833e9", + "rev": "1741446afec9d812af576df394a2304f90e22257", "type": "github" }, "original": { @@ -628,11 +628,11 @@ ] }, "locked": { - "lastModified": 1752402455, - "narHash": "sha256-mCHfZhQKdTj2JhCFcqfOfa3uKZbwUkPQbd0/zPnhOE8=", + "lastModified": 1752467539, + "narHash": "sha256-4kaR+xmng9YPASckfvIgl5flF/1nAZOplM+Wp9I5SMI=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf893ad4cbf46610dd1b620c974f824e266cd1df", + "rev": "1e54837569e0b80797c47be4720fab19e0db1616", "type": "github" }, "original": { @@ -935,11 +935,11 @@ "uv2nix": "uv2nix" }, "locked": { - "lastModified": 1752431502, - "narHash": "sha256-uZmD+TO77qhNeOaalbD551A/p3/0HKisZgLQFA1jFnQ=", + "lastModified": 1752444886, + "narHash": "sha256-eImYyu9L7RMiskAsArngCKh35lkt7y9WYuIS4Z16RyA=", "owner": "isd-project", "repo": "isd", - "rev": "8210d452c0d418d99afb97fa29860bf11e7c9231", + "rev": "8e9d5291c0c7fdfacfa88cc70ee197a1b174309a", "type": "github" }, "original": { @@ -1054,11 +1054,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1752427523, - "narHash": "sha256-X9IUfU96VdzZvqKUN+7c5TlBrJq6Awr78F/lVAqqxHc=", + "lastModified": 1752499009, + "narHash": "sha256-GODcHAfq7IWgD+kLPwV2QU6H+iowUJcwijHKvNrSx/g=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "b6353f648217b0605d6ce4fd1a250d673a300503", + "rev": "61a97d3ee496bd5e29ec4c93eaf70a1bfc1fb326", "type": "github" }, "original": { @@ -1087,11 +1087,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1752418007, - "narHash": "sha256-3DyujBgCewh7r5fz4L0ZRw28BJBqfqeDSVpeTud/aEU=", + "lastModified": 1752494307, + "narHash": "sha256-XLMw4kxrnuvz9BUfPE7DjAlcxS0FKHRnGPAwH5R/9Uw=", "owner": "YaLTeR", "repo": "niri", - "rev": "bb40a35ccf6edbe2c838686562cbdad1ef98ce72", + "rev": "56901eed5dbb51d9d669e8ea5a53868896ddeba4", "type": "github" }, "original": { @@ -2023,11 +2023,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1752195622, - "narHash": "sha256-KLDPuWRfrz4Ri4QRv+D1yFSE6cIZ50uDWSFDZ/lZL1I=", + "lastModified": 1752505691, + "narHash": "sha256-kc52obJrTpkXIjT/r0f4Be78gy0QqbrzX7sTyrETirk=", "owner": "sxyazi", "repo": "yazi", - "rev": "6366e46c23da43f7aae7f083d00fd989321b9638", + "rev": "60a2382087f2327e4e48f662b71a862886a06423", "type": "github" }, "original": { @@ -2044,11 +2044,11 @@ ] }, "locked": { - "lastModified": 1752441511, - "narHash": "sha256-1CaGtMQ/UhlBfXzdDF2uK0yXPgzTy43qDYTQaV6GrjE=", + "lastModified": 1752488611, + "narHash": "sha256-z10DN88OItOH58fDuC7LsChdwRU6Ut/01fU6/IQt1sg=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "d9c8ac0065e977a6776bed89909d82d58b297c65", + "rev": "0af030205dcbc89c7de5ebc7fc4a10cbf1134c62", "type": "github" }, "original": { diff --git a/homes/emenel/default.nix b/homes/emenel/default.nix index bd382e3..89ee33e 100644 --- a/homes/emenel/default.nix +++ b/homes/emenel/default.nix @@ -1,8 +1,4 @@ -{ nix-config, config, lib, pkgs, inputs, ... }: -let - # scpath = "/home/emenel/.config/sops-nix/secrets"; -in -{ +{ nix-config, config, lib, pkgs, inputs, ... }:{ imports = with nix-config.homeModules; [ git-conf diff --git a/modules/home/emacs.nix b/modules/home/emacs.nix index a09d009..0814f7e 100644 --- a/modules/home/emacs.nix +++ b/modules/home/emacs.nix @@ -22,6 +22,7 @@ let parseedn parseclj track-changes + pretty-sha-path ])); in { programs.emacs = { diff --git a/modules/home/niri.nix b/modules/home/niri.nix index df6c4e3..bb33995 100644 --- a/modules/home/niri.nix +++ b/modules/home/niri.nix @@ -307,6 +307,10 @@ in hotkey-overlay.title = "Zen Browser"; action = spawn "zen"; }; + "${app-prefix}+G" = { + hotkey-overlay.title = "Dirvish"; + action = spawn ""; + }; "${app-prefix}+F" = { hotkey-overlay.title = "Yazi"; action = wez "yazi"; diff --git a/modules/home/shell-conf/nushell/config.nu b/modules/home/shell-conf/nushell/config.nu index a277058..129be3b 100644 --- a/modules/home/shell-conf/nushell/config.nu +++ b/modules/home/shell-conf/nushell/config.nu @@ -24,9 +24,9 @@ def pullall [] { for d in (nuls | where type == dir) { cd $d.name; print $d.name; git pull; cd .. } } -def dirvish [] { +def dirvish [pattern?: glob] { let eid = niri msg -j windows | from json | where title ends-with "Emacs" | $in.id | to text | into int - pwd | emacsclient -r -n --eval $"\(dirvish \"($in)\"\)" | niri msg action focus-window --id $eid + emacsclient -r -n --eval $"\(dirvish \"($pattern | default '.')\"\)" | niri msg action focus-window --id $eid } alias "dirv" = dirvish