From 5fa321a5eef7d7e6e2f3df554838eb155f970683 Mon Sep 17 00:00:00 2001 From: Dmitriy Pleshevskiy Date: Tue, 13 Dec 2022 10:13:15 +0300 Subject: [PATCH] bump my and nixos deps --- flake.lock | 71 ++++++++++++++++------------------------ flake.nix | 5 ++- users/modules/editor.nix | 17 ---------- 3 files changed, 33 insertions(+), 60 deletions(-) diff --git a/flake.lock b/flake.lock index 23f1cb0..e409f34 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1664140963, - "narHash": "sha256-pFxDtOLduRFlol0Y4ShE+soRQX4kbhaCNBtDOvx7ykw=", + "lastModified": 1665870395, + "narHash": "sha256-Tsbqb27LDNxOoPLh0gw2hIb6L/6Ow/6lIBvqcHzEKBI=", "owner": "ryantm", "repo": "agenix", - "rev": "6acb1fe5f8597d5ce63fc82bc7fcac7774b1cdf0", + "rev": "a630400067c6d03c9b3e0455347dc8559db14288", "type": "github" }, "original": { @@ -141,21 +141,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakeCompat": { "flake": false, "locked": { @@ -191,11 +176,11 @@ }, "hardware": { "locked": { - "lastModified": 1668334946, - "narHash": "sha256-omMbUj4r5DVBWh7KxkoO/Z/1V1shVR6Ls4jXNB4mr3U=", + "lastModified": 1670174919, + "narHash": "sha256-XdQr3BUnrvVLRFunLWrZORhwYHDG0+9jUUe0Jv1pths=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "e0452b33ab0ef16ffe075e980644ed92a6a200bb", + "rev": "9d87bc030a0bf3f00e953dbf095a7d8e852dab6b", "type": "github" }, "original": { @@ -213,11 +198,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1668332334, - "narHash": "sha256-YT1qcE/MCqBO1Bi/Yr6GcFpNKsvmzrBKh8juyXDbxQc=", + "lastModified": 1670513770, + "narHash": "sha256-muL74fsbGA8K8WlZSPNWddOiuBnC54kAajncX6nXrh4=", "owner": "nix-community", "repo": "home-manager", - "rev": "bc90de24d898655542589237cc0a6ada7564cb6c", + "rev": "054d9e3187ca00479e8036dc0e92900a384f30fd", "type": "github" }, "original": { @@ -341,7 +326,9 @@ "cmp-luasnip": "cmp-luasnip", "cmp-nvim-lsp": "cmp-nvim-lsp", "editorconfig-nvim": "editorconfig-nvim", - "flake-utils": "flake-utils_2", + "flake-utils": [ + "flake-utils" + ], "gitsigns-nvim": "gitsigns-nvim", "hop-nvim": "hop-nvim", "lspsaga-nvim": "lspsaga-nvim", @@ -365,11 +352,11 @@ "theme": "theme" }, "locked": { - "lastModified": 1670871003, - "narHash": "sha256-7ts8j2O50UVP9jXeu9hN7VoepHekNxYU/PIMuvvxlaI=", + "lastModified": 1670915352, + "narHash": "sha256-NmliOLv5LwZeXXWgrRg5BX8nuxlQeTzyYA1+BtGuZK8=", "ref": "refs/heads/main", - "rev": "d576379760bbdda515efc973a2a11642ad8b263e", - "revCount": 83, + "rev": "a84098dd911ea782757617207474633627aa2c00", + "revCount": 87, "type": "git", "url": "https://git.pleshevski.ru/mynix/neovim" }, @@ -388,11 +375,11 @@ ] }, "locked": { - "lastModified": 1670842919, - "narHash": "sha256-4SpFhzzGGg7yppVCZvx0rDdVScXc/m6rZe4BYnNoOQ4=", + "lastModified": 1670876233, + "narHash": "sha256-gYSGoErJsyIo7pi/eCyEyrzpWpNkJpPrhrB352BB8+A=", "ref": "refs/heads/main", - "rev": "79301872e58bf199118ba163d95f54e6fbefcd75", - "revCount": 11, + "rev": "f53eabdbf62eee6d0d4f392d26483aa65acba039", + "revCount": 12, "type": "git", "url": "https://git.pleshevski.ru/mynix/tools" }, @@ -459,11 +446,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1669387357, - "narHash": "sha256-z1azVj/5Em5kGhh9OgBOsjTEgMab7hXL/aRilH9tzyI=", + "lastModified": 1670827406, + "narHash": "sha256-nLNk7uiLbhbvb4TVz67XK7+Ezr1zcWYDWmNrWGmEUqA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "55b3f68bda6d4f4dc6092eed0508063f154fa4fd", + "rev": "ffca9ffaaafb38c8979068cee98b2644bd3f14cb", "type": "github" }, "original": { @@ -490,11 +477,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1668596599, - "narHash": "sha256-rhHyZTGI31/OfgYa9xF49UTchDXTI94pEsSNa0fOkpk=", + "lastModified": 1670751203, + "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b457130e8a21608675ddf12c7d85227b22a27112", + "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60", "type": "github" }, "original": { @@ -639,11 +626,11 @@ "plenary-nvim": { "flake": false, "locked": { - "lastModified": 1663402373, - "narHash": "sha256-d06QP5JGhpH6UUVF9STYzfJMzvg5HrJfDqlAoVXaLeM=", + "lastModified": 1664607953, + "narHash": "sha256-lIdBrVpi+vUudeotjFAuw4C0VT8TPoFE9cVVAQEsAYU=", "owner": "nvim-lua", "repo": "plenary.nvim", - "rev": "62dc2a7acd2fb2581871a36c1743b29e26c60390", + "rev": "4b7e52044bbb84242158d977a50c4cbcd85070c7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index fea68fc..a784c86 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,10 @@ url = "github:pleshevskiy/d2-vim?rev=f926fc066cd922c3c65aba9e2eed0b0b9c1567a1"; flake = false; }; - myneovim.url = "git+https://git.pleshevski.ru/mynix/neovim"; + myneovim = { + url = "git+https://git.pleshevski.ru/mynix/neovim"; + inputs.flake-utils.follows = "flake-utils"; + }; # my nix tools mytools = { diff --git a/users/modules/editor.nix b/users/modules/editor.nix index 711aa5b..d70b4bb 100644 --- a/users/modules/editor.nix +++ b/users/modules/editor.nix @@ -8,23 +8,6 @@ let enableTabby = true; enableOrgMode = true; extraPlugins = [ pkgs.vimPlugins.d2-vim ]; - grammarFileTypes = [ - "nix" - "lua" - "bash" - "yaml" - "json" - "rust" - "haskell" - "typescript" - "javascript" - "python" - "sql" - "html" - "pug" - "ledger" - "org" - ]; plugins = with pkgs.myneovim.nix2lua; { nvimTree.settings = { open_on_setup = true;