Compare commits

..
18 Commits
Author SHA1 Message Date
emmatherock 437697cbd5 chore(flake): update locked inputs 2026-09-21 08:53:06 -03:00
emmatherock 367c4bde11 refactor(journald): migrate retention setting 2026-09-21 08:52:55 -03:00
emmatherock af50f7f39d feat(homelab): update network and swap configuration 2026-09-21 08:52:47 -03:00
emmatherock 627c848d1d refactor(neovim): move configuration to nixvim branch 2026-09-21 08:43:50 -03:00
emmatherockandClaude Sonnet 5 09b138391b feat(vps): add wireguard peer 10.20.0.3
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-09-07 22:55:53 -03:00
emmatherock 0aa0cc0e0d feat(neovim): add OSC 52 clipboard support for SSH sessions
Lets "+y/"+p sync with the system clipboard over SSH (Termius -> VPS/homelab)
without relying on a local clipboard provider.
2026-09-05 20:01:42 -03:00
emmatherock 5d9cd9d835 feat(neovim): add snippets, autopairs and surround 2026-09-04 20:51:47 -03:00
emmatherockandClaude Sonnet 5 656fc82d7f feat(neovim): add Dockerfile/Compose LSP and treesitter support
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-09-04 18:06:36 -03:00
emmatherockandClaude Sonnet 5 f37b4db130 chore(flake): update flake.lock inputs
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_018myBNc8EqfqaQmYrKdkxVM
2026-09-03 21:55:35 -03:00
emmatherockandClaude Sonnet 5 52c6a60404 feat(vps): enable IP forwarding for exit node support
Required so the host can route traffic as a Tailscale/Headscale exit node.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-09-01 15:43:17 -03:00
emmatherock f7c68efe3d chore(codex): configure NixOS MCP server 2026-08-31 03:59:06 -03:00
emmatherock 07c53ac387 docs(todo): remove completed items 2026-08-31 03:59:06 -03:00
emmatherock 0ea3a46059 fix(neovim): use canonical Codex adapter name 2026-08-31 03:59:06 -03:00
emmatherock b4443ea131 feat(homelab): add Ollama service with ROCm 2026-08-31 03:59:06 -03:00
emmatherockandClaude Sonnet 5 e47eef6e56 refactor(neovim): switch CodeCompanion adapter from gemini_cli to codex_acp
Reuses the codex CLI's ChatGPT login (auth_method = "chat-gpt") instead of
gemini's oauth-personal, and disables adapter preset noise in the picker.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
2026-08-30 15:47:09 -03:00
emmatherock f4ac164633 feat(neovim): add vim-fugitive for Git integration
Enables interactive status, commits, push/pull, and file diffs
via <leader>g{s,c,p,l,d}, complementing gitsigns' hunk-level view.
2026-08-30 12:54:29 -03:00
emmatherock b14d48b3e2 refactor(agents): drop gemini-cli from home packages 2026-08-30 12:54:23 -03:00
emmatherock 3475d0cde1 feat(neovim): add chat window configuration with vertical layout 2026-08-29 15:49:04 -03:00
11 changed files with 120 additions and 319 deletions

No files matched your search

