From 77b1ef7a072954eb9b902b556e76e287dd58e119 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Sat, 18 Feb 2023 17:14:56 +0100
Subject: [PATCH 1/4] nvim: add formatters

---
 modules/programs/nvim/default.nix |  9 ++++++++-
 modules/programs/nvim/init.lua    | 19 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix
index 6a400f1..8a14ebc 100644
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@@ -42,9 +42,16 @@ in
       withPython3 = true;
       extraLuaConfig = builtins.readFile ./init.lua;
       extraPackages = with pkgs; [
-        sumneko-lua-language-server
+        black
+        isort
         nil
+        nixpkgs-fmt
+        rustfmt
+        shfmt
         stylua
+        sumneko-lua-language-server
+        taplo
+        yamlfmt
       ];
       plugins = with pkgs.vimPlugins; [
         catppuccin-nvim
diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua
index e4b557a..631cf51 100644
--- a/modules/programs/nvim/init.lua
+++ b/modules/programs/nvim/init.lua
@@ -192,7 +192,24 @@ require("formatter").setup({
       -- "lua" filetype
       require("formatter.filetypes.lua").stylua,
     },
-
+    nix = {
+      require("formatter.filetypes.nix").nixpkgs_fmt,
+    },
+    python = {
+      require("formatter.filetypes.python").black,
+    },
+    rust = {
+      require("formatter.filetypes.rust").rustfmt,
+    },
+    sh = {
+      require("formatter.filetypes.sh").shfmt,
+    },
+    toml = {
+      require("formatter.filetypes.toml").taplo,
+    },
+    yaml = {
+      require("formatter.filetypes.yaml").yamlfmt,
+    },
     -- Use the special "*" filetype for defining formatter configurations on
     -- any filetype
     ["*"] = {

From a7356cabbe003ae01b2ed7a1f429733c26ff032c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Sat, 18 Feb 2023 17:15:32 +0100
Subject: [PATCH 2/4] nvim: add gitsigns

---
 modules/programs/nvim/default.nix | 1 +
 modules/programs/nvim/init.lua    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix
index 8a14ebc..f5253c1 100644
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@@ -81,6 +81,7 @@ in
         plenary-nvim # for telescope, neogit
         telescope-nvim
         which-key-nvim
+        gitsigns-nvim
       ];
     };
   };
diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua
index 631cf51..8cf3986 100644
--- a/modules/programs/nvim/init.lua
+++ b/modules/programs/nvim/init.lua
@@ -430,3 +430,5 @@ orgmode.setup({
   org_agenda_files = { "~/Notes/org" },
   org_default_notes_file = "~/Notes/org/refile.org",
 })
+
+require("gitsigns").setup()

From 1da7930115ee42474567d04f29690850dd997c4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Sat, 18 Feb 2023 17:16:02 +0100
Subject: [PATCH 3/4] nvim: add pulgin to return to last location

---
 modules/programs/nvim/default.nix | 1 +
 modules/programs/nvim/init.lua    | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix
index f5253c1..ea7719b 100644
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@@ -54,6 +54,7 @@ in
         yamlfmt
       ];
       plugins = with pkgs.vimPlugins; [
+        nvim-lastplace
         catppuccin-nvim
         cmp-nvim-lsp
         cmp_luasnip
diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua
index 8cf3986..ad3607a 100644
--- a/modules/programs/nvim/init.lua
+++ b/modules/programs/nvim/init.lua
@@ -432,3 +432,9 @@ orgmode.setup({
 })
 
 require("gitsigns").setup()
+
+require("nvim-lastplace").setup({
+  lastplace_ignore_buftype = { "quickfix", "nofile", "help" },
+  lastplace_ignore_filetype = { "gitcommit", "gitrebase", "svn", "hgcommit" },
+  lastplace_open_folds = true,
+})

From c9dac34ee03cb408d611e51be9a2a7b4cba80427 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Moritz=20B=C3=B6hme?= <mail@moritzboeh.me>
Date: Sat, 18 Feb 2023 17:16:37 +0100
Subject: [PATCH 4/4] nvim: add autopairs

---
 modules/programs/nvim/default.nix | 1 +
 modules/programs/nvim/init.lua    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix
index ea7719b..7453ec7 100644
--- a/modules/programs/nvim/default.nix
+++ b/modules/programs/nvim/default.nix
@@ -54,6 +54,7 @@ in
         yamlfmt
       ];
       plugins = with pkgs.vimPlugins; [
+        nvim-autopairs
         nvim-lastplace
         catppuccin-nvim
         cmp-nvim-lsp
diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua
index ad3607a..f7883c3 100644
--- a/modules/programs/nvim/init.lua
+++ b/modules/programs/nvim/init.lua
@@ -438,3 +438,5 @@ require("nvim-lastplace").setup({
   lastplace_ignore_filetype = { "gitcommit", "gitrebase", "svn", "hgcommit" },
   lastplace_open_folds = true,
 })
+
+require("nvim-autopairs").setup({})