From 2c69e1f1161bcd568018530cd72ff3502ca841a3 Mon Sep 17 00:00:00 2001
From: foxora <foxora@noreply.tearforge.net>
Date: Tue, 3 Mar 2026 04:50:29 +0000
Subject: [PATCH] formatted + added project formatter that respects .gitignore

---
 homes/modules/de/waybar/waybar.nix               |  3 ++-
 homes/modules/programs/neovim/init.lua           | 16 ++++++++++++----
 .../programs/neovim/lua/plugins/format.lua       | 12 +++++++++---
 homes/modules/wm/hyprland/hyprland.nix           |  3 +--
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/homes/modules/de/waybar/waybar.nix b/homes/modules/de/waybar/waybar.nix
index ba2abb0..71e1f20 100644
--- a/homes/modules/de/waybar/waybar.nix
+++ b/homes/modules/de/waybar/waybar.nix
@@ -14,7 +14,8 @@
         "hyprland/workspaces" = {
           format = "{id}";
         };
-        "ext/workspaces" = { # not enabled yet, hyprland and mango need two different configs ;-;
+        "ext/workspaces" = {
+          # not enabled yet, hyprland and mango need two different configs ;-;
           format = "{id}";
           ignore-hidden = true;
           on-click = "activate";
diff --git a/homes/modules/programs/neovim/init.lua b/homes/modules/programs/neovim/init.lua
index dcd03a8..98013ef 100644
--- a/homes/modules/programs/neovim/init.lua
+++ b/homes/modules/programs/neovim/init.lua
@@ -8,10 +8,18 @@ vim.opt.colorcolumn = "80"
 require("plugins")
 require("lsp")
 
-vim.keymap.set('n', '<A-h>', function() vim.cmd('wincmd h') end)
-vim.keymap.set('n', '<A-j>', function() vim.cmd('wincmd j') end)
-vim.keymap.set('n', '<A-k>', function() vim.cmd('wincmd k') end)
-vim.keymap.set('n', '<A-l>', function() vim.cmd('wincmd l') end)
+vim.keymap.set("n", "<A-h>", function()
+	vim.cmd("wincmd h")
+end)
+vim.keymap.set("n", "<A-j>", function()
+	vim.cmd("wincmd j")
+end)
+vim.keymap.set("n", "<A-k>", function()
+	vim.cmd("wincmd k")
+end)
+vim.keymap.set("n", "<A-l>", function()
+	vim.cmd("wincmd l")
+end)
 
 local uv = vim.loop
 local colorscheme_filepath = "/home/aurora/.cache/nvim/neovim-colors"
diff --git a/homes/modules/programs/neovim/lua/plugins/format.lua b/homes/modules/programs/neovim/lua/plugins/format.lua
index 6377dc8..5ca4e27 100644
--- a/homes/modules/programs/neovim/lua/plugins/format.lua
+++ b/homes/modules/programs/neovim/lua/plugins/format.lua
@@ -1,10 +1,13 @@
-vim.keymap.set("n", "<leader>P", "<cmd>ConformProject<cr>", { noremap = true, silent = true })
+vim.keymap.set("n", "<leader>P", function()
+	vim.api.nvim_exec_autocmds("User", { pattern = "ConformProject" })
+	vim.cmd("ConformProject")
+end, { noremap = true, silent = true })
 
 vim.api.nvim_create_user_command("ConformProject", function()
 	local conform = require("conform")
 	local root = vim.fn.getcwd()
 
-	-- Use git to get files (respects .gitignore)
+	-- respects .gitignore
 	local handle = io.popen(string.format("cd %s && git ls-files --cached --others --exclude-standard", root))
 
 	if not handle then
@@ -18,7 +21,9 @@ vim.api.nvim_create_user_command("ConformProject", function()
 	end
 	handle:close()
 
-	-- Format each file
+	-- format each file
+	-- TODO: maybe run each formatter on the directory instead as it may be faster
+	--       although that would actually mean we can't count what files were formatted so i don't know
 	local formatted_count = 0
 	for _, filepath in ipairs(files) do
 		local bufnr = vim.fn.bufadd(filepath)
@@ -42,6 +47,7 @@ return {
 	{
 		"conform.nvim",
 		enabled = nixCats("format") or false,
+		event = "User ConformProject", -- also will load when we format the entire project yayayayy :333
 		keys = {
 			{ "<leader>p", desc = "Format File (pretty :3)" },
 		},
diff --git a/homes/modules/wm/hyprland/hyprland.nix b/homes/modules/wm/hyprland/hyprland.nix
index cc22886..e0baf8f 100644
--- a/homes/modules/wm/hyprland/hyprland.nix
+++ b/homes/modules/wm/hyprland/hyprland.nix
@@ -1,5 +1,4 @@
-{ ... }:
-{
+{...}: {
   wayland.windowManager.hyprland = {
     enable = true;
     package = null;