From 37f08a45a644b16d55d4eaca41c6cffcb3563afd Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Thu, 9 Jan 2025 11:56:48 +0100
Subject: [PATCH] random fixes

---
 modules/gui/ghostty.config     |  3 +++
 nvim/default.nix               |  5 ++++-
 nvim/lua/plugins/telescope.lua | 22 +++++++++++++---------
 nvim/nix/luarc.nix             |  7 +++++++
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/modules/gui/ghostty.config b/modules/gui/ghostty.config
index 2291915..0d8f8de 100644
--- a/modules/gui/ghostty.config
+++ b/modules/gui/ghostty.config
@@ -24,6 +24,9 @@ window-padding-y = 0
 window-padding-balance = true
 window-decoration = false
 
+# avoid dreadfully long startup times
+gtk-single-instance = true
+
 clipboard-read = allow
 clipboard-write = allow
 clipboard-trim-trailing-spaces = true
diff --git a/nvim/default.nix b/nvim/default.nix
index 180ebdd..a56aabc 100644
--- a/nvim/default.nix
+++ b/nvim/default.nix
@@ -129,7 +129,6 @@ in
       pyright
       typescript-language-server
       nil
-      gopls
       vscode-langservers-extracted # html, jsonls
       yaml-language-server
       marksman
@@ -140,6 +139,10 @@ in
       lua-language-server
       bash-language-server
 
+      # gopls also needs go /shame
+      gopls
+      go
+
       # nix formatter
       alejandra
 
diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua
index 13ad4ff..2fd3949 100644
--- a/nvim/lua/plugins/telescope.lua
+++ b/nvim/lua/plugins/telescope.lua
@@ -4,15 +4,19 @@ return {
 		load = vim.cmd.packadd,
 		cmd = "Telescope",
 		keys = {
-			{ "<leader>f",  "<cmd>Telescope find_files<cr>",        desc = "Find Files" },
-			{ "<leader>F",  "<cmd>Telescope ripgrep theme=ivy<cr>", desc = "Grep" },
-			{ "<leader>gl", "<cmd>Telescope git_commits<CR>",       desc = "Git log" },
-			{ "<leader>gc", "<cmd>Git commit<CR>",                  desc = "Git commit" },
-			{ "<leader>gC", "<cmd>Git commit --amend<CR>",         desc = "Git commit amend" },
-			{ "<leader>gh", "<cmd>Telescope git_bcommits<CR>",      desc = "Git history" },
-			{ "<leader>gB", "<cmd>Telescope git_branches<CR>",      desc = "Git branches" },
-			{ "<leader>gs", "<cmd>Telescope git_status<CR>",        desc = "Git status" },
-			{ "<leader>zh", "<cmd>Telescope help_tags<CR>",         desc = "Read help" },
+			{ "<leader>f", "<cmd>Telescope find_files<cr>", desc = "Find Files" },
+			{ "<leader>F", "<cmd>Telescope ripgrep theme=ivy<cr>", desc = "Grep" },
+			{ "<leader>gl", "<cmd>Telescope git_commits<CR>", desc = "Git log" },
+			{ "<leader>gh", "<cmd>Telescope git_bcommits<CR>", desc = "Git history" },
+			{ "<leader>gB", "<cmd>Telescope git_branches<CR>", desc = "Git branches" },
+			{ "<leader>gs", "<cmd>Telescope git_status<CR>", desc = "Git status" },
+			{ "<leader>zh", "<cmd>Telescope help_tags<CR>", desc = "Read help" },
+
+			-- maybe i should move those elsewhere
+			{ "<leader>gc", "<cmd>Git commit<CR>", desc = "Git commit" },
+			{ "<leader>gC", "<cmd>Git commit --amend<CR>", desc = "Git commit amend" },
+			{ "<leader>gp", "<cmd>Git! push<CR>", desc = "Git push" },
+			{ "<leader>gP", "<cmd>Git! push --force-with-lease --force-if-includes<CR>", desc = "Git push force" },
 		},
 		after = function()
 			local actions = require("telescope.actions")
diff --git a/nvim/nix/luarc.nix b/nvim/nix/luarc.nix
index 88c0d2d..e1718dc 100644
--- a/nvim/nix/luarc.nix
+++ b/nvim/nix/luarc.nix
@@ -64,6 +64,13 @@
       globals = ["vim"];
       disable = disabled-diagnostics;
     };
+    format.defaultConfig = {
+      # see https://github.com/CppCXY/EmmyLuaCodeStyle/blob/master/docs/format_config_EN.md
+      align_array_table = "false";
+      align_function_params = "false";
+      align_continuous_rect_table_field = "false";
+      align_continuous_assign_statement = "false";
+    };
   };
 in
   (pkgs.formats.json {}).generate ".luarc.json" luarc