Add nurl, update runwhen, dadbod hotkeys

This commit is contained in:
Jeremy Wall 2023-09-27 13:39:06 -04:00
parent 7924194e97
commit 992afd2245
3 changed files with 54 additions and 16 deletions

View File

@ -3,8 +3,9 @@
nixpkgs.url = "github:nixos/nixpkgs/release-23.05"; nixpkgs.url = "github:nixos/nixpkgs/release-23.05";
sile-flake.url = "github:sile-typesetter/sile"; sile-flake.url = "github:sile-typesetter/sile";
durnitisp-flake.url = "github:zaphar/durnitisp"; durnitisp-flake.url = "github:zaphar/durnitisp";
runwhen-flake.url = "github:zaphar/runwhen/v0.0.8"; runwhen-flake.url = "github:zaphar/runwhen";
agenix-flake.url = "github:ryantm/agenix"; agenix-flake.url = "github:ryantm/agenix";
nurl-flake.url = "github:nix-community/nurl";
nil-flake = { nil-flake = {
url = "github:oxalica/nil"; url = "github:oxalica/nil";
#inputs.nixpkgs.follows = "nixpkgs"; #inputs.nixpkgs.follows = "nixpkgs";
@ -23,6 +24,7 @@
jj-flake, jj-flake,
agenix-flake, agenix-flake,
nil-flake, nil-flake,
nurl-flake,
... # We don't use the self or nixpkgs args here so we just glob it. ... # We don't use the self or nixpkgs args here so we just glob it.
}: { }: {
systemModule = system: let systemModule = system: let
@ -33,6 +35,7 @@
jj = jj-flake.packages."${system}".jujutsu; jj = jj-flake.packages."${system}".jujutsu;
age = agenix-flake.packages."${system}".default; age = agenix-flake.packages."${system}".default;
nil-pkg = nil-flake.packages."${system}".default; nil-pkg = nil-flake.packages."${system}".default;
nurl = nurl-flake.packages."${system}".default;
in { config, pkgs, ... }: let in { config, pkgs, ... }: let
nvim-treesitter-csharp = pkgs.callPackage ./nvim-treesitter-csharp.nix { nvim-treesitter-csharp = pkgs.callPackage ./nvim-treesitter-csharp.nix {
inherit (pkgs.tree-sitter) buildGrammar; inherit (pkgs.tree-sitter) buildGrammar;
@ -199,6 +202,7 @@ EOF";
durnitisp durnitisp
jj jj
age age
nurl
]; ];
}; };
}; };

View File

@ -482,7 +482,7 @@ vim.keymap.set("n", "<Leader>rg", telescope_builtins.live_grep)
vim.keymap.set("n", "<Leader>bl", function() telescope_builtins.buffers({}) end) vim.keymap.set("n", "<Leader>bl", function() telescope_builtins.buffers({}) end)
vim.keymap.set("n", "<Leader>rr", vim.lsp.codelens.run) vim.keymap.set("n", "<Leader>rr", vim.lsp.codelens.run)
vim.keymap.set("n", "<Leader>db", function() vim.keymap.set("n", "<Leader>tdb", function()
vim.cmd("DBUIToggle") vim.cmd("DBUIToggle")
end) end)

62
nix/darwin/flake.lock generated
View File

@ -29,18 +29,19 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nurl-flake": "nurl-flake",
"runwhen-flake": "runwhen-flake", "runwhen-flake": "runwhen-flake",
"rust-overlay-flake": "rust-overlay-flake", "rust-overlay-flake": "rust-overlay-flake",
"sile-flake": "sile-flake" "sile-flake": "sile-flake"
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-H09jff5oO+SJEtarZ9wN6oUNXC+Bfoss06zC8+Sj7Qc=", "narHash": "sha256-ge0QKt8Mmq+7YdLpqmFPrTQGrCD4qnST31sdkbaFydY=",
"path": "/nix/store/633s41d1mldrpqdihv9n98bnl30w2h03-source/nix/base-system", "path": "/nix/store/zdq6wjlqxwrd05vk17lgx3sr5fy8wn0w-source/nix/base-system",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/633s41d1mldrpqdihv9n98bnl30w2h03-source/nix/base-system", "path": "/nix/store/zdq6wjlqxwrd05vk17lgx3sr5fy8wn0w-source/nix/base-system",
"type": "path" "type": "path"
} }
}, },
@ -69,7 +70,7 @@
}, },
"darwin_2": { "darwin_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1692248770, "lastModified": 1692248770,
@ -355,7 +356,7 @@
}, },
"naersk_2": { "naersk_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1650101877, "lastModified": 1650101877,
@ -452,6 +453,22 @@
} }
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": {
"lastModified": 1689850295,
"narHash": "sha256-fUYf6WdQlhd2H+3aR8jST5dhFH1d0eE22aes8fNIfyk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1650109093, "lastModified": 1650109093,
"narHash": "sha256-tqlnKrAdJktRLXTou9le0oTqrYBAFpGscV5RADdpArU=", "narHash": "sha256-tqlnKrAdJktRLXTou9le0oTqrYBAFpGscV5RADdpArU=",
@ -465,7 +482,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_6": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1682109806, "lastModified": 1682109806,
"narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=", "narHash": "sha256-d9g7RKNShMLboTWwukM+RObDWWpHKaqTYXB48clBWXI=",
@ -481,7 +498,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_7": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1687274257, "lastModified": 1687274257,
"narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=",
@ -494,7 +511,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs_8": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1693932334, "lastModified": 1693932334,
"narHash": "sha256-7VhSLyAaenNlYzWT1dp70uJvrwHXu+Bmlvk5i1rpSC8=", "narHash": "sha256-7VhSLyAaenNlYzWT1dp70uJvrwHXu+Bmlvk5i1rpSC8=",
@ -510,11 +527,29 @@
"type": "github" "type": "github"
} }
}, },
"nurl-flake": {
"inputs": {
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1695751852,
"narHash": "sha256-4jG+8LPHteAAEfUOtlwK0piK79fQsAMp/SA6Lpob+JQ=",
"owner": "nix-community",
"repo": "nurl",
"rev": "715246bc9748cf196dafc7795812dec825e30b4b",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nurl",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"base-system": "base-system", "base-system": "base-system",
"darwin": "darwin_2", "darwin": "darwin_2",
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_9"
} }
}, },
"runwhen-flake": { "runwhen-flake": {
@ -524,16 +559,15 @@
"naersk": "naersk_2" "naersk": "naersk_2"
}, },
"locked": { "locked": {
"lastModified": 1692313277, "lastModified": 1695686584,
"narHash": "sha256-UOa7z6x6N6rldV2pnrHKftz/BbAiHAXlMUGlEfUUfAQ=", "narHash": "sha256-BQg2JwVRg0AUfgJwdCRpHcsA3OXfGVmIDs3P/G5AZ0M=",
"owner": "zaphar", "owner": "zaphar",
"repo": "runwhen", "repo": "runwhen",
"rev": "b69af94e5aa4b3e7a8ca92d0b372d60f8651bc12", "rev": "27cf79ffe4f381b9846c576a18c516382ef765ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "zaphar", "owner": "zaphar",
"ref": "v0.0.8",
"repo": "runwhen", "repo": "runwhen",
"type": "github" "type": "github"
} }
@ -620,7 +654,7 @@
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_6",
"gitignore": "gitignore", "gitignore": "gitignore",
"libtexpdf-src": "libtexpdf-src", "libtexpdf-src": "libtexpdf-src",
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1692759315, "lastModified": 1692759315,