Skip to content

Commit f5856e8

Browse files
committed
add missing formatters
1 parent 7db007c commit f5856e8

File tree

4 files changed

+28
-7
lines changed

4 files changed

+28
-7
lines changed

modules/home-manager/default.nix

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
cachix
4949
cb
5050
cirrus-cli
51+
codespell
5152
coreutils-full
52-
dust
5353
curl
5454
curlie
5555
d2
@@ -58,6 +58,7 @@
5858
dix
5959
dotenvx
6060
doxx
61+
dust
6162
fd
6263
ffmpeg
6364
findutils
@@ -69,6 +70,7 @@
6970
gawk
7071
gdu
7172
git-absorb
73+
gotools
7274
gnugrep
7375
gnupg
7476
gnused
@@ -104,6 +106,7 @@
104106
ouch
105107
parallel
106108
pre-commit
109+
prettier
107110
process-compose
108111
procps
109112
pv
@@ -112,6 +115,7 @@
112115
restic
113116
rsync
114117
ruff
118+
rustfmt
115119
rustscan
116120
sd
117121
shellcheck
@@ -142,7 +146,10 @@
142146
]
143147
++ lib.optionals (config.nix.package != null) [config.nix.package]
144148
++ lib.optionals pkgs.stdenvNoCC.isDarwin [iproute2mac]
145-
++ lib.optionals pkgs.stdenvNoCC.isLinux [systemctl-tui lazyjournal];
149+
++ lib.optionals pkgs.stdenvNoCC.isLinux [
150+
systemctl-tui
151+
lazyjournal
152+
];
146153
};
147154

148155
fonts.fontconfig = {

modules/home-manager/nvim/lua/init.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ end
7777
vim.cmd("autocmd BufWritePre * :lua vim.fn.stripTrailingWhitespace()")
7878

7979
vim.keymap.set({ "n", "v" }, "<leader>y", '"+y', { desc = "Yank to clipboard" })
80+
vim.keymap.set({ "n", "v" }, "<leader>d", '"+d', { desc = "Cut to clipboard" })
8081
vim.keymap.set({ "n" }, "j", "gj", {})
8182
vim.keymap.set({ "n" }, "k", "gk", {})
8283

modules/home-manager/nvim/lua/plugins/default.lua

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ return {
5555
},
5656
{
5757
-- Customize or remove this keymap to your liking
58-
"<leader>f",
58+
"<leader>fb",
5959
function()
6060
require("conform").format({ async = true })
6161
end,
@@ -71,11 +71,12 @@ return {
7171
lua = { "stylua" },
7272
-- Conform will run multiple formatters sequentially
7373
go = { "goimports", "gofmt" },
74-
nix = { "nixfmt" },
74+
nix = { "alejandra", "nixfmt", stop_after_first = true },
7575
-- You can also customize some of the format options for the filetype
76-
rust = { "rustfmt", lsp_format = "fallback" },
77-
javascript = { "prettierd", "prettier", stop_after_first = true },
78-
typescript = { "prettierd", "prettier", stop_after_first = true },
76+
rust = { "rustfmt", lsp_format = "fallback", stop_after_first = true },
77+
javascript = { "prettier", stop_after_first = true },
78+
typescript = { "prettier", stop_after_first = true },
79+
html = { "prettier", stop_after_first = true },
7980
-- You can use a function here to determine the formatters dynamically
8081
python = function(bufnr)
8182
if require("conform").get_formatter_info("ruff_format", bufnr).available then

modules/home-manager/nvim/lua/plugins/fzf.lua

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,23 @@ return {
3636
return require("fzf-lua").files()
3737
end,
3838
},
39+
{
40+
"<leader>ff",
41+
function()
42+
return require("fzf-lua").files()
43+
end,
44+
},
3945
{
4046
"<C-g>",
4147
function()
4248
return require("fzf-lua").live_grep_native({ resume = true })
4349
end,
4450
},
51+
{
52+
"<leader>fg",
53+
function()
54+
return require("fzf-lua").live_grep_native({ resume = true })
55+
end,
56+
},
4557
},
4658
}

0 commit comments

Comments
 (0)