Compare commits

..

15 commits

Author SHA1 Message Date
afecc541b0 WIP: use system jujutsu for work
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2025-10-14 11:38:26 +00:00
75b6a059bc home: jujutsu: simplify 'jj jj' alias 2025-10-14 11:38:26 +00:00
7ecdd7b5f0 home: jujutsu: explicitly create 'conf.d'
This is to serve as a reminder of _how_ to add a local configuration
file.
2025-10-14 11:38:26 +00:00
7aa1196ad4 WIP: ADD NOTE FOR FUTURE SELF 2025-10-14 11:38:26 +00:00
7fcc80ac8a home: jj: use verbose draft commit messages 2025-10-14 11:38:26 +00:00
4553f1a7d4 WIP: add jujutsu (w/ Delta) 2025-10-14 11:38:26 +00:00
ac90f1604d home: vim: do not set 'background' explicitly
Rely on the new behaviour from v0.10 which detects it more
intelligently.
2025-10-09 10:47:23 +00:00
6b1b5300cd home: vim: lspconfig: simplify LSP config
All checks were successful
ci/woodpecker/push/check Pipeline was successful
Despite what I just said in the previous commit, I decided to remove the
`is_executable` checks and always enable all servers.

I figured out that NeoVim actually handles `PATH` modifications pretty
well in this scenario: making a previously unavailable server executable
will automatically enable it.
2025-10-03 12:39:18 +00:00
62533d435b home: vim: lspconfig: use native configuration
The `nvim-lspconfig` "framework" is being deprecated to use the native
`vim.lsp.config` and `vim.lsp.enable` functionality.

I _could_ remove the `is_executable` checks, as native LSP handling does
_not_ loudly error out when enabling a server which isn't executable.
However I think `:LspInfo` is more readable if I don't.
2025-10-03 12:18:42 +00:00
5b47fc6365 flake: bump inputs
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2025-10-03 12:23:54 +02:00
9f9c1e571b home: zsh: do not notify on 'home-manager news'
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2025-09-18 10:03:12 +00:00
445b3d1422 flake: bump inputs 2025-09-18 10:03:12 +00:00
4c3e3d471f modules: services: nginx: fix SSL renewal, again
All checks were successful
ci/woodpecker/push/check Pipeline was successful
I'd previously fixed this in 1e10c6630b,
however NixOS has recently updated how the renewal units work [1], which
broke it.

[1]: https://github.com/NixOS/nixpkgs/pull/422076
2025-09-13 19:17:54 +02:00
27da55519c hosts: nixos: porthos: secrets: update cross-seed 2025-09-12 11:19:39 +02:00
fa6bcabf95 flake: bump inputs
All checks were successful
ci/woodpecker/push/check Pipeline was successful
2025-09-11 13:33:27 +00:00
6 changed files with 45 additions and 92 deletions

24
flake.lock generated
View file

@ -73,11 +73,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756770412, "lastModified": 1759362264,
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "4524271976b625a4a605beefd893f270620fd751", "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -117,11 +117,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1755960406, "lastModified": 1758108966,
"narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -159,11 +159,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756954499, "lastModified": 1759337100,
"narHash": "sha256-Pg4xBHzvzNY8l9x/rLWoJMnIR8ebG+xeU+IyqThIkqU=", "narHash": "sha256-CcT3QvZ74NGfM+lSOILcCEeU+SnqXRvl1XCRHenZ0Us=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "ed1a98c375450dfccf427adacd2bfd1a7b22eb25", "rev": "004753ae6b04c4b18aa07192c1106800aaacf6c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -175,11 +175,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1756936398, "lastModified": 1759422813,
"narHash": "sha256-/o1TTpMIICpjrMHBilL9lYm/r69uhdK1L8j1pfY6tWU=", "narHash": "sha256-WNkZqscW/dPLK5NMKH/jCkYMaVm/3KWgPmKMq65IXxk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "47f28ad9378956563df9a884fd1b209b64336ba3", "rev": "2a7c84e1e740f004e0fe5c2577a63d1e659a496c",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -81,9 +81,6 @@ set updatetime=250
" Disable all mouse integrations " Disable all mouse integrations
set mouse= set mouse=
" Set dark mode by default
set background=dark
" Setup some overrides for gruvbox " Setup some overrides for gruvbox
lua << EOF lua << EOF
local gruvbox = require("gruvbox") local gruvbox = require("gruvbox")

