From 1a6c89eba99080d3b1704a6369952d40185722ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= Date: Sat, 27 Jul 2024 13:36:05 +0200 Subject: [PATCH] nixvim: remove broken + clipboard sharing setup --- flake.lock | 81 +++++++++++++++++++++++++------------ nixvim/config/base.nix | 3 -- nixvim/config/clipboard.nix | 6 +++ nixvim/config/default.nix | 2 +- 4 files changed, 62 insertions(+), 30 deletions(-) delete mode 100644 nixvim/config/base.nix create mode 100644 nixvim/config/clipboard.nix diff --git a/flake.lock b/flake.lock index c8dc01a..cb56447 100644 --- a/flake.lock +++ b/flake.lock @@ -2,7 +2,12 @@ "nodes": { "devshell": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": [ + "nixvim-flake", + "nixvim", + "nuschtosSearch", + "flake-utils" + ], "nixpkgs": [ "nixvim-flake", "nixvim", @@ -10,11 +15,11 @@ ] }, "locked": { - "lastModified": 1717408969, - "narHash": "sha256-Q0OEFqe35fZbbRPPRdrjTUUChKVhhWXz3T9ZSKmaoVY=", + "lastModified": 1721902368, + "narHash": "sha256-noQ5SghRPe0jzQEbFQb3fYbV6LZEzr7lIRQoxlU7fyI=", "owner": "numtide", "repo": "devshell", - "rev": "1ebbe68d57457c8cae98145410b164b5477761f4", + "rev": "cf8c7405479cfde7ea4dc815e195391d2328df10", "type": "github" }, "original": { @@ -82,11 +87,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -115,11 +120,11 @@ ] }, "locked": { - "lastModified": 1720524665, - "narHash": "sha256-ni/87oHPZm6Gv0ECYxr1f6uxB0UKBWJ6HvS7lwLU6oY=", + "lastModified": 1721042469, + "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8d6a17d0cdf411c55f12602624df6368ad86fac1", + "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", "type": "github" }, "original": { @@ -181,11 +186,11 @@ ] }, "locked": { - "lastModified": 1720734513, - "narHash": "sha256-neWQ8eNtLTd+YMesb7WjKl1SVCbDyCm46LUgP/g/hdo=", + "lastModified": 1721852138, + "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=", "owner": "nix-community", "repo": "home-manager", - "rev": "90ae324e2c56af10f20549ab72014804a3064c7f", + "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e", "type": "github" }, "original": { @@ -203,11 +208,11 @@ ] }, "locked": { - "lastModified": 1720845312, - "narHash": "sha256-yPhAsJTpyoIPQZJGC8Fw8W2lAXyhLoTn+HP20bmfkfk=", + "lastModified": 1721719500, + "narHash": "sha256-nnkqjv4Y37Hydjh6HE9wW4kSkV5Q7q4iIXlL5lwUFOw=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "5ce8503cf402cf76b203eba4b7e402bea8e44abc", + "rev": "884f3fe6d9bf056ba0017c132c39c1f0d07d4fec", "type": "github" }, "original": { @@ -260,11 +265,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1720768451, - "narHash": "sha256-EYekUHJE2gxeo2pM/zM9Wlqw1Uw2XTJXOSAO79ksc4Y=", + "lastModified": 1721743106, + "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7e7c39ea35c5cdd002cd4588b03a3fb9ece6fad9", + "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", "type": "github" }, "original": { @@ -283,14 +288,15 @@ "home-manager": "home-manager_2", "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_2", + "nuschtosSearch": "nuschtosSearch", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1721683528, - "narHash": "sha256-MbVWB/LsMxQ0VOi/ghyAM0LrhlDp3rdynIB+zYifp78=", + "lastModified": 1721946885, + "narHash": "sha256-b90iLj3d9tLz5/M8dDnhD5j9vAWjpoNn5WhCLnIwK/g=", "owner": "nix-community", "repo": "nixvim", - "rev": "901e8760d02b64e83c852d019a8599fea1c376ad", + "rev": "47b6c4804f69556dc22aa2a2e64721f216b69090", "type": "github" }, "original": { @@ -309,7 +315,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-IZ8aQPDWnkwtt5rVz9Ya+ezVQbcum1d1rdIs1WX5zh0=", + "narHash": "sha256-tnu4072GD9lOp31Erg0Xi6RKCqYCl+uZSnWsmQEY0/U=", "path": "./nixvim", "type": "path" }, @@ -318,6 +324,29 @@ "type": "path" } }, + "nuschtosSearch": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixvim-flake", + "nixvim", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721548975, + "narHash": "sha256-agCbztdk1f7nCUz03R6xdbivuBRuqubP2RHW+MNuRTg=", + "owner": "NuschtOS", + "repo": "search", + "rev": "551b031e2bc0bcc9584347a8da6312e57169661d", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "repo": "search", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", @@ -350,11 +379,11 @@ ] }, "locked": { - "lastModified": 1720818892, - "narHash": "sha256-f52x9srIcqQm1Df3T+xYR5P6VfdnDFa2vkkcLhlTp6U=", + "lastModified": 1721769617, + "narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b002f8a53ed04c1a4177e7b00809d57bd2c696f", + "rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009", "type": "github" }, "original": { diff --git a/nixvim/config/base.nix b/nixvim/config/base.nix deleted file mode 100644 index 9b8a869..0000000 --- a/nixvim/config/base.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - defaultEditor = true; -} diff --git a/nixvim/config/clipboard.nix b/nixvim/config/clipboard.nix new file mode 100644 index 0000000..2dd2be8 --- /dev/null +++ b/nixvim/config/clipboard.nix @@ -0,0 +1,6 @@ +{ + clipboard = { + providers.xsel.enable = true; + register = "unnamedplus"; + }; +} diff --git a/nixvim/config/default.nix b/nixvim/config/default.nix index 71d4bcf..f79f0e3 100644 --- a/nixvim/config/default.nix +++ b/nixvim/config/default.nix @@ -2,6 +2,6 @@ # Import all your configuration modules here imports = [ ./bufferline.nix - ./base.nix + ./clipboard.nix ]; }