diff --git a/flake.lock b/flake.lock index 01ac464..6567c37 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1676910639, - "narHash": "sha256-YvZ2lQiUZrv5PCQ0nC/fn/0OT2ag8spCIOQx0COnFZ0=", + "lastModified": 1677453742, + "narHash": "sha256-/DNOThcCGz21Met/aMhm7NGqughtpxQzrlAqTuq+YZQ=", "owner": "ryantm", "repo": "agenix", - "rev": "5f66c8aa774d8d488cba1cdc4f0c954d2a14e3a1", + "rev": "4828951d9d05accd244bf8c24706f046b485aceb", "type": "github" }, "original": { @@ -91,23 +91,6 @@ "type": "github" } }, - "d2-vim": { - "flake": false, - "locked": { - "lastModified": 1669905564, - "narHash": "sha256-/g/j3Ny9GD5jSWziCu4mR6k1YpWSL3oBsTTKVdOZI90=", - "owner": "pleshevskiy", - "repo": "d2-vim", - "rev": "f926fc066cd922c3c65aba9e2eed0b0b9c1567a1", - "type": "github" - }, - "original": { - "owner": "pleshevskiy", - "repo": "d2-vim", - "rev": "f926fc066cd922c3c65aba9e2eed0b0b9c1567a1", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -195,11 +178,11 @@ }, "hardware": { "locked": { - "lastModified": 1676908974, - "narHash": "sha256-o7sJTBeumorVIM/b1b/Q4q+WJn8Rou5kx8DEBbKOZJI=", + "lastModified": 1677591639, + "narHash": "sha256-DMlAyge+u3K+JOFLA5YfdjqagdAYJf29YGBWpy5izg4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "157e1e4b127b5cb37822be247e8ec37a7f475270", + "rev": "77de4cd09db4dbee9551ed2853cfcf113d7dc5ce", "type": "github" }, "original": { @@ -217,11 +200,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1676892629, - "narHash": "sha256-rlvsqoSBO5dCwfnn7xvImYREidIPJaiFS3b54TZF4pU=", + "lastModified": 1677783711, + "narHash": "sha256-eq5mOVk3gv5HITtLhPjKwi8bFnOaQplA3X0WFgHnmxE=", "owner": "nix-community", "repo": "home-manager", - "rev": "72ce74d3eae78a6b31538ea7ebe0c1fcf4a10f7a", + "rev": "b9e3a29864798d55ec1d6579ab97876bb1ee9664", "type": "github" }, "original": { @@ -491,11 +474,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1676721149, - "narHash": "sha256-mN2EpTGxxVNnFZLoLWRwh6f7UWhXy4qE+wO2CZyrXps=", + "lastModified": 1677676435, + "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5f4e07deb7c44f27d498f8df9c5f34750acf52d2", + "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169", "type": "github" }, "original": { @@ -651,7 +634,6 @@ "root": { "inputs": { "agenix": "agenix", - "d2-vim": "d2-vim", "flake-utils": "flake-utils", "hardware": "hardware", "home-manager": "home-manager", diff --git a/flake.nix b/flake.nix index f66c7cc..ec9e682 100644 --- a/flake.nix +++ b/flake.nix @@ -27,11 +27,6 @@ }; # my neovim configuration - d2-vim = { - # url = "github:terrastruct/d2-vim"; - url = "github:pleshevskiy/d2-vim?rev=f926fc066cd922c3c65aba9e2eed0b0b9c1567a1"; - flake = false; - }; myneovim = { url = "git+https://git.pleshevski.ru/mynix/neovim"; inputs.flake-utils.follows = "flake-utils"; diff --git a/users/jan/default.nix b/users/jan/default.nix index c62fa8e..d4c7459 100644 --- a/users/jan/default.nix +++ b/users/jan/default.nix @@ -1,16 +1,5 @@ { config, pkgs, lib, inputs, extraHomeModule ? null, ... }: -let - d2-vim-overlay = final: prev: { - vimPlugins = prev.vimPlugins // { - d2-vim = prev.vimUtils.buildVimPluginFrom2Nix { - name = "vim-d2"; - src = inputs.d2-vim; - }; - }; - }; - -in { nixpkgs.overlays = lib.mkAfter [ inputs.myneovim.overlays.default @@ -19,7 +8,6 @@ in inputs.nil.overlays.default inputs.vnetod.overlays.default inputs.wired.overlays.default - d2-vim-overlay ]; programs.zsh.enable = true;