From 42c3a5f41303d299fced089d01608ea0969af8f0 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Fri, 29 Dec 2023 21:42:12 -0500 Subject: [PATCH 01/13] chore: update lockfile --- flake.lock | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 62171fe..8d629d1 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1703887437, + "narHash": "sha256-awkp9jyXf8aV9eDWhLdKUqUdg9HfZKe0NdQebSiC0VA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "0a3afdc60042d8e1c2deb63bdfa017acc424a397", "type": "github" }, "original": { @@ -76,11 +76,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1700814205, - "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", + "lastModified": 1703367386, + "narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=", "owner": "rycee", "repo": "home-manager", - "rev": "aeb2232d7a32530d3448318790534d196bf9427a", + "rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1701998434, - "narHash": "sha256-AHJchP91Lfc6LyxGoiP9zdxUVsVLWeioE+LmJbOUZMM=", + "lastModified": 1703898959, + "narHash": "sha256-vBevlls+e3lS1hUlTVyp1SDIo0HBfYQljywP6qpHCpo=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "4d7b6fe4e29c0529d0a5f836ba41b93baa84f9e3", + "rev": "b67907fb7e477aceb16f87058df6daa53db1449c", "type": "github" }, "original": { @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1701722881, - "narHash": "sha256-Wim+dqT6W6nTdifu/jmToIzD7eCQaCEhDqDp5kexyfM=", + "lastModified": 1703646364, + "narHash": "sha256-uCj41nq4hnw5aItXJg4DUNpqLSCNRM3xHZbGo8dwoXs=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "5ee4fa3515de7b5609e6d161b800d91328a7a143", + "rev": "d72abaf29c40d8f6f9f527815c6dd24f76a50bd4", "type": "github" }, "original": { @@ -206,11 +206,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1701952659, - "narHash": "sha256-TJv2srXt6fYPUjxgLAL0cy4nuf1OZD4KuA1TrCiQqg0=", + "lastModified": 1703467016, + "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b4372c4924d9182034066c823df76d6eaf1f4ec4", + "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", "type": "github" }, "original": { @@ -237,11 +237,11 @@ }, "nur": { "locked": { - "lastModified": 1702050342, - "narHash": "sha256-dZzPltI6K4gL9QGUdWmX3j3e2iClZb+C3wG02ksBvcM=", + "lastModified": 1703900121, + "narHash": "sha256-YB7BXnPnwcOm7Uqa09/5yyGxliJm6vfd0KAId5InTzk=", "owner": "nix-community", "repo": "NUR", - "rev": "1a57d132af8e014fb4c2f30588ab61b3655d665e", + "rev": "0c482ca4bf19209dc57596182b0a67104e61e4a8", "type": "github" }, "original": { @@ -270,11 +270,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1702001829, - "narHash": "sha256-6gEVidNVqzTb06zIy2Gxhz9m6/jXyAgViRxfgEpZkQ8=", + "lastModified": 1703902408, + "narHash": "sha256-qXdWvu+tlgNjeoz8yQMRKSom6QyRROfgpmeOhwbujqw=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "c2a1dd067a928624c1aab36f976758c0722c79bd", + "rev": "319f57cd2c34348c55970a4bf2b35afe82088681", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "unstable": { "locked": { - "lastModified": 1701718080, - "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=", + "lastModified": 1703438236, + "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335", + "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", "type": "github" }, "original": { From ae0cdfbc5d3ac7668bfbe610495115126f22419a Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Mon, 8 Jan 2024 16:40:20 -0500 Subject: [PATCH 02/13] feat: add vim color scheme --- user/modules/nvim/lazy-lock.json | 1 + user/modules/nvim/lua/plugins/colors.lua | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 user/modules/nvim/lua/plugins/colors.lua diff --git a/user/modules/nvim/lazy-lock.json b/user/modules/nvim/lazy-lock.json index 8fa1bf1..69082e1 100644 --- a/user/modules/nvim/lazy-lock.json +++ b/user/modules/nvim/lazy-lock.json @@ -24,6 +24,7 @@ "mini.indentscope": { "branch": "main", "commit": "cbc07203ca8faae952ca373c1f6cc5881ce97af0" }, "mini.pairs": { "branch": "main", "commit": "6f6bd7ed5757b40bc29c73dac0d743e4e6978124" }, "mini.surround": { "branch": "main", "commit": "68ce058ef9716d7d955b79363845d2dd003d6500" }, + "monokai-pro.nvim": { "branch": "master", "commit": "b49795aa8a0cb6596660dae31ac10a43eff2d33b" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "0b9a83e6dc47513a81fd9086440d5638683f4f17" }, "neoconf.nvim": { "branch": "main", "commit": "00dcf2b81c45de1768b4171faa16729f0888cfb8" }, "neodev.nvim": { "branch": "main", "commit": "d617d9eb27e73e701e446874c6ea2cb528719260" }, diff --git a/user/modules/nvim/lua/plugins/colors.lua b/user/modules/nvim/lua/plugins/colors.lua new file mode 100644 index 0000000..c0bd750 --- /dev/null +++ b/user/modules/nvim/lua/plugins/colors.lua @@ -0,0 +1,11 @@ +return { + { + "loctvl842/monokai-pro.nvim", + + config = function() + require("monokai-pro").setup() + + vim.cmd([[colorscheme monokai-pro]]) + end, + }, +} From 9570c81a28ea77d446108c2bbe11581bf9011a5b Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Tue, 9 Jan 2024 14:15:50 -0500 Subject: [PATCH 03/13] feat: migrate homebrew packages to nix --- machines/mac/configuration.nix | 12 ++---------- user/environments/mac/home.nix | 4 ++-- user/modules/zsh.nix | 4 ++-- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/machines/mac/configuration.nix b/machines/mac/configuration.nix index a0f76b2..d3eea95 100644 --- a/machines/mac/configuration.nix +++ b/machines/mac/configuration.nix @@ -20,8 +20,6 @@ VISUAL = "nvim"; }; systemPackages = with pkgs; [ - # Terminal - git # Containers colima unstable.docker-client @@ -32,6 +30,8 @@ unstable.spicetify-cli # Java checkstyle + # XCode + cocoapods ]; }; @@ -63,21 +63,13 @@ # Upgrade outdated formulae on activation upgrade = true; }; - taps = [ - "ddev/ddev" - "homebrew/cask-fonts" - ]; brews = [ - "cocoapods" "openjdk@17" - "bash" # Required for nix-shell to function properly - "ddev/ddev/ddev" "firefoxpwa" ]; casks = [ "hiddenbar" "android-platform-tools" - "font-caskaydia-cove-nerd-font" "gcenx/wine/wineskin" ]; }; diff --git a/user/environments/mac/home.nix b/user/environments/mac/home.nix index 6e16c52..daa23f8 100644 --- a/user/environments/mac/home.nix +++ b/user/environments/mac/home.nix @@ -14,10 +14,10 @@ firebird-emu ]; - # Add homebrew applications to path programs.zsh = { + # Needed for nix-shell to have the correct bash version profileExtra = '' - PATH=/opt/homebrew/bin:$PATH + PATH=/run/current-system/sw/bin:$PATH ''; prezto.pmodules = [ "osx" diff --git a/user/modules/zsh.nix b/user/modules/zsh.nix index 7e48014..4073c7f 100644 --- a/user/modules/zsh.nix +++ b/user/modules/zsh.nix @@ -12,8 +12,8 @@ src = pkgs.fetchFromGitHub { owner = "chisui"; repo = "zsh-nix-shell"; - rev = "v0.1.0"; - sha256 = "0snhch9hfy83d4amkyxx33izvkhbwmindy0zjjk28hih1a9l2jmx"; + rev = "v0.8.0"; + sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7"; }; } { From 61e883ab3c353b1efa4f062ae81201a816b8f175 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Tue, 9 Jan 2024 14:25:25 -0500 Subject: [PATCH 04/13] chore: update lockfile --- flake.lock | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 8d629d1..7ecdfe0 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1703887437, - "narHash": "sha256-awkp9jyXf8aV9eDWhLdKUqUdg9HfZKe0NdQebSiC0VA=", + "lastModified": 1704277720, + "narHash": "sha256-meAKNgmh3goankLGWqqpw73pm9IvXjEENJloF0coskE=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "0a3afdc60042d8e1c2deb63bdfa017acc424a397", + "rev": "0dd382b70c351f528561f71a0a7df82c9d2be9a4", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1703367386, - "narHash": "sha256-FMbm48UGrBfOWGt8+opuS+uLBLQlRfhiYXhHNcYMS5k=", + "lastModified": 1704099619, + "narHash": "sha256-QRVMkdxLmv+aKGjcgeEg31xtJEIsYq4i1Kbyw5EPS6g=", "owner": "rycee", "repo": "home-manager", - "rev": "d5824a76bc6bb93d1dce9ebbbcb09a9b6abcc224", + "rev": "7e398b3d76bc1503171b1364c9d4a07ac06f3851", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1703898959, - "narHash": "sha256-vBevlls+e3lS1hUlTVyp1SDIo0HBfYQljywP6qpHCpo=", + "lastModified": 1704763209, + "narHash": "sha256-n++yFjIO8ZxAYCRgfY+82H/2Ng5GQ9vK8N+iq9wqVCs=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "b67907fb7e477aceb16f87058df6daa53db1449c", + "rev": "c4177ec6600af2f26fe5a8fd14605240130f8e56", "type": "github" }, "original": { @@ -175,11 +175,11 @@ ] }, "locked": { - "lastModified": 1703646364, - "narHash": "sha256-uCj41nq4hnw5aItXJg4DUNpqLSCNRM3xHZbGo8dwoXs=", + "lastModified": 1704677738, + "narHash": "sha256-3WYyt1QitK6+PNngv9QOn1GrxI42PXRDhC+FjAQBHP4=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "d72abaf29c40d8f6f9f527815c6dd24f76a50bd4", + "rev": "d8117453224ee4497573ed1b80f3bc62c68cf5be", "type": "github" }, "original": { @@ -206,11 +206,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703467016, - "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=", + "lastModified": 1704420045, + "narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a", + "rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d", "type": "github" }, "original": { @@ -237,11 +237,11 @@ }, "nur": { "locked": { - "lastModified": 1703900121, - "narHash": "sha256-YB7BXnPnwcOm7Uqa09/5yyGxliJm6vfd0KAId5InTzk=", + "lastModified": 1704818955, + "narHash": "sha256-andwUQj1sfSMYeZUJ5I++DzlSCK5IHD/U1ziD8cJt5g=", "owner": "nix-community", "repo": "NUR", - "rev": "0c482ca4bf19209dc57596182b0a67104e61e4a8", + "rev": "3db34f87f0972308898521c41a8bbcc4745066ea", "type": "github" }, "original": { @@ -270,11 +270,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1703902408, - "narHash": "sha256-qXdWvu+tlgNjeoz8yQMRKSom6QyRROfgpmeOhwbujqw=", + "lastModified": 1704766659, + "narHash": "sha256-Q2wQ9jzp4j96HokmhUQey+pyZMp4Fye/ZPSLtBBV1J8=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "319f57cd2c34348c55970a4bf2b35afe82088681", + "rev": "afa87241c19241aca9b7a9103635b82db2b147bb", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "unstable": { "locked": { - "lastModified": 1703438236, - "narHash": "sha256-aqVBq1u09yFhL7bj1/xyUeJjzr92fXVvQSSEx6AdB1M=", + "lastModified": 1704538339, + "narHash": "sha256-1734d3mQuux9ySvwf6axRWZRBhtcZA9Q8eftD6EZg6U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b", + "rev": "46ae0210ce163b3cba6c7da08840c1d63de9c701", "type": "github" }, "original": { From 8acc27488bb9d2c0abc4478ccd49afad30278229 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Tue, 9 Jan 2024 17:25:46 -0500 Subject: [PATCH 05/13] feat: install java using nix --- machines/mac/configuration.nix | 1 - user/modules/dev.nix | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/machines/mac/configuration.nix b/machines/mac/configuration.nix index d3eea95..9915023 100644 --- a/machines/mac/configuration.nix +++ b/machines/mac/configuration.nix @@ -64,7 +64,6 @@ upgrade = true; }; brews = [ - "openjdk@17" "firefoxpwa" ]; casks = [ diff --git a/user/modules/dev.nix b/user/modules/dev.nix index 63203e1..1ba51b5 100644 --- a/user/modules/dev.nix +++ b/user/modules/dev.nix @@ -34,6 +34,11 @@ enable = true; }; + programs.java = { + enable = true; + package = pkgs.jdk17; + }; + # Bun Git config programs.git = { attributes = [ From 07a7a343cb5d16ba50995fda123824464e655c09 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Tue, 9 Jan 2024 17:29:34 -0500 Subject: [PATCH 06/13] chore(mac): remove firefoxpwa --- machines/mac/configuration.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/machines/mac/configuration.nix b/machines/mac/configuration.nix index 9915023..c1b5328 100644 --- a/machines/mac/configuration.nix +++ b/machines/mac/configuration.nix @@ -63,9 +63,6 @@ # Upgrade outdated formulae on activation upgrade = true; }; - brews = [ - "firefoxpwa" - ]; casks = [ "hiddenbar" "android-platform-tools" From 0ef0b9daccaec044875c3fa89bab4dde2cec7728 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Tue, 9 Jan 2024 17:35:32 -0500 Subject: [PATCH 07/13] chore(mac): remove wineskin --- machines/mac/configuration.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/machines/mac/configuration.nix b/machines/mac/configuration.nix index c1b5328..d6fb55d 100644 --- a/machines/mac/configuration.nix +++ b/machines/mac/configuration.nix @@ -66,7 +66,6 @@ casks = [ "hiddenbar" "android-platform-tools" - "gcenx/wine/wineskin" ]; }; From 799695731081932ca9f0e7a2930cbf7040bc1bd9 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Wed, 10 Jan 2024 10:26:26 -0500 Subject: [PATCH 08/13] fix(vscode): use correct vue plugins --- user/modules/vscode.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/user/modules/vscode.nix b/user/modules/vscode.nix index 1181571..fc8bb00 100644 --- a/user/modules/vscode.nix +++ b/user/modules/vscode.nix @@ -50,7 +50,8 @@ in { astro-build.astro-vscode redwan-hossain.auto-rename-tag-clone bradlc.vscode-tailwindcss - johnsoncodehk.volar + vue.volar + pkgs.vscode-marketplace.vue.vscode-typescript-vue-plugin svelte.svelte-vscode dbaeumer.vscode-eslint esbenp.prettier-vscode From d1ae9c9bccccbd87211dc6bf81c75dd0eff85ebb Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Wed, 10 Jan 2024 10:26:36 -0500 Subject: [PATCH 09/13] feat(vscode): add direnv --- user/modules/vscode.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/user/modules/vscode.nix b/user/modules/vscode.nix index fc8bb00..a5bbfba 100644 --- a/user/modules/vscode.nix +++ b/user/modules/vscode.nix @@ -38,6 +38,7 @@ in { vscodevim.vim pkgs.vscode-marketplace.miguelsolorio.min-theme streetsidesoftware.code-spell-checker + mkhl.direnv # Git mhutchie.git-graph From 35cc2589a55f6af919a429fd9fdee6aed22635ed Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Wed, 10 Jan 2024 10:26:50 -0500 Subject: [PATCH 10/13] feat(vscode): add go plugin --- user/modules/vscode.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/user/modules/vscode.nix b/user/modules/vscode.nix index a5bbfba..13660df 100644 --- a/user/modules/vscode.nix +++ b/user/modules/vscode.nix @@ -63,6 +63,9 @@ in { # Dart / Flutter dart-code.dart-code + # Go + golang.go + # Java redhat.java vscjava.vscode-java-debug From 12db0368dc4e281cfcbac2fc6247fc274175ef43 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Wed, 10 Jan 2024 11:25:29 -0500 Subject: [PATCH 11/13] fix(vscode): use prettier as formatter for vue files --- user/modules/vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/user/modules/vscode/settings.json b/user/modules/vscode/settings.json index 34b080c..aa53396 100644 --- a/user/modules/vscode/settings.json +++ b/user/modules/vscode/settings.json @@ -130,7 +130,7 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[vue]": { - "editor.defaultFormatter": "dbaeumer.vscode-eslint" + "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[markdown]": { "editor.wordWrap": "bounded" From 953e81f06e11957850a46e92f49b5a1571da9467 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 11 Jan 2024 13:15:38 -0500 Subject: [PATCH 12/13] fix(fonts): remove google-fonts package was causing reloads on macos to freeze the whole system --- user/modules/fonts.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/user/modules/fonts.nix b/user/modules/fonts.nix index c0ddd68..724ad27 100644 --- a/user/modules/fonts.nix +++ b/user/modules/fonts.nix @@ -1,10 +1,7 @@ {pkgs, ...}: { home.packages = with pkgs; [ (nerdfonts.override {fonts = ["FiraCode"];}) - google-fonts inter cascadia-code ]; - - # fonts.fontconfig.enable = true; } From 73126cf39e24800515496fb1c705bbf05d0648de Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Fri, 12 Jan 2024 20:36:31 -0500 Subject: [PATCH 13/13] chore(nvim): update plugins --- user/modules/nvim/lazy-lock.json | 82 ++++++++++++++++---------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/user/modules/nvim/lazy-lock.json b/user/modules/nvim/lazy-lock.json index 69082e1..7a015db 100644 --- a/user/modules/nvim/lazy-lock.json +++ b/user/modules/nvim/lazy-lock.json @@ -1,52 +1,52 @@ { - "LazyVim": { "branch": "main", "commit": "e996eed750aabdfaa976357450f9ccbcd333a785" }, - "LuaSnip": { "branch": "master", "commit": "80a8528f084a97b624ae443a6f50ff8074ba486b" }, - "bufferline.nvim": { "branch": "main", "commit": "357cc8f8eeb64702e6fcf2995e3b9becee99a5d3" }, - "catppuccin": { "branch": "main", "commit": "dcef0a062de380885193fb0f919217d58b979753" }, + "LazyVim": { "branch": "main", "commit": "879e29504d43e9f178d967ecc34d482f902e5a91" }, + "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" }, + "bufferline.nvim": { "branch": "main", "commit": "e48ce1805697e4bb97bc171c081e849a65859244" }, + "catppuccin": { "branch": "main", "commit": "5e36ca599f4aa41bdd87fbf2c5aae4397ac55074" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "7f5ff6d253ae3543f186787bccafdc411d3f4b0a" }, - "dashboard-nvim": { "branch": "master", "commit": "c71cab740e2add248c54c458b5ca9d6e77c30fa6" }, - "dressing.nvim": { "branch": "master", "commit": "1f2d1206a03bd3add8aedf6251e4534611de577f" }, + "conform.nvim": { "branch": "master", "commit": "75e7c5c7eb5fbd53f8b12dc420b31ec70770b231" }, + "dashboard-nvim": { "branch": "master", "commit": "63df28409d940f9cac0a925df09d3dc369db9841" }, + "dressing.nvim": { "branch": "master", "commit": "94b0d24483d56f3777ee0c8dc51675f21709318c" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, - "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, - "gitsigns.nvim": { "branch": "main", "commit": "5a9a6ac29a7805c4783cda21b80a1e361964b3f2" }, - "indent-blankline.nvim": { "branch": "master", "commit": "2546441840172cc41e70f67c52e205cc7aa3e6ed" }, - "lazy.nvim": { "branch": "main", "commit": "4c75c8eeb957a99aa44ce8e526c04340ab358c5e" }, - "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "09be3766669bfbabbe2863c624749d8da392c916" }, - "mason.nvim": { "branch": "main", "commit": "cd7835b15f5a4204fc37e0aa739347472121a54c" }, - "mini.ai": { "branch": "main", "commit": "10ad2ed049fb681a829b44aeb23443c0a9c910ae" }, - "mini.bufremove": { "branch": "main", "commit": "f53c7f27e36009fe61563c11cde154b94a0e5b94" }, - "mini.comment": { "branch": "main", "commit": "e4320af992cd053a7da2f33d9f63a86c2ab6ce59" }, - "mini.indentscope": { "branch": "main", "commit": "cbc07203ca8faae952ca373c1f6cc5881ce97af0" }, - "mini.pairs": { "branch": "main", "commit": "6f6bd7ed5757b40bc29c73dac0d743e4e6978124" }, - "mini.surround": { "branch": "main", "commit": "68ce058ef9716d7d955b79363845d2dd003d6500" }, + "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" }, + "gitsigns.nvim": { "branch": "main", "commit": "4aaacbf5e5e2218fd05eb75703fe9e0f85335803" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, + "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, + "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" }, + "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, + "mini.ai": { "branch": "main", "commit": "f7787cff9cc42004f722ca1e64e6af4e64e34177" }, + "mini.bufremove": { "branch": "main", "commit": "020243bfed8c8b941f2c20626faf3ea39c0c0e1b" }, + "mini.comment": { "branch": "main", "commit": "67f00d3ebbeae15e84584d971d0c32aad4f4f3a4" }, + "mini.indentscope": { "branch": "main", "commit": "5a8369475cd7cd6f207a4d288406d03b0fc48bdb" }, + "mini.pairs": { "branch": "main", "commit": "552062017ff207e1f35f7028bfb3f27c7421d22d" }, + "mini.surround": { "branch": "main", "commit": "7bf8915ba15d7a4f3c2afe7868d3c15a858d73f1" }, "monokai-pro.nvim": { "branch": "master", "commit": "b49795aa8a0cb6596660dae31ac10a43eff2d33b" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "0b9a83e6dc47513a81fd9086440d5638683f4f17" }, - "neoconf.nvim": { "branch": "main", "commit": "00dcf2b81c45de1768b4171faa16729f0888cfb8" }, - "neodev.nvim": { "branch": "main", "commit": "d617d9eb27e73e701e446874c6ea2cb528719260" }, - "noice.nvim": { "branch": "main", "commit": "8f1b53ab85f83e0687d0f267085ad781ec240432" }, - "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, - "nvim-cmp": { "branch": "main", "commit": "d3a3056204e1a9dbb7c7fe36c114dc43b681768c" }, - "nvim-lint": { "branch": "master", "commit": "a4b0511a9e757e78c8c9f9d3f201e0d8ff158b42" }, - "nvim-lspconfig": { "branch": "master", "commit": "6428fcab6f3c09e934bc016c329806314384a41e" }, - "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, - "nvim-spectre": { "branch": "master", "commit": "696cff781a4a7ecc91549736835e2acbd00fe859" }, - "nvim-treesitter": { "branch": "master", "commit": "0b50cf159283855b72f4c6b22f5ba3c9cf813b37" }, - "nvim-treesitter-context": { "branch": "master", "commit": "8aa32aa6b84dda357849dbc0f775e69f2e04c041" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "eb208bfdfcf76efea0424747e23e44641e13aaa6" }, - "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" }, - "nvim-web-devicons": { "branch": "master", "commit": "f0267921c845c42685968401bc49aa65e18d3e09" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, + "neoconf.nvim": { "branch": "main", "commit": "64437787dba70fce50dad7bfbb97d184c5bc340f" }, + "neodev.nvim": { "branch": "main", "commit": "dde00106b9094f101980b364fae02fd85d357306" }, + "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, + "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, + "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, + "nvim-lint": { "branch": "master", "commit": "8df53b5dde8ea80f0a039775777eae6648a10229" }, + "nvim-lspconfig": { "branch": "master", "commit": "e47ccfae775f0d572ef0f3a7d245f043b259dafc" }, + "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" }, + "nvim-spectre": { "branch": "master", "commit": "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc" }, + "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" }, + "nvim-treesitter-context": { "branch": "master", "commit": "400a99ad43ac78af1148061da3491cba2637ad29" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" }, + "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" }, "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, - "telescope.nvim": { "branch": "master", "commit": "4522d7e3ea75ffddabdc39957168a8a7060b5df0" }, - "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" }, - "tokyonight.nvim": { "branch": "main", "commit": "531b04704fc9ff994d8b9c0720428fdc3c7d49d1" }, + "telescope.nvim": { "branch": "master", "commit": "da8b3d485975a8727bea127518b65c980521ae22" }, + "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, + "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },