Compare commits

...

3 Commits

Author SHA1 Message Date
388beee1b4 added terminal binds for the funzies 2026-07-02 14:37:34 +01:00
447dd9c22f fixed conform hopefully 2026-06-28 13:54:09 +01:00
45739fc4cf updated flake 2026-06-28 13:35:44 +01:00
6 changed files with 46 additions and 6 deletions

6
flake.lock generated
View File

@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1781074563,
"narHash": "sha256-md8WlXOlfnIeHeOScMTTHFyf2d6iaTwPl2apR5EQ3P4=",
"lastModified": 1782467914,
"narHash": "sha256-pGvFkM8N0xEkIIXDe5YYfbEAvHrk4IxBrjB/x8OomhE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9ae611a455b90cf061d8f332b977e387bda8e1ca",
"rev": "e73de5be04e0eff4190a1432b946d469c794e7b4",
"type": "github"
},
"original": {

View File

@@ -20,9 +20,8 @@
ast-grep
prettier
black
nixfmt
alejandra
rustfmt
nil
python313Packages.python-lsp-server
typescript-language-server
tailwindcss-language-server

View File

@@ -29,6 +29,19 @@ Keymap("i", "<C-BS>", "<C-W>") -- C-Backscpace for whole words
Keymap("n", "<leader>d", "<cmd>lua vim.diagnostic.open_float()<CR>") -- Diagnostics for Linter
Keymap("n", "gd", "<cmd>lua vim.lsp.buf.definition()<CR>") -- Diagnostics for Linter
-- Terminal Keymaps
Keymap("n", "<leader>tj", function() -- open term in new pane
vim.cmd.vnew()
vim.cmd.term()
vim.cmd.startinsert()
end)
Keymap("n", "<leader>tk", function() -- open term in new tab
vim.cmd.tabnew()
vim.cmd.term()
vim.cmd.startinsert()
end)
Keymap("t", "<C-D>", "<C-\\><C-n>") -- escape terminal with c-d
-- Flash keymaps
Keymap("n", "ss", function()
require("flash").jump()

View File

@@ -12,7 +12,7 @@ require("conform").setup({
html = { "prettier" },
svelte = { "prettier" },
python = { "black" },
nix = { "nixfmt" },
nix = { "alejandra" },
css = { "prettier" },
rust = { "rustfmt" },
},

View File

@@ -4,6 +4,32 @@ vim.pack.add({
{ src = "https://github.com/saghen/blink.lib", name = "blink-lib" },
})
local hostname = vim.uv.os_gethostname()
local lowerHostname = string.lower(hostname)
vim.lsp.config("nixd", {
cmd = { "nixd" },
filetypes = { "nix" },
root_markers = { "flake.nix", ".git" },
settings = {
nixd = {
nixpkgs = {
expr = "import <nixpkgs> { }",
},
formatting = {
command = { "alejandra" },
},
options = {
nixos = {
expr = '(builtins.getFlake "~/.dotfiles/.nixos").nixosConfigurations.'
.. lowerHostname
.. ".options",
},
},
},
},
})
vim.lsp.config("lua_ls", {
settings = {
Lua = {
@@ -43,6 +69,7 @@ require("blink.cmp").setup({
trigger = {
show_on_insert = true,
show_on_trigger_character = true,
show_on_keyword = true,
show_on_backspace = true,
},
list = {

View File

@@ -22,6 +22,7 @@ require("telescope").setup({
},
n = {
["<CR>"] = actions.select_drop,
["d"] = actions.delete_buffer,
},
},
},