chore: minor cleanups (lens unfree name, LSP doc, editorconfig, docker subnet)
CI / flake (pull_request) Successful in 3m30s
CI / flake (pull_request) Successful in 3m30s
- flake.nix: drop the dead "lens" unfree entry; pkgs.lens is named "lens-desktop", which is the name the predicate actually matches. - home/README.md: the Nix LSP is nil_ls, not nil. - .editorconfig: remove the rule block that duplicated the [*] defaults. - hosts/RPi5/docker.nix: name the trusted Docker subnet in a let binding rather than repeating the literal CIDR. Deferred from the audit bundle: the .gitignore firmware entry (documented, low value) and the per-eval nixpkgs-unstable overlay import (inherently per-system, no clean hoist). Closes #53
This commit is contained in:
@@ -8,12 +8,6 @@ indent_size = 2
|
|||||||
trim_trailing_whitespace = true
|
trim_trailing_whitespace = true
|
||||||
insert_final_newline = true
|
insert_final_newline = true
|
||||||
|
|
||||||
[*.{nix,yaml,yml,json,md,sh,toml}]
|
|
||||||
indent_style = space
|
|
||||||
indent_size = 2
|
|
||||||
trim_trailing_whitespace = true
|
|
||||||
insert_final_newline = true
|
|
||||||
|
|
||||||
# Markdown uses trailing whitespace for hard line breaks.
|
# Markdown uses trailing whitespace for hard line breaks.
|
||||||
[*.md]
|
[*.md]
|
||||||
trim_trailing_whitespace = false
|
trim_trailing_whitespace = false
|
||||||
|
|||||||
@@ -93,8 +93,7 @@
|
|||||||
# Unfree packages permitted to be built (replaces blanket allowUnfree).
|
# Unfree packages permitted to be built (replaces blanket allowUnfree).
|
||||||
unfreePackages = [
|
unfreePackages = [
|
||||||
"claude-code"
|
"claude-code"
|
||||||
"lens"
|
"lens-desktop" # the name of pkgs.lens (used on the work host)
|
||||||
"lens-desktop"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Per-user identity, keyed by username. See README "Users".
|
# Per-user identity, keyed by username. See README "Users".
|
||||||
|
|||||||
+17
-17
@@ -110,23 +110,23 @@ declaratively with **nixvim**, so the same plugins and config are baked in on
|
|||||||
every host. Migrated from plain vim; the practical gain is a real LSP stack in
|
every host. Migrated from plain vim; the practical gain is a real LSP stack in
|
||||||
place of the old (inert) ALE.
|
place of the old (inert) ALE.
|
||||||
|
|
||||||
| Feature | Notes |
|
| Feature | Notes |
|
||||||
| -------------- | -------------------------------------------------------------------------------------- |
|
| -------------- | ----------------------------------------------------------------------------------------- |
|
||||||
| Colorscheme | Catppuccin Mocha (matches the terminal and the rest of the desktop) |
|
| Colorscheme | Catppuccin Mocha (matches the terminal and the rest of the desktop) |
|
||||||
| File tree | nvim-tree, toggled with `,,` (comma twice; was nerdtree) |
|
| File tree | nvim-tree, toggled with `,,` (comma twice; was nerdtree) |
|
||||||
| Fuzzy finder | telescope (+fzf-native): `<leader>ff` files, `<leader>fg` grep, `<leader>fb` buffers |
|
| Fuzzy finder | telescope (+fzf-native): `<leader>ff` files, `<leader>fg` grep, `<leader>fb` buffers |
|
||||||
| Format on save | conform-nvim (nixfmt, stylua, ruff, shfmt, prettier, gofumpt; LSP fallback otherwise) |
|
| Format on save | conform-nvim (nixfmt, stylua, ruff, shfmt, prettier, gofumpt; LSP fallback otherwise) |
|
||||||
| Git | fugitive (`:Git …`) + gitsigns gutter signs/blame |
|
| Git | fugitive (`:Git …`) + gitsigns gutter signs/blame |
|
||||||
| Diagnostics | inline + trouble list (`<leader>xx`) |
|
| Diagnostics | inline + trouble list (`<leader>xx`) |
|
||||||
| Completion | nvim-cmp (LSP/buffer/path) with luasnip snippet expansion |
|
| Completion | nvim-cmp (LSP/buffer/path) with luasnip snippet expansion |
|
||||||
| Indent guides | indent-blankline, on by default (was vim-indent-guides) |
|
| Indent guides | indent-blankline, on by default (was vim-indent-guides) |
|
||||||
| Statusline | lualine (Catppuccin theme) |
|
| Statusline | lualine (Catppuccin theme) |
|
||||||
| Editing | which-key hints, comment (`gc`/`gcc`), autopairs, treesitter textobjects |
|
| Editing | which-key hints, comment (`gc`/`gcc`), autopairs, treesitter textobjects |
|
||||||
| Pane nav | vim-tmux-navigator — `Ctrl`+`h/j/k/l` moves across vim splits and tmux panes |
|
| Pane nav | vim-tmux-navigator — `Ctrl`+`h/j/k/l` moves across vim splits and tmux panes |
|
||||||
| Syntax | tree-sitter (nix, lua, bash, markdown, groovy, c#, python, terraform, yaml) |
|
| Syntax | tree-sitter (nix, lua, bash, markdown, groovy, c#, python, terraform, yaml) |
|
||||||
| LSP | nvim-cmp completion + servers `nil` (Nix), `lua_ls`, `pyright` (Python), `terraformls` |
|
| LSP | nvim-cmp completion + servers `nil_ls` (Nix), `lua_ls`, `pyright` (Python), `terraformls` |
|
||||||
| Indentation | 2-wide hard tabs (`noexpandtab`, `tabstop`/`shiftwidth` = 2); line numbers on |
|
| Indentation | 2-wide hard tabs (`noexpandtab`, `tabstop`/`shiftwidth` = 2); line numbers on |
|
||||||
| Filetypes | `*Jenkinsfile` → groovy |
|
| Filetypes | `*Jenkinsfile` → groovy |
|
||||||
|
|
||||||
Leader is `Space`. LSP keymaps (`gd`, `gr`, `K`, `<leader>rn`, `<leader>ca`) and
|
Leader is `Space`. LSP keymaps (`gd`, `gr`, `K`, `<leader>rn`, `<leader>ca`) and
|
||||||
the file-tree toggle are listed in
|
the file-tree toggle are listed in
|
||||||
|
|||||||
@@ -8,6 +8,10 @@
|
|||||||
# secure upgrade path is mutual TLS on 2376 (--tlsverify with client certs);
|
# secure upgrade path is mutual TLS on 2376 (--tlsverify with client certs);
|
||||||
# that needs out-of-band cert provisioning and is intentionally not wired here.
|
# that needs out-of-band cert provisioning and is intentionally not wired here.
|
||||||
{ ... }:
|
{ ... }:
|
||||||
|
let
|
||||||
|
# LAN allowed to reach the unauthenticated Docker TCP socket (see SECURITY above).
|
||||||
|
trustedSubnet = "10.187.1.0/24";
|
||||||
|
in
|
||||||
{
|
{
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker.enable = true;
|
||||||
|
|
||||||
@@ -29,6 +33,6 @@
|
|||||||
# CIDR to match the LAN that should reach the Docker API.
|
# CIDR to match the LAN that should reach the Docker API.
|
||||||
networking.nftables.enable = true;
|
networking.nftables.enable = true;
|
||||||
networking.firewall.extraInputRules = ''
|
networking.firewall.extraInputRules = ''
|
||||||
ip saddr 10.187.1.0/24 tcp dport 2375 accept
|
ip saddr ${trustedSubnet} tcp dport 2375 accept
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user