From 517bedcee67426036f353dbd6ca5fb744bf65b9e Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Fri, 21 Jun 2024 13:07:15 +0530 Subject: [PATCH] feat: Replace bitwarden with 1passowrd --- flake.lock | 68 +++++++++++++++++++++++------------------------ neovim/flake.lock | 66 ++++++++++++++++++++++----------------------- neovim/flake.nix | 1 + neovim/nvim.nix | 13 ++++----- 4 files changed, 73 insertions(+), 75 deletions(-) diff --git a/flake.lock b/flake.lock index debd888d..f5d2ef68 100644 --- a/flake.lock +++ b/flake.lock @@ -1119,11 +1119,11 @@ ] }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1718825512, + "narHash": "sha256-nz7idS/SZWcTUGJ+lOFL+eJayrL/LpkUiy7+FxThAh4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "97c0dc865fe9a062c5970f4bcf55bb9e6028bcf5", "type": "github" }, "original": { @@ -1333,11 +1333,11 @@ ] }, "locked": { - "lastModified": 1718141734, - "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", + "lastModified": 1718526747, + "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", + "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", "type": "github" }, "original": { @@ -1588,11 +1588,11 @@ "neorg-telescope": { "flake": false, "locked": { - "lastModified": 1717607750, - "narHash": "sha256-GjbGyWB7xbeK8C8XiB9rzOWPZK8Re79WrZSWjMFS2RY=", + "lastModified": 1718775458, + "narHash": "sha256-VZbmetQyPHiduMlmHTaFQJZUt4bYPS5vxMc5dwHUBnE=", "owner": "nvim-neorg", "repo": "neorg-telescope", - "rev": "329ee31b8d92f252d880d8f607089eb89a1640b8", + "rev": "fe255a3432ce639de7a374ccfb8602f517244dcd", "type": "github" }, "original": { @@ -1604,11 +1604,11 @@ "neorg-telescope_2": { "flake": false, "locked": { - "lastModified": 1717607750, - "narHash": "sha256-GjbGyWB7xbeK8C8XiB9rzOWPZK8Re79WrZSWjMFS2RY=", + "lastModified": 1718775458, + "narHash": "sha256-VZbmetQyPHiduMlmHTaFQJZUt4bYPS5vxMc5dwHUBnE=", "owner": "nvim-neorg", "repo": "neorg-telescope", - "rev": "329ee31b8d92f252d880d8f607089eb89a1640b8", + "rev": "fe255a3432ce639de7a374ccfb8602f517244dcd", "type": "github" }, "original": { @@ -1657,7 +1657,7 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-0PhtpeVprW4ZaiIBxwhvhazJkxyCuBx+sLSXJDsFAWs=", + "narHash": "sha256-yRBVZzNXmwyU9rHp8pHa2Y2VnyXSGzDHXiriCcF8Uks=", "path": "./neovim", "type": "path" }, @@ -1669,11 +1669,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1718665877, - "narHash": "sha256-mpPuCdjNI1seuQIWTxDn5dOx4akS4tTr0dBATz1gaTk=", + "lastModified": 1718830254, + "narHash": "sha256-i9gT2EotCactVygg9lRwVajYGN0yVxSAVFoYV0O+Q18=", "owner": "neovim", "repo": "neovim", - "rev": "9d200c78a5e97720ba8a697c4cc0990fdafbc39f", + "rev": "38a1d41ac08d1fe5688cdcac1e1e181f0cd82a5f", "type": "github" }, "original": { @@ -1691,11 +1691,11 @@ ] }, "locked": { - "lastModified": 1717976995, - "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=", + "lastModified": 1718662658, + "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "315aa649ba307704db0b16c92f097a08a65ec955", + "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", "type": "github" }, "original": { @@ -2023,11 +2023,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1718656037, - "narHash": "sha256-uW9V+SZEAKWRpzF9o8Dl373Mmss83E16+iR1psvVq5Y=", + "lastModified": 1718863630, + "narHash": "sha256-uCIyaSkIA2CdvFUlDGz+XOYv7xV84cKF+Xz04Rpvf6k=", "owner": "nix-community", "repo": "nixvim", - "rev": "5755ff0958bdb511f9791545888084c0a2c5ad50", + "rev": "affee53852445727193138aa5d73bbc3839bcd43", "type": "github" }, "original": { @@ -2076,11 +2076,11 @@ ] }, "locked": { - "lastModified": 1718687251, - "narHash": "sha256-sU8bbHd+qKW83Wt0QjXkzZcofZbaHQCPD1ED1wv3vEE=", + "lastModified": 1718862900, + "narHash": "sha256-PfgT1eJm0EXcUuZk/Jz0zRDDW8WC7AfFuV/BmAu1AzE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "71d3564befbbaecf4eaf1b648a4f38f6a98e0edc", + "rev": "8cfca4b299e28d6167aacbd1bf71faee5cf857d2", "type": "github" }, "original": { @@ -2102,11 +2102,11 @@ "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1718633621, - "narHash": "sha256-Hlz0nKfekJZLrP2arjTqzdjcsA78WWVE7nnQGnel91k=", + "lastModified": 1718777958, + "narHash": "sha256-RY3youE2EYZ9LsAqC11ycBa6VSJCVH8ir6msrRaTZAQ=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "36cf0e5db3ae181061c1a654db310e1b9352a27c", + "rev": "d097fdcf013f9fdfeacbc10a9d796044b87c3ea4", "type": "github" }, "original": { @@ -2249,11 +2249,11 @@ "rest-nvim": { "flake": false, "locked": { - "lastModified": 1718032660, - "narHash": "sha256-9qLhXtnN/231B9nuCUBLQGewps5Eb0T/SUFMYGhfTpE=", + "lastModified": 1718835836, + "narHash": "sha256-bVm50Z4cNm+TKOZzY8i+3+8X9yqJ5Bd6/AP5qrrUMwo=", "owner": "rest-nvim", "repo": "rest.nvim", - "rev": "c7944769dc489b9e4bc493e40820c2818eab2569", + "rev": "e7843c55f9df6a9db9f97dac180035c6ff895a90", "type": "github" }, "original": { @@ -2768,11 +2768,11 @@ ] }, "locked": { - "lastModified": 1718139168, - "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=", + "lastModified": 1718522839, + "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1", + "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", "type": "github" }, "original": { diff --git a/neovim/flake.lock b/neovim/flake.lock index 08769d5e..881c7e7e 100644 --- a/neovim/flake.lock +++ b/neovim/flake.lock @@ -302,11 +302,11 @@ ] }, "locked": { - "lastModified": 1717664902, - "narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", + "lastModified": 1718825512, + "narHash": "sha256-nz7idS/SZWcTUGJ+lOFL+eJayrL/LpkUiy7+FxThAh4=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", + "rev": "97c0dc865fe9a062c5970f4bcf55bb9e6028bcf5", "type": "github" }, "original": { @@ -421,11 +421,11 @@ ] }, "locked": { - "lastModified": 1718141734, - "narHash": "sha256-cA+6l8ZCZ7MXGijVuY/1f55+wF/RT4PlTR9+g4bx86w=", + "lastModified": 1718526747, + "narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", "owner": "nix-community", "repo": "home-manager", - "rev": "892f76bd0aa09a0f7f73eb41834b8a904b6d0fad", + "rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", "type": "github" }, "original": { @@ -487,11 +487,11 @@ "neorg-telescope": { "flake": false, "locked": { - "lastModified": 1717607750, - "narHash": "sha256-GjbGyWB7xbeK8C8XiB9rzOWPZK8Re79WrZSWjMFS2RY=", + "lastModified": 1718775458, + "narHash": "sha256-VZbmetQyPHiduMlmHTaFQJZUt4bYPS5vxMc5dwHUBnE=", "owner": "nvim-neorg", "repo": "neorg-telescope", - "rev": "329ee31b8d92f252d880d8f607089eb89a1640b8", + "rev": "fe255a3432ce639de7a374ccfb8602f517244dcd", "type": "github" }, "original": { @@ -503,11 +503,11 @@ "neorg-telescope_2": { "flake": false, "locked": { - "lastModified": 1717607750, - "narHash": "sha256-GjbGyWB7xbeK8C8XiB9rzOWPZK8Re79WrZSWjMFS2RY=", + "lastModified": 1718775458, + "narHash": "sha256-VZbmetQyPHiduMlmHTaFQJZUt4bYPS5vxMc5dwHUBnE=", "owner": "nvim-neorg", "repo": "neorg-telescope", - "rev": "329ee31b8d92f252d880d8f607089eb89a1640b8", + "rev": "fe255a3432ce639de7a374ccfb8602f517244dcd", "type": "github" }, "original": { @@ -535,11 +535,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1718665877, - "narHash": "sha256-mpPuCdjNI1seuQIWTxDn5dOx4akS4tTr0dBATz1gaTk=", + "lastModified": 1718830254, + "narHash": "sha256-i9gT2EotCactVygg9lRwVajYGN0yVxSAVFoYV0O+Q18=", "owner": "neovim", "repo": "neovim", - "rev": "9d200c78a5e97720ba8a697c4cc0990fdafbc39f", + "rev": "38a1d41ac08d1fe5688cdcac1e1e181f0cd82a5f", "type": "github" }, "original": { @@ -556,11 +556,11 @@ ] }, "locked": { - "lastModified": 1717976995, - "narHash": "sha256-u3HBinyIyUvL1+N816bODpJmSQdgn0Mbb8BprFw7kqo=", + "lastModified": 1718662658, + "narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "315aa649ba307704db0b16c92f097a08a65ec955", + "rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", "type": "github" }, "original": { @@ -631,11 +631,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1718656037, - "narHash": "sha256-uW9V+SZEAKWRpzF9o8Dl373Mmss83E16+iR1psvVq5Y=", + "lastModified": 1718863630, + "narHash": "sha256-uCIyaSkIA2CdvFUlDGz+XOYv7xV84cKF+Xz04Rpvf6k=", "owner": "nix-community", "repo": "nixvim", - "rev": "5755ff0958bdb511f9791545888084c0a2c5ad50", + "rev": "affee53852445727193138aa5d73bbc3839bcd43", "type": "github" }, "original": { @@ -656,11 +656,11 @@ ] }, "locked": { - "lastModified": 1718687251, - "narHash": "sha256-sU8bbHd+qKW83Wt0QjXkzZcofZbaHQCPD1ED1wv3vEE=", + "lastModified": 1718862900, + "narHash": "sha256-PfgT1eJm0EXcUuZk/Jz0zRDDW8WC7AfFuV/BmAu1AzE=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "71d3564befbbaecf4eaf1b648a4f38f6a98e0edc", + "rev": "8cfca4b299e28d6167aacbd1bf71faee5cf857d2", "type": "github" }, "original": { @@ -681,11 +681,11 @@ "norg-meta": "norg-meta" }, "locked": { - "lastModified": 1718633621, - "narHash": "sha256-Hlz0nKfekJZLrP2arjTqzdjcsA78WWVE7nnQGnel91k=", + "lastModified": 1718777958, + "narHash": "sha256-RY3youE2EYZ9LsAqC11ycBa6VSJCVH8ir6msrRaTZAQ=", "owner": "nvim-neorg", "repo": "nixpkgs-neorg-overlay", - "rev": "36cf0e5db3ae181061c1a654db310e1b9352a27c", + "rev": "d097fdcf013f9fdfeacbc10a9d796044b87c3ea4", "type": "github" }, "original": { @@ -770,11 +770,11 @@ "rest-nvim": { "flake": false, "locked": { - "lastModified": 1718032660, - "narHash": "sha256-9qLhXtnN/231B9nuCUBLQGewps5Eb0T/SUFMYGhfTpE=", + "lastModified": 1718835836, + "narHash": "sha256-bVm50Z4cNm+TKOZzY8i+3+8X9yqJ5Bd6/AP5qrrUMwo=", "owner": "rest-nvim", "repo": "rest.nvim", - "rev": "c7944769dc489b9e4bc493e40820c2818eab2569", + "rev": "e7843c55f9df6a9db9f97dac180035c6ff895a90", "type": "github" }, "original": { @@ -889,11 +889,11 @@ ] }, "locked": { - "lastModified": 1718139168, - "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=", + "lastModified": 1718522839, + "narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1", + "rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", "type": "github" }, "original": { diff --git a/neovim/flake.nix b/neovim/flake.nix index f7ee2f19..5d92214d 100644 --- a/neovim/flake.nix +++ b/neovim/flake.nix @@ -75,6 +75,7 @@ import ./nvim.nix { pkgs = import nixpkgs { inherit system; + config.allowUnfree = true; overlays = import ./overlays.nix { inherit inputs; }; diff --git a/neovim/nvim.nix b/neovim/nvim.nix index c5a4b49d..4da05233 100644 --- a/neovim/nvim.nix +++ b/neovim/nvim.nix @@ -333,7 +333,7 @@ in rec { "hl" = "[[DevdocsToggle]]"; "" = "''"; "n" = "[[bnext]]"; - "o" = "[[TroubleToggle]]"; + "o" = "[[Trouble diagnostics]]"; "p" = "[[bprev]]"; "q" = "[[bw]]"; "mm" = "[[Neorg]]"; @@ -389,15 +389,12 @@ in rec { ]; extraConfigLua = let - codelldb = - if pkgs.stdenv.isLinux - then pkgs.vscode-extensions.vadimcn.vscode-lldb.adapter - else null; + codelldb = pkgs.vscode-extensions.vadimcn.vscode-lldb.adapter; liblldb = if pkgs.stdenv.isLinux then "${codelldb}/lldb/lib/liblldb.so" - # else if device.isMac then - # "${codelldb}/lldb/lib/liblldb.dylib" + else if pkgs.stdenv.isDarwin + then "${codelldb}/lldb/lib/liblldb.dylib" else null; in /* @@ -491,7 +488,7 @@ in rec { }) require('chatgpt').setup({ - api_key_cmd = "${pkgs.rbw}/bin/rbw get platform.openai.com", + api_key_cmd = "${pkgs._1password}/bin/op item get 'OpenAI API Token' --fields label=credential", }) -- require("gp").setup({ -- openai_api_key = { "${pkgs.rbw}/bin/rbw", "get", "platform.openai.com" },