From d268cc6fe4b8d92f8266d208c80387aeace38110 Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Mon, 12 Dec 2022 21:52:21 +0300 Subject: [PATCH] users/jan: add wd2 tool --- Makefile | 3 +- flake.lock | 55 +++++++++++++++++++++++++++++++------ flake.nix | 6 ++++ users/jan/default.nix | 1 + users/modules/dev_tools.nix | 1 + 5 files changed, 57 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 5f9892f..b07e68e 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,8 @@ NIX_LOCK := nix flake lock DEPS_MY := \ myneovim \ mytools \ - vnetod + vnetod \ + wd2 DEPS_NIXOS := \ nixpkgs \ diff --git a/flake.lock b/flake.lock index 51fc604..23f1cb0 100644 --- a/flake.lock +++ b/flake.lock @@ -365,11 +365,11 @@ "theme": "theme" }, "locked": { - "lastModified": 1670795343, - "narHash": "sha256-wWxKTFWwCI3k1KYqomwDe2xloItftK9HoHwH3bWRYW8=", + "lastModified": 1670871003, + "narHash": "sha256-7ts8j2O50UVP9jXeu9hN7VoepHekNxYU/PIMuvvxlaI=", "ref": "refs/heads/main", - "rev": "70c85a004f7866c992fe1574aac6d91981ddb984", - "revCount": 82, + "rev": "d576379760bbdda515efc973a2a11642ad8b263e", + "revCount": 83, "type": "git", "url": "https://git.pleshevski.ru/mynix/neovim" }, @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1670580878, - "narHash": "sha256-Vr5Jx60+WP8XNFzmKiEF9ndaYTdizbUTUgeT+1NuecA=", + "lastModified": 1670842919, + "narHash": "sha256-4SpFhzzGGg7yppVCZvx0rDdVScXc/m6rZe4BYnNoOQ4=", "ref": "refs/heads/main", - "rev": "52b6f8a4b9eef07978d060ac8411048c828c574c", - "revCount": 9, + "rev": "79301872e58bf199118ba163d95f54e6fbefcd75", + "revCount": 11, "type": "git", "url": "https://git.pleshevski.ru/mynix/tools" }, @@ -504,6 +504,20 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1670827406, + "narHash": "sha256-nLNk7uiLbhbvb4TVz67XK7+Ezr1zcWYDWmNrWGmEUqA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ffca9ffaaafb38c8979068cee98b2644bd3f14cb", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nlsp-settings-nvim": { "flake": false, "locked": { @@ -651,6 +665,7 @@ "nil": "nil", "nixpkgs": "nixpkgs_2", "vnetod": "vnetod", + "wd2": "wd2", "wired": "wired" } }, @@ -800,6 +815,30 @@ "url": "https://git.pleshevski.ru/pleshevskiy/vnetod" } }, + "wd2": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": "nixpkgs_3", + "tools": [ + "mytools" + ] + }, + "locked": { + "lastModified": 1670857190, + "narHash": "sha256-pKU663caEsBju+mVtql4c38HOj8iEoUlG0mP2z9u15E=", + "ref": "refs/heads/main", + "rev": "99f00a307c9ad626ee36c0eea3ba7b9c23035d38", + "revCount": 6, + "type": "git", + "url": "https://git.pleshevski.ru/pleshevskiy/wd2" + }, + "original": { + "type": "git", + "url": "https://git.pleshevski.ru/pleshevskiy/wd2" + } + }, "wired": { "inputs": { "alejandra": "alejandra", diff --git a/flake.nix b/flake.nix index 90aa89c..fea68fc 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,12 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-utils.follows = "flake-utils"; }; + # a wrapper for d2 tool + wd2 = { + url = "git+https://git.pleshevski.ru/pleshevskiy/wd2"; + inputs.tools.follows = "mytools"; + inputs.flake-utils.follows = "flake-utils"; + }; # tool to change .env faster vnetod = { diff --git a/users/jan/default.nix b/users/jan/default.nix index 3c2a067..c62fa8e 100644 --- a/users/jan/default.nix +++ b/users/jan/default.nix @@ -15,6 +15,7 @@ in nixpkgs.overlays = lib.mkAfter [ inputs.myneovim.overlays.default inputs.mytools.overlays.all + inputs.wd2.overlays.default inputs.nil.overlays.default inputs.vnetod.overlays.default inputs.wired.overlays.default diff --git a/users/modules/dev_tools.nix b/users/modules/dev_tools.nix index be4e306..61f624b 100644 --- a/users/modules/dev_tools.nix +++ b/users/modules/dev_tools.nix @@ -37,6 +37,7 @@ in ripgrep # a fuzzy finder vnetod # a tool to change env sections d2 # text to diagram + wd2 # my wrapper for d2 gnumake libnotify # tool to send notifications via cli