Skip to content

Commit c349c44

Browse files
committed
dump a bunch of changes, do update
1 parent 0a06206 commit c349c44

File tree

6 files changed

+49
-150
lines changed

6 files changed

+49
-150
lines changed

flake.lock

Lines changed: 13 additions & 141 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@
2525
nvim-blink-cmp = {
2626
url = "github:Saghen/blink.cmp";
2727
};
28-
ghostty = {
29-
url = "github:ghostty-org/ghostty";
30-
};
3128
};
3229

3330
outputs = inputs @ {

home/default.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
packages = with pkgs; [
5353
# tools
5454
gmailctl
55+
bitwarden-cli
5556
# nix
5657
age
5758
alejandra

home/nvim/ftplugin/templ.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
vim.lsp.start({
2+
name = "templ",
3+
cmd = { "templ", "lsp" },
4+
filetypes = { "templ" },
5+
root_dir = vim.fs.dirname(vim.fs.find({ "go.mod", "go.sum", ".git/" }, { upward = true })[1]),
6+
})

home/nvim/lua/plugins.lua

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ return inject_all({
4444
auto_show = true,
4545
auto_show_delay_ms = 50,
4646
},
47-
keyword = {
48-
range = "full",
49-
},
47+
-- keyword = {
48+
-- range = "full",
49+
-- },
5050
list = {
5151
selection = {
5252
preselect = false,
@@ -102,9 +102,9 @@ return inject_all({
102102
direction_priority = { "s", "n" },
103103
},
104104
},
105+
cmdline = {},
105106
sources = {
106107
default = { "lsp", "path", "snippets", "buffer", "lazydev" },
107-
cmdline = {},
108108
providers = {
109109
lsp = {
110110
fallbacks = { "lazydev" },
@@ -130,10 +130,13 @@ return inject_all({
130130
cmd = { "ConformInfo" },
131131
opts = {
132132
formatters_by_ft = {
133+
css = { "prettier" },
133134
go = { "gofumpt", "goimports", "goimports-reviser" },
135+
html = { "prettier" },
134136
javascript = { "prettier" },
135137
lua = { "stylua" },
136138
nix = { "alejandra" },
139+
templ = { "templ", "injected" },
137140
["*"] = function(bufnr)
138141
if vim.fn.getbufvar(bufnr, "&filetype") == "terraform" then
139142
return {}
@@ -689,6 +692,27 @@ return inject_all({
689692
},
690693
},
691694

695+
{
696+
"echasnovski/mini.pairs",
697+
event = "InsertEnter",
698+
opts = {
699+
mappings = {
700+
-- do not auto create a pair when in front of word chars
701+
["("] = { action = "open", pair = "()", neigh_pattern = "[^\\][^%w]" },
702+
["["] = { action = "open", pair = "[]", neigh_pattern = "[^\\][^%w]" },
703+
["{"] = { action = "open", pair = "{}", neigh_pattern = "[^\\][^%w]" },
704+
-- do not swallow closing brackets when after a space chars
705+
[")"] = { action = "close", pair = "()", neigh_pattern = "[^\\%s]." },
706+
["]"] = { action = "close", pair = "[]", neigh_pattern = "[^\\%s]." },
707+
["}"] = { action = "close", pair = "{}", neigh_pattern = "[^\\%s]." },
708+
-- we use the default close actions
709+
['"'] = { action = "closeopen", pair = '""', neigh_pattern = "[^\\][%s%)%]}]", register = { cr = false } },
710+
["'"] = { action = "closeopen", pair = "''", neigh_pattern = "[^%a\\][%s%)%]}]", register = { cr = false } },
711+
["`"] = { action = "closeopen", pair = "``", neigh_pattern = "[^\\][%s%)%]}]", register = { cr = false } },
712+
},
713+
},
714+
},
715+
692716
{
693717
"echasnovski/mini.splitjoin",
694718
keys = {

home/wayland/ghostty.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
22
config,
3-
inputs,
43
pkgs,
54
...
65
}: {
76
home.packages = [
8-
inputs.ghostty.packages.${pkgs.system}.default
7+
pkgs.ghostty
98
pkgs.chafa
109
];
1110

0 commit comments

Comments
 (0)