chore: post-refactor cleanups (#50-#53) #54
@@ -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
|
||||||
|
|||||||
@@ -2,3 +2,6 @@ modules/firmware/*
|
|||||||
|
|
||||||
# vim swap files
|
# vim swap files
|
||||||
*.swp
|
*.swp
|
||||||
|
|
||||||
|
# Local scratch project, not part of this flake.
|
||||||
|
tf-inspect/
|
||||||
|
|||||||
Generated
+17
@@ -191,6 +191,22 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"kube-tmux": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1779714285,
|
||||||
|
"narHash": "sha256-l1wjg2ReWKCI7h/K11vvX2ykYTs/mVD+tfz/mQsjn/E=",
|
||||||
|
"owner": "jonmosco",
|
||||||
|
"repo": "kube-tmux",
|
||||||
|
"rev": "8b7e1d127c16b6dc87ff5743f4d775b245198b69",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "jonmosco",
|
||||||
|
"repo": "kube-tmux",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nix-darwin": {
|
"nix-darwin": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -373,6 +389,7 @@
|
|||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"git-hooks": "git-hooks",
|
"git-hooks": "git-hooks",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
|
"kube-tmux": "kube-tmux",
|
||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
"nix-homebrew": "nix-homebrew",
|
"nix-homebrew": "nix-homebrew",
|
||||||
"nix-index-database": "nix-index-database",
|
"nix-index-database": "nix-index-database",
|
||||||
|
|||||||
@@ -60,6 +60,13 @@
|
|||||||
url = "github:NixOS/nixos-hardware";
|
url = "github:NixOS/nixos-hardware";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
# kube-tmux: kube context/namespace for the tmux status line on the work
|
||||||
|
# host. Not in nixpkgs and not a flake -- pinned here as a plain source so
|
||||||
|
# the script is always in the store (no manual checkout). See work.nix.
|
||||||
|
kube-tmux = {
|
||||||
|
url = "github:jonmosco/kube-tmux";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
@@ -93,8 +100,6 @@
|
|||||||
# 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"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Per-user identity, keyed by username. See README "Users".
|
# Per-user identity, keyed by username. See README "Users".
|
||||||
|
|||||||
+2
-2
@@ -111,7 +111,7 @@ 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 |
|
||||||
@@ -124,7 +124,7 @@ place of the old (inert) ALE.
|
|||||||
| 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 |
|
||||||
|
|
||||||
|
|||||||
@@ -26,10 +26,8 @@
|
|||||||
# workstation.nix is the backstop).
|
# workstation.nix is the backstop).
|
||||||
zramSwap.enable = true;
|
zramSwap.enable = true;
|
||||||
|
|
||||||
# This host accepts SSH, so open 22 (the firewall itself is enabled in
|
# sshd (daemon, port 22, key-only policy) comes from ../../modules/ssh.nix;
|
||||||
# workstation.nix with a default-deny policy).
|
# the firewall itself is enabled in workstation.nix with a default-deny policy.
|
||||||
services.openssh.enable = true;
|
|
||||||
networking.firewall.allowedTCPPorts = [ 22 ];
|
|
||||||
|
|
||||||
# Dual Harpertown Xeon microcode. Redistributable firmware (GPU/NIC blobs) is
|
# Dual Harpertown Xeon microcode. Redistributable firmware (GPU/NIC blobs) is
|
||||||
# enabled in workstation.nix.
|
# enabled in workstation.nix.
|
||||||
|
|||||||
@@ -25,15 +25,12 @@
|
|||||||
boot.loader.grub.enable = false;
|
boot.loader.grub.enable = false;
|
||||||
boot.loader.generic-extlinux-compatible.enable = true;
|
boot.loader.generic-extlinux-compatible.enable = true;
|
||||||
|
|
||||||
# Remote administration. Key-only policy and the authorized key come from
|
# Remote administration: the daemon, port 22 and key-only policy all come from
|
||||||
# ../../modules/ssh.nix; here we just enable the daemon and open the port.
|
# ../../modules/ssh.nix.
|
||||||
services.openssh.enable = true;
|
|
||||||
|
|
||||||
# Default-deny inbound. Open only SSH here; the Docker and nginx submodules
|
# Default-deny inbound; the Docker and nginx submodules open their own ports
|
||||||
# open their own ports (Docker via a source-restricted nftables rule, nginx
|
# (Docker via a source-restricted nftables rule, nginx via 80/443).
|
||||||
# via 80/443). List-valued, so these merge with the submodule definitions.
|
|
||||||
networking.firewall.enable = true;
|
networking.firewall.enable = true;
|
||||||
networking.firewall.allowedTCPPorts = [ 22 ];
|
|
||||||
|
|
||||||
# See `man configuration.nix` / the stateVersion docs before changing.
|
# See `man configuration.nix` / the stateVersion docs before changing.
|
||||||
system.stateVersion = "26.05";
|
system.stateVersion = "26.05";
|
||||||
|
|||||||
@@ -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
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,10 +21,8 @@
|
|||||||
# Low-RAM host (4 GiB max): a compressed RAM swap reduces disk paging.
|
# Low-RAM host (4 GiB max): a compressed RAM swap reduces disk paging.
|
||||||
zramSwap.enable = true;
|
zramSwap.enable = true;
|
||||||
|
|
||||||
# This host accepts SSH, so open 22 (the firewall itself is enabled in
|
# sshd (daemon, port 22, key-only policy) comes from ../../modules/ssh.nix;
|
||||||
# laptop.nix with a default-deny policy).
|
# the firewall itself is enabled in laptop.nix with a default-deny policy.
|
||||||
services.openssh.enable = true;
|
|
||||||
networking.firewall.allowedTCPPorts = [ 22 ];
|
|
||||||
|
|
||||||
# Intel Core 2 (Penryn) microcode. Redistributable firmware (enabled in
|
# Intel Core 2 (Penryn) microcode. Redistributable firmware (enabled in
|
||||||
# workstation.nix) supplies the iwlwifi blobs (Intel WiFi Link 5100/5300) and
|
# workstation.nix) supplies the iwlwifi blobs (Intel WiFi Link 5100/5300) and
|
||||||
|
|||||||
+6
-3
@@ -1,8 +1,11 @@
|
|||||||
# Key-only sshd hardening, imported by hosts that run sshd (T400, Mac Pro,
|
# sshd for the hosts that run it (T400, Mac Pro, RPi5): enable the daemon, open
|
||||||
# RPi5). Authorized keys are owned per-user by the registry (modules/users.nix),
|
# port 22, and apply a key-only policy. Authorized keys are owned per-user by the
|
||||||
# not here.
|
# registry (modules/users.nix), not here.
|
||||||
{ ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
|
services.openssh.enable = true;
|
||||||
|
networking.firewall.allowedTCPPorts = [ 22 ];
|
||||||
|
|
||||||
services.openssh.settings = {
|
services.openssh.settings = {
|
||||||
PasswordAuthentication = false; # keys only
|
PasswordAuthentication = false; # keys only
|
||||||
KbdInteractiveAuthentication = false; # no keyboard-interactive fallback
|
KbdInteractiveAuthentication = false; # no keyboard-interactive fallback
|
||||||
|
|||||||
@@ -1,6 +1,11 @@
|
|||||||
# Work (EDaaS/WSL) home profile: corporate toolchain + tmux tweaks. Git identity
|
# Work (EDaaS/WSL) home profile: corporate toolchain + tmux tweaks. Git identity
|
||||||
# comes from the registry (users/registry.nix), not here.
|
# comes from the registry (users/registry.nix), not here.
|
||||||
{ pkgs, lib, ... }:
|
{
|
||||||
|
pkgs,
|
||||||
|
lib,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Host-scoped extras for this machine only (the EDaaS/WSL host).
|
# Host-scoped extras for this machine only (the EDaaS/WSL host).
|
||||||
@@ -24,7 +29,6 @@
|
|||||||
pkgs.powershell
|
pkgs.powershell
|
||||||
pkgs.nuget
|
pkgs.nuget
|
||||||
pkgs.gedit
|
pkgs.gedit
|
||||||
pkgs.lens
|
|
||||||
pkgs.python3
|
pkgs.python3
|
||||||
pkgs.gnumake
|
pkgs.gnumake
|
||||||
pkgs.gcc
|
pkgs.gcc
|
||||||
@@ -48,8 +52,10 @@
|
|||||||
docker = "/run/current-system/sw/bin/docker";
|
docker = "/run/current-system/sw/bin/docker";
|
||||||
};
|
};
|
||||||
programs.tmux = {
|
programs.tmux = {
|
||||||
|
# kube context/namespace in the status line. kube-tmux is pinned as a flake
|
||||||
|
# input (it is not in nixpkgs), so the script is always present in the store.
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
set -g status-right "#(/run/current-system/sw/bin/bash $HOME/code/kube-tmux/kube.tmux 250 red black)"
|
set -g status-right "#(${pkgs.bash}/bin/bash ${inputs.kube-tmux}/kube.tmux 250 red black)"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
programs.go = {
|
programs.go = {
|
||||||
|
|||||||
Reference in New Issue
Block a user