Merge branch 'main' into bump-brave-version

raba-jp · Jul 10, 2023 · bf376e8 · bf376e8
2 parents 92ff7ac + 4754ef1
commit bf376e8
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 11 deletions.
diff --git a/home/features/cli.nix b/home/features/cli.nix
@@ -66,6 +66,7 @@
       outputs.packages.${pkgs.system}.devenv
       nil
       gobang
+      efm-langserver
     ];
   };
 

diff --git a/home/features/git.nix b/home/features/git.nix
@@ -6,6 +6,8 @@
     userName = "Hiroki Sakuraba";
 
     extraConfig = {
+      credential."https://github.com".helper = "!gh auth git-credential";
+
       core = {
         editor = "nvim";
 

diff --git a/home/features/neovim/lua/plugins/coding.lua b/home/features/neovim/lua/plugins/coding.lua
@@ -242,4 +242,9 @@ return {
 			},
 		},
 	},
+	{
+		"NeogitOrg/neogit",
+		cmd = "Neogit",
+		dependencies = "nvim-lua/plenary.nvim",
+	},
 }
diff --git a/home/features/neovim/lua/plugins/editor.lua b/home/features/neovim/lua/plugins/editor.lua
@@ -29,7 +29,7 @@ return {
 	},
 	{
 		"lewis6991/gitsigns.nvim",
-		event = "BufReadPre",
+		event = "VeryLazy",
 		config = true,
 	},
 	{

diff --git a/home/features/neovim/lua/plugins/lsp.lua b/home/features/neovim/lua/plugins/lsp.lua
@@ -23,6 +23,17 @@ return {
 		opts = function()
 			return {
 				servers = {
+					efm = {
+						init_options = { documentFormatting = true },
+						settings = {
+							rootMarkers = { ".git/" },
+							languages = {
+								lua = {
+									{ formatCommand = "stylua -", formatStdin = true },
+								},
+							},
+						},
+					},
 					bashls = {},
 					bufls = {},
 					clojure_lsp = {},
@@ -153,7 +164,6 @@ return {
 			null_ls.setup({
 				-- on_attach = require("lsp-format").on_attach,
 				sources = {
-					null_ls.builtins.formatting.stylua,
 					null_ls.builtins.formatting.alejandra,
 					null_ls.builtins.formatting.buildifier,
 					null_ls.builtins.formatting.cljstyle,

diff --git a/home/features/neovim/lua/plugins/treesitter.lua b/home/features/neovim/lua/plugins/treesitter.lua
@@ -2,15 +2,8 @@ return {
 	"nvim-treesitter/nvim-treesitter",
 	version = false,
 	build = ":TSUpdate",
-	event = "BufReadPost",
-	dependencies = {
-		"nvim-treesitter/nvim-treesitter-context",
-		config = function()
-			require("treesitter-context").setup({
-				enable = true,
-			})
-		end,
-	},
+	event = "VeryLazy",
+	dependencies = {},
 	opts = {
 		highlight = { enable = true },
 		indent = { enable = true },
@@ -74,4 +67,15 @@ return {
 			desc = "Decremental selection for node",
 		},
 	},
+	{
+		"nvim-treesitter/nvim-treesitter-context",
+		name = "treesitter-context",
+		event = "VeryLazy",
+		dependencies = {
+			"nvim-treesitter/nvim-treesitter",
+		},
+		opts = {
+			enable = true,
+		},
+	},
 }