Skip to content

Commit 71215f2

Browse files
committed
update den
1 parent 9cbde95 commit 71215f2

4 files changed

Lines changed: 15 additions & 24 deletions

File tree

follows.nix

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,7 @@ inputs: {
33
nixpkgs-lib.follows = "nixpkgs";
44
helium.inputs.utils.follows = "flake-utils";
55

6-
den =
7-
if builtins.pathExists ../den.sini then
8-
{
9-
outPath = ../den.sini;
10-
}
11-
else
12-
{ };
13-
14-
flake-aspects =
15-
if builtins.pathExists ../flake-aspects then
16-
{
17-
outPath = ../flake-aspects;
18-
}
19-
else
20-
{ };
6+
# den.outPath = ../den.sini;
217

228
doom-emacs =
239
source:
@@ -27,6 +13,8 @@ inputs: {
2713
flake = false;
2814
};
2915

16+
enthium = source: source // { flake = false; };
17+
3018
# Shim nix-systems/default
3119
systems = inputs.nixpkgs.lib.systems.flakeExposed;
3220

modules/packages/edgevpn.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ let
1212
name = "edgevpn";
1313
src = inputs.edgevpn;
1414
doCheck = false;
15-
vendorHash = "sha256-75/HFvanyFhHFwkFx6PELR/6UxPLwWnyEDDWdwPpiAo=";
15+
vendorHash = "sha256-8lJKrKEKZhpym27xDWgoLxoNF0S+zMkG4hMDYxo4bIA=";
1616
meta.mainProgram = "edgevpn";
1717
};
1818
};

modules/vic/dots/config/jjui/config.lua

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ function first_hunk_new_lineno(git_diff)
1212
return nil
1313
end
1414

15-
function edit_from_details()
16-
local diff = jj("diff", "--git", "-r", context.change_id(), context.file())
17-
local line_number = first_hunk_new_lineno(diff)
18-
exec_shell(string.format("nvim +%q %q", line_number, context.file()))
15+
function edit_from_details(editor)
16+
return function()
17+
local diff = jj("diff", "--git", "-r", context.change_id(), context.file())
18+
local line_number = first_hunk_new_lineno(diff)
19+
exec_shell(string.format("%q +%q %q", editor, line_number, context.file()))
20+
end
1921
end
2022

2123
function diffpipe(tool)
@@ -83,7 +85,8 @@ function setup(config)
8385
{ desc = "delta diff", key = "d", scope = "revisions" }
8486
)
8587

86-
config.action("edit file", edit_from_details, { desc = "edit file", scope = "revisions.details", key = "e" })
88+
config.action("edit file", edit_from_details("vim"), { desc = "edit file", scope = "revisions.details", key = "e" })
89+
config.action("visual file", edit_from_details("vim-gui"), { desc = "visual file", scope = "revisions.details", key = "v" })
8790

8891
config.action(
8992
"diff file",

npins/sources.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
},
4949
"branch": "feat/fx-resolution",
5050
"submodules": false,
51-
"revision": "b078250e0a2b489681adc0ed78c33c1ecf91f33a",
52-
"url": "https://github.com/sini/den/archive/b078250e0a2b489681adc0ed78c33c1ecf91f33a.tar.gz",
53-
"hash": "sha256-n/rVrtxmTZjQPD9r6eW9yi0YBPPNL+cPLGrK3S42p7I="
51+
"revision": "c160af184853b87cbfa1ec384cb72b53170f2f9f",
52+
"url": "https://github.com/sini/den/archive/c160af184853b87cbfa1ec384cb72b53170f2f9f.tar.gz",
53+
"hash": "sha256-tFldZ+PKpU/2tuU4KuYC/Uq4JE5kc4yGCLuawTAshZw="
5454
},
5555
"doom-emacs": {
5656
"type": "Git",

0 commit comments

Comments
 (0)