+5
View File
@@ -0,0 +1,5 @@
## Me
[mcp_servers.nixos]
command = "nix"
args = ["run", "github:utensils/mcp-nixos", "--"]
-2
View File
@@ -1,3 +1 @@
- Evaluate Plasma Manager when Plasma 6.7 support improves
- Review system-wide package list periodically - Review system-wide package list periodically
- Add additional hosts
Generated
+33 -93
View File
@@ -37,11 +37,11 @@
"sf-pro": "sf-pro" "sf-pro": "sf-pro"
}, },
"locked": { "locked": {
"lastModified": 1787373040, "lastModified": 1789419105,
"narHash": "sha256-mSpL69LSAA/+cQx+v9tC2XC/DD7cUepUmhiMx0/Hw64=", "narHash": "sha256-T5A/AqlF4iL908aIZh45e35Mvj8lTJKq8ddS5bk7nd8=",
"owner": "Lyndeno", "owner": "Lyndeno",
"repo": "apple-fonts.nix", "repo": "apple-fonts.nix",
"rev": "69f20e9ba294420e4b6407a827c6b5aea3afcc12", "rev": "3861e2249cb244bfbc7cfab2303c152cf5f9d9e9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -96,15 +96,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1784665499, "lastModified": 1788011267,
"narHash": "sha256-9BMxlTxCCDAeoNLtb1a/st7udtTIJep+wpUzquA29VU=", "narHash": "sha256-mEq2kU+ljompTToZ44Afvm7d/rHJ5iMBl0tjZuyShJs=",
"owner": "nix-community", "owner": "Mic92",
"repo": "bun2nix", "repo": "bun2nix",
"rev": "0f2a1f0b6f42cebe3b149bf62d38754c5e0e9729", "rev": "5765b0614591f75ee8ba5596e81ae85c167d1071",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "Mic92",
"ref": "fix-structured-attrs-hook",
"repo": "bun2nix", "repo": "bun2nix",
"type": "github" "type": "github"
} }
@@ -161,11 +162,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1787559586, "lastModified": 1788450739,
"narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=", "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1", "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -175,27 +176,6 @@
} }
}, },
"flake-parts_2": { "flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1787559586,
"narHash": "sha256-onL0VLf9vPllmT0H/OlURIU5r5t5WIEl7t4tVNKT0Nw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9d0d87172c374f89da73c1cfe6d81ae62feac1f1",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
@@ -241,11 +221,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1787797243, "lastModified": 1789978077,
"narHash": "sha256-8+Q7NOB7RPajRjA4pbCDLzqH+MTjnG9x6LUPLfL2joA=", "narHash": "sha256-p/e37FfVifxJQJM7OiiVbUXdpj6eXmOJk34TKLKyYe4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "99c9ec63390f1d8c14d95d9e8b17cc29cfbd4e11", "rev": "a26f7158fbc4aa740fcc7fa79a01e1ed29910bc2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -263,11 +243,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1788012048, "lastModified": 1789987094,
"narHash": "sha256-Ja0btchPlXVw5XVEIe5N8DhNZJE8LKiBG1x0jZcNjTU=", "narHash": "sha256-jzlT1EofmNifqUjpiSJMPbm/GiU17r65WUi44Kfkmdc=",
"owner": "numtide", "owner": "numtide",
"repo": "llm-agents.nix", "repo": "llm-agents.nix",
"rev": "952d31f9337df4799f22aa067d1075822d024ecc", "rev": "7c0157f864d113d9f0ce324a78496de6da6e7e07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -297,11 +277,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1787985973, "lastModified": 1789964597,
"narHash": "sha256-6YafqgJETEUfhFaKx3zvinjq1WDz8fy/PnEVtw7YmaU=", "narHash": "sha256-L+tPmy48VrsS/qVrj504pETaGEcVFMs1QpU5kKpBo0U=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "fdeb8646a1f9e5f0db80dd05e9db54ab7687378e", "rev": "fa4ec37adf8d8c725bfd8915c497ed41c7cb0f70",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -343,11 +323,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1787424095, "lastModified": 1789813231,
"narHash": "sha256-dWLO5AHhKaw6rdWCtTes8hnntT1r0/J5yhQGm0f0ZgU=", "narHash": "sha256-dsU+UU4X3ND95E/O6Z33qK5jPxIeB/7akn/+NfAk+nY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "174eb786fb68e3a13e4e535a3deea479a0c07a6a", "rev": "c80073788adf88abfdc443465311f00e7a231600",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -375,11 +355,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1787736819, "lastModified": 1789785513,
"narHash": "sha256-cV5xEJJK3BvhU8rEd4mC9UsmDi5qscv/kzGPhBRC5WA=", "narHash": "sha256-B44WL6h0XoLjJ41bUPJk0X5SDinLCII//6EcBLXKiJ0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9fbb54b33e91ee4ca368e35a78e0613c720600b3", "rev": "20b1ddd1aa5ace70c9468305030aa4f9ef79671b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -389,28 +369,6 @@
"type": "github" "type": "github"
} }
}, },
"nixvim": {
"inputs": {
"flake-parts": "flake-parts_2",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_3"
},
"locked": {
"lastModified": 1787862710,
"narHash": "sha256-dL1Tv7LekaTWUJxHRckjbupWczDdc3QOgRuVCM+WAvQ=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "8c096abcf376137527c134da4ee210332b08ccc0",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixvim",
"type": "github"
}
},
"ny": { "ny": {
"flake": false, "flake": false,
"locked": { "locked": {
@@ -455,7 +413,6 @@
"nix-flatpak": "nix-flatpak", "nix-flatpak": "nix-flatpak",
"nix-vscode-extensions": "nix-vscode-extensions", "nix-vscode-extensions": "nix-vscode-extensions",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_4",
"nixvim": "nixvim",
"plasma-manager": "plasma-manager", "plasma-manager": "plasma-manager",
"sidra": "sidra", "sidra": "sidra",
"vscode-server": "vscode-server" "vscode-server": "vscode-server"
@@ -488,7 +445,7 @@
"sf-compact": { "sf-compact": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-83JwqfF9O4+gemMQXWHLRg2GNz2jHxsej1F1IkM2dug=", "narHash": "sha256-KjCzuJOrNxgptsMLGaR8wcrU/bBxCpwtUGzGDcCxJTc=",
"type": "file", "type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg" "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
}, },
@@ -536,7 +493,7 @@
"sf-pro": { "sf-pro": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-vINUEMyFmNzZRBOX2aQ4heScWur6RyA/MPmsqlMPIx4=", "narHash": "sha256-dvGLO786y9ygKRSKDJlhIF6AGmn2NTJ5tBulKinPRxY=",
"type": "file", "type": "file",
"url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg" "url": "https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
}, },
@@ -552,11 +509,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1787786351, "lastModified": 1789899222,
"narHash": "sha256-IdcF4NFQORtS2FJ7aXYDod204+WQS8ymmdqiqbUMlMY=", "narHash": "sha256-B00sDpFqhTYuVQIesCdR7GeYJFNogz5U1VmJlSEJnmc=",
"owner": "wimpysworld", "owner": "wimpysworld",
"repo": "sidra", "repo": "sidra",
"rev": "126a06eb4d3ba1c19ada5ca1a8c4869b37db574a", "rev": "ebba6a85eadd15de9d324503b012f84bf5eaf4ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -595,23 +552,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": {
"flake": false,
"locked": {
"lastModified": 1774449309,
"narHash": "sha256-brhZ8DmuGtzkCYHJg4HEd602amKm89Y9ytsFZ5uWD1w=",
"owner": "nix-systems",
"repo": "default",
"rev": "c29398b59d2048c4ab79345812849c9bd15e9150",
"type": "github"
},
"original": {
"owner": "nix-systems",
"ref": "future-26.11",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@@ -635,7 +575,7 @@
}, },
"vscode-server": { "vscode-server": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3" "flake-parts": "flake-parts_2"
}, },
"locked": { "locked": {
"lastModified": 1784312229, "lastModified": 1784312229,
-8
View File
@@ -21,10 +21,6 @@
url = "github:gmodena/nix-flatpak/?ref=latest"; url = "github:gmodena/nix-flatpak/?ref=latest";
}; };
vscode-server.url = "github:nix-community/nixos-vscode-server"; vscode-server.url = "github:nix-community/nixos-vscode-server";
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
llm-agents.url = "github:numtide/llm-agents.nix"; llm-agents.url = "github:numtide/llm-agents.nix";
nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions";
agenix = { agenix = {
@@ -57,7 +53,6 @@
home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.sharedModules = [ home-manager.sharedModules = [
plasma-manager.homeModules.plasma-manager plasma-manager.homeModules.plasma-manager
inputs.nixvim.homeModules.nixvim
]; ];
home-manager.users.emmatherock = { osConfig, ... }: { home-manager.users.emmatherock = { osConfig, ... }: {
imports = [ ./home/emmatherock/core.nix ] ++ osConfig.myHomeProfile.extraPrograms; imports = [ ./home/emmatherock/core.nix ] ++ osConfig.myHomeProfile.extraPrograms;
@@ -79,9 +74,6 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; }; home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.sharedModules = [
inputs.nixvim.homeModules.nixvim
];
home-manager.users.emmatherock = { osConfig, ... }: { home-manager.users.emmatherock = { osConfig, ... }: {
imports = [ ./home/emmatherock/core.nix ] ++ osConfig.myHomeProfile.extraPrograms; imports = [ ./home/emmatherock/core.nix ] ++ osConfig.myHomeProfile.extraPrograms;
}; };
+1 -2
View File
@@ -5,10 +5,9 @@ let
in in
{ {
home.packages = with agents; [ home.packages = with agents; [
gemini-cli
codex codex
codex-acp codex-acp
claude-code claude-code
claude-agent-acp claude-agent-acp
]; ];
} }
+1 -2
View File
@@ -8,8 +8,7 @@
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.btop.enable = true; programs.btop.enable = true;
# Per-project toolchain resolution (nix-shell / flake devShell), used by # Per-project toolchain resolution through nix-shell / flake devShell.
# nixvim's LSP servers so they don't need language toolchains installed globally.
programs.direnv = { programs.direnv = {
enable = true; enable = true;
nix-direnv.enable = true; nix-direnv.enable = true;
-206
View File
@@ -1,206 +0,0 @@
# Declarative Neovim config via nixvim. Goal: a real, lean IDE — not a
# feature-for-feature VSCode clone. Every plugin here earns its place.
{ pkgs, ... }:
{
programs.nixvim = {
enable = true;
defaultEditor = true;
vimAlias = true; # `vim` -> nvim, handy when SSH'd into the VPS/homelab
colorschemes.catppuccin = {
enable = true;
settings.flavour = "mocha";
};
globals.mapleader = " ";
opts = {
number = true;
relativenumber = true;
shiftwidth = 2;
tabstop = 2;
expandtab = true;
termguicolors = true;
signcolumn = "yes";
scrolloff = 8;
};
# --- File explorer ---
plugins.neo-tree = {
enable = true;
settings.window.width = 30;
};
# --- Fuzzy finder: files, grep, buffers, LSP symbols ---
plugins.telescope = {
enable = true;
extensions.fzf-native.enable = true;
};
# --- Treesitter: syntax highlighting/parsing for your stack ---
plugins.treesitter = {
enable = true;
settings.ensure_installed = [
"nix" "bash" "lua" "markdown" "json" "yaml"
"rust" "go" "gomod" "c" "cpp" "c_sharp" "python"
"javascript" "typescript" "tsx" "vue" "html" "css"
];
};
# --- LSP: one server per language/toolchain you use ---
plugins.lsp = {
enable = true;
servers = {
nixd.enable = true;
bashls.enable = true;
rust_analyzer = {
enable = true;
installCargo = true;
installRustc = true;
};
gopls.enable = true;
clangd.enable = true; # C / C++
csharp_ls.enable = true;
pyright.enable = true;
ts_ls.enable = true; # JS/TS, React
volar.enable = true; # Vue
html.enable = true;
cssls.enable = true;
tailwindcss.enable = true;
jsonls.enable = true;
};
keymaps.lspBuf = {
"gd" = "definition";
"gr" = "references";
"K" = "hover";
"<leader>rn" = "rename";
"<leader>ca" = "code_action";
};
};
# --- Autocompletion ---
plugins.cmp = {
enable = true;
settings.sources = [
{ name = "nvim_lsp"; }
{ name = "path"; }
{ name = "buffer"; }
];
};
plugins.cmp-nvim-lsp.enable = true;
plugins.cmp-path.enable = true;
plugins.cmp-buffer.enable = true;
# --- Format on save ---
plugins.conform-nvim = {
enable = true;
settings = {
format_on_save = {
lsp_fallback = true;
timeout_ms = 500;
};
formatters_by_ft = {
rust = [ "rustfmt" ];
go = [ "gofmt" ];
c = [ "clang-format" ];
cpp = [ "clang-format" ];
python = [ "black" ];
javascript = [ "prettier" ];
typescript = [ "prettier" ];
javascriptreact = [ "prettier" ];
typescriptreact = [ "prettier" ];
vue = [ "prettier" ];
nix = [ "nixpkgs-fmt" ];
};
};
};
# --- Git: gutter signs, hunk stage/reset, blame ---
plugins.gitsigns.enable = true;
# --- Statusline ---
plugins.lualine.enable = true;
# --- Discoverable keybindings while you're still learning ---
plugins.which-key.enable = true;
# --- AI agent: CodeCompanion, curated natively in nixvim ---
# Configured to reuse your existing `claude`/`gemini` CLI auth via ACP
# adapters instead of a separate Anthropic Console API key.
#
# Verified against https://codecompanion.olimorris.dev/configuration/adapters-acp
# (CodeCompanion >= v18.0.0, which is what's pinned by nixvim's nixpkgs as of
# 2026-08). Two things changed from an older/assumed layout:
# - the default-adapter key is `interactions.chat.adapter`, not
# `strategies.chat.adapter` (renamed in v18.0.0);
# - the built-in adapter names are `claude_code` and `gemini_cli` (no
# `_acp` suffix) and live under `adapters.acp.<name>`.
#
# Neither adapter has a true zero-config mode that silently piggybacks on
# an already-logged-in CLI session:
# - gemini_cli: `defaults.auth_method = "oauth-personal"` reuses the
# `gemini` CLI's own login — no key needed, closest thing to "just
# use my existing session".
# - claude_code: there's no oauth-personal equivalent. Run
# `claude setup-token` once (ties to your Pro/Max subscription rather
# than a Console API key) and save the result to
# ~/.config/codecompanion/claude-oauth-token (chmod 600, outside the
# nix store). It's read at runtime via the `cmd:` prefix below rather
# than embedded in this file.
plugins.codecompanion = {
enable = true;
settings = {
interactions.chat.adapter = "claude_code"; # switch to "gemini_cli" per-chat
adapters.acp = {
claude_code.__raw = ''
function()
return require("codecompanion.adapters").extend("claude_code", {
env = {
CLAUDE_CODE_OAUTH_TOKEN = "cmd:cat ~/.config/codecompanion/claude-oauth-token",
},
})
end
'';
gemini_cli.__raw = ''
function()
return require("codecompanion.adapters").extend("gemini_cli", {
defaults = {
auth_method = "oauth-personal",
},
})
end
'';
};
};
};
# --- Editor-level tooling only: formatters conform.nvim shells out to.
# Language toolchains themselves (cargo, go, dotnet-sdk, nodejs,
# a compiler, a python interpreter) come from your per-project
# nix-shell / flake devShell, not from here — launch nvim from
# inside that shell (`nix develop`, or nix-shell + direnv) so LSP
# servers resolve the right toolchain via PATH.
extraPackages = with pkgs; [
python3Packages.black
prettier
nixpkgs-fmt
file
ripgrep
sqlite
];
keymaps = [
{ mode = "n"; key = "<leader>e"; action = "<cmd>Neotree toggle<CR>"; }
{ mode = "n"; key = "<leader>ff"; action = "<cmd>Telescope find_files<CR>"; }
{ mode = "n"; key = "<leader>fg"; action = "<cmd>Telescope live_grep<CR>"; }
{ mode = "n"; key = "<leader>fb"; action = "<cmd>Telescope buffers<CR>"; }
# CodeCompanion
{ mode = [ "n" "v" ]; key = "<leader>ac"; action = "<cmd>CodeCompanionChat Toggle<CR>"; }
{ mode = "v"; key = "<leader>aa"; action = "<cmd>CodeCompanionChat Add<CR>"; }
{ mode = "n"; key = "<leader>ai"; action = "<cmd>CodeCompanion<CR>"; } # inline assistant
];
};
}
+32 -4
View File
@@ -5,6 +5,7 @@
./hardware-configuration.nix ./hardware-configuration.nix
../../modules/profiles/desktop.nix ../../modules/profiles/desktop.nix
../../modules/profiles/server.nix ../../modules/profiles/server.nix
../../modules/services/ollama.nix
../../modules/services/samba.nix ../../modules/services/samba.nix
../../modules/system/home-profile.nix ../../modules/system/home-profile.nix
../../modules/system/nix-ld.nix ../../modules/system/nix-ld.nix
@@ -27,7 +28,6 @@
../../home/emmatherock/deskflow.nix ../../home/emmatherock/deskflow.nix
../../home/emmatherock/gaming.nix ../../home/emmatherock/gaming.nix
../../home/emmatherock/media.nix ../../home/emmatherock/media.nix
../../home/emmatherock/neovim.nix
../../home/emmatherock/packages.nix ../../home/emmatherock/packages.nix
../../home/emmatherock/plasma.nix ../../home/emmatherock/plasma.nix
../../home/emmatherock/vscode.nix ../../home/emmatherock/vscode.nix
@@ -37,7 +37,7 @@
hostName = "miku-homelab"; hostName = "miku-homelab";
useNetworkManager = true; useNetworkManager = true;
staticIp = { staticIp = {
interface = "enp6s0"; interface = "enp9s0";
address = "10.1.1.21"; address = "10.1.1.21";
prefixLength = 24; prefixLength = 24;
gateway = "10.1.1.1"; gateway = "10.1.1.1";
@@ -111,7 +111,35 @@
plymouth.enable = true; plymouth.enable = true;
initrd.kernelModules = [ "amdgpu" ]; initrd.kernelModules = [ "amdgpu" ];
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
kernelParams = [ "quiet" "splash" "boot.shell_on_fail" "loglevel=3" "iommu=pt" ]; kernelParams = [
"quiet"
"splash"
"boot.shell_on_fail"
"loglevel=3"
"iommu=pt"
"zswap.enabled=1"
"zswap.compressor=zstd"
"zswap.max_pool_percent=20"
"zswap.zpool=zsmalloc"
];
};
swapDevices = [
{
device = "/dev/disk/by-label/optane-swap-1";
priority = 50;
}
{
device = "/dev/disk/by-label/optane-swap-2";
priority = 50;
}
];
zramSwap = {
enable = true;
algorithm = "zstd";
memoryPercent = 50;
priority = 100;
}; };
time.timeZone = "America/Argentina/Buenos_Aires"; time.timeZone = "America/Argentina/Buenos_Aires";
@@ -147,7 +175,7 @@
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = "${pkgs.ethtool}/bin/ethtool -K enp6s0 rx-udp-gro-forwarding on rx-gro-list on"; ExecStart = "${pkgs.ethtool}/bin/ethtool -K enp9s0 rx-udp-gro-forwarding on rx-gro-list on";
RemainAfterExit = true; RemainAfterExit = true;
}; };
}; };
+10 -1
View File
@@ -13,7 +13,6 @@
myHomeProfile.extraPrograms = [ myHomeProfile.extraPrograms = [
../../home/emmatherock/agents.nix ../../home/emmatherock/agents.nix
../../home/emmatherock/neovim.nix
]; ];
myNetworking = { myNetworking = {
@@ -42,6 +41,10 @@
publicKey = "bqxDHQNxOSFpTo3We9ujC2WljtaRBgiNEewW+Rlu10k="; publicKey = "bqxDHQNxOSFpTo3We9ujC2WljtaRBgiNEewW+Rlu10k=";
allowedIPs = [ "10.20.0.2/32" ]; allowedIPs = [ "10.20.0.2/32" ];
} }
{
publicKey = "6aw0w7v9uFGvLn/eSdf7z/ljvzz4kviYlSOSj0LKp1E=";
allowedIPs = [ "10.20.0.3/32" ];
}
]; ];
}; };
}; };
@@ -71,6 +74,12 @@
boot.loader.systemd-boot.configurationLimit = 10; boot.loader.systemd-boot.configurationLimit = 10;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
# Required for this host to act as a Tailscale/Headscale exit node.
boot.kernel.sysctl = {
"net.ipv4.ip_forward" = 1;
"net.ipv6.conf.all.forwarding" = 1;
};
time.timeZone = "America/Argentina/Buenos_Aires"; time.timeZone = "America/Argentina/Buenos_Aires";
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
+3 -1
View File
@@ -9,5 +9,7 @@
options = "--delete-older-than 14d"; options = "--delete-older-than 14d";
}; };
services.journald.extraConfig = "SystemMaxUse=500M"; services.journald.settings.Journal = {
SystemMaxUse = "500M";
};
} }
+35
View File
@@ -0,0 +1,35 @@
{ pkgs, ... }:
{
services.ollama = {
enable = true;
# `services.ollama.acceleration` does not exist (that option only lives on
# services.tabby); GPU backend selection for ollama is done by package choice.
package = pkgs.ollama-rocm;
# Same "don't expose services directly" pattern as the rest of the homelab:
# bind to localhost only. If this needs to be reachable from other devices
# later, put it behind Traefik + Headscale like the other services instead
# of opening it up directly.
host = "127.0.0.1";
port = 11434;
environmentVariables = {
# Ollama is on-demand by design: it loads a model into VRAM on the first
# request and unloads it after this much idle time. 5m is already the
# ollama default, set explicitly so it's not an implicit behavior.
OLLAMA_KEEP_ALIVE = "5m";
};
# RDNA4 (gfx1200/gfx1201, incl. the RX 9060 XT) has official ROCm support
# since ROCm 6.4.4. Verified on this host (2026-08-30) with rocmPackages.clr
# 7.2.3: `rocminfo` correctly reports "Name: gfx1200" and `rocm-smi
# --showmeminfo vram` reports the full 16GiB, so the "detected with 0 VRAM,
# falls back to CPU" issue does not reproduce here and rocmOverrideGfx is
# not needed. If a future nixpkgs bump regresses this, re-check with:
# nix shell nixpkgs#rocmPackages.rocminfo -c rocminfo | grep -i gfx
# nix shell nixpkgs#rocmPackages.rocm-smi -c rocm-smi --showmeminfo vram
# and only then set rocmOverrideGfx = "12.0.0"; (gfx1200) if VRAM reports 0.
# rocmOverrideGfx = "12.0.0";
};
}