View file

@ -1,4 +1,3 @@
local lspconfig = require("lspconfig")
local lsp = require("ambroisie.lsp") local lsp = require("ambroisie.lsp")
local utils = require("ambroisie.utils") local utils = require("ambroisie.utils")
@ -25,59 +24,27 @@ vim.diagnostic.config({
-- Inform servers we are able to do completion, snippets, etc... -- Inform servers we are able to do completion, snippets, etc...
local capabilities = require("cmp_nvim_lsp").default_capabilities() local capabilities = require("cmp_nvim_lsp").default_capabilities()
-- Shared configuration
vim.lsp.config("*", {
capabilities = capabilities,
on_attach = lsp.on_attach,
})
local servers = {
-- C/C++ -- C/C++
if utils.is_executable("clangd") then clangd = {},
lspconfig.clangd.setup({
capabilities = capabilities,
on_attach = lsp.on_attach,
})
end
-- Haskell -- Haskell
if utils.is_executable("haskell-language-server-wrapper") then hls = {},
lspconfig.hls.setup({
capabilities = capabilities,
on_attach = lsp.on_attach,
})
end
-- Nix -- Nix
if utils.is_executable("nil") then nil_ls = {},
lspconfig.nil_ls.setup({
capabilities = capabilities,
on_attach = lsp.on_attach,
})
end
-- Python -- Python
if utils.is_executable("pyright") then pyright = {},
lspconfig.pyright.setup({ ruff = {},
capabilities = capabilities,
on_attach = lsp.on_attach,
})
end
if utils.is_executable("ruff") then
lspconfig.ruff.setup({
capabilities = capabilities,
on_attach = lsp.on_attach,
})
end
-- Rust -- Rust
if utils.is_executable("rust-analyzer") then rust_analyzer = {},
lspconfig.rust_analyzer.setup({
capabilities = capabilities,
on_attach = lsp.on_attach,
})
end
-- Shell -- Shell
if utils.is_executable("bash-language-server") then bashls = {
lspconfig.bashls.setup({
filetypes = { "bash", "sh", "zsh" }, filetypes = { "bash", "sh", "zsh" },
capabilities = capabilities,
on_attach = lsp.on_attach,
settings = { settings = {
bashIde = { bashIde = {
shfmt = { shfmt = {
@ -88,28 +55,17 @@ if utils.is_executable("bash-language-server") then
}, },
}, },
}, },
}) },
end
-- Starlark -- Starlark
if utils.is_executable("starpls") then starpls = {},
lspconfig.starpls.setup({
capabilities = capabilities,
on_attach = lsp.on_attach,
})
end
-- Generic -- Generic
if utils.is_executable("harper-ls") then harper_ls = {},
lspconfig.harper_ls.setup({ typos_lsp = {},
capabilities = capabilities, }
on_attach = lsp.on_attach,
})
end
if utils.is_executable("typos-lsp") then for server, config in pairs(servers) do
lspconfig.typos_lsp.setup({ if not vim.tbl_isempty(config) then
capabilities = capabilities, vim.lsp.config(server, config)
on_attach = lsp.on_attach, end
}) vim.lsp.enable(server)
end end

View file

@ -19,7 +19,7 @@ in
"direnv reload" "direnv reload"
"fg" "fg"
"git (?!push|pull|fetch)" "git (?!push|pull|fetch)"
"home-manager (?!switch|build|news)" "home-manager (?!switch|build)"
"htop" "htop"
"less" "less"
"man" "man"

View file

@ -444,7 +444,7 @@ in
}; };
}; };
systemd.services."acme-${domain}" = { systemd.services."acme-order-renew-${domain}" = {
serviceConfig = { serviceConfig = {
Environment = [ Environment = [
# Since I do a "weird" setup with a wildcard CNAME # Since I do a "weird" setup with a wildcard CNAME