Compare commits
32 Commits
014216de6b
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
2624e68a7c
|
|||
|
4335687f48
|
|||
|
44cd77e46f
|
|||
|
5b66eb3049
|
|||
|
1eddde2bdb
|
|||
|
31c72186ad
|
|||
|
f566267663
|
|||
|
5c14b05c16
|
|||
|
f613917d4c
|
|||
|
a765ea2844
|
|||
|
36dd8b8c34
|
|||
|
977c15a57f
|
|||
|
c348c97ea0
|
|||
|
9d6017432d
|
|||
|
9c9935b550
|
|||
|
5da4d36d25
|
|||
|
d83b03bbd8
|
|||
|
c371552dfd
|
|||
|
8b5111e9a1
|
|||
|
cca5c48725
|
|||
|
b4e4036c41
|
|||
|
3aab755e37
|
|||
|
6e361b197c
|
|||
|
6fd0b18746
|
|||
|
0c15063a58
|
|||
|
9056237e8a
|
|||
|
64b450bbe7
|
|||
|
8eee1ab82f
|
|||
|
c133ff306e
|
|||
|
5a53ce36e9
|
|||
|
7c25228bc5
|
|||
|
1ca8cc8c57
|
@@ -0,0 +1,2 @@
|
||||
.omc/
|
||||
wg1.conf
|
||||
+94
-7
@@ -105,6 +105,10 @@
|
||||
adwaita-icon-theme
|
||||
pkgs-unstable.claude-code # Use unstable for latest version
|
||||
yubikey-manager
|
||||
# iOS interop
|
||||
uxplay
|
||||
libimobiledevice
|
||||
ifuse
|
||||
];
|
||||
|
||||
# Some programs need SUID wrappers, can be configured further or are
|
||||
@@ -116,6 +120,12 @@
|
||||
pinentryPackage = pkgs.pinentry-gnome3;
|
||||
};
|
||||
|
||||
# AirDrop-style file transfer (LocalSend)
|
||||
programs.localsend = {
|
||||
enable = true;
|
||||
openFirewall = true;
|
||||
};
|
||||
|
||||
# List services that you want to enable:
|
||||
|
||||
# Enable the OpenSSH daemon.
|
||||
@@ -125,7 +135,7 @@
|
||||
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||
# Or disable the firewall altogether.
|
||||
# networking.firewall.enable = false;
|
||||
networking.firewall.enable = false;
|
||||
|
||||
# This value determines the NixOS release from which the default
|
||||
# settings for stateful data, like file locations and database versions
|
||||
@@ -174,16 +184,63 @@
|
||||
};
|
||||
|
||||
|
||||
services.tailscale = {
|
||||
enable = true;
|
||||
useRoutingFeatures = "client"; # or "both" for subnet routing
|
||||
# WireGuard VPN
|
||||
networking.wg-quick.interfaces.wg0 = {
|
||||
address = [ "10.0.1.67/32" ];
|
||||
dns = [ "1.1.1.1" ];
|
||||
privateKeyFile = "/etc/wireguard/private.key";
|
||||
|
||||
# Route endpoint via local gateway to avoid routing loop
|
||||
preUp = ''
|
||||
GW=$(ip route show default | awk '{print $3; exit}')
|
||||
DEV=$(ip route show default | awk '{print $5; exit}')
|
||||
ip route add 69.48.243.22/32 via "$GW" dev "$DEV" || true
|
||||
'';
|
||||
postDown = ''
|
||||
ip route del 69.48.243.22/32 || true
|
||||
'';
|
||||
|
||||
peers = [{
|
||||
publicKey = "VEpzr/CeGdS6Wsy0NDDfmlB/bCYxS55A155HWGCIIzc=";
|
||||
endpoint = "69.48.243.22:51820";
|
||||
# Route all traffic through VPN EXCEPT the local 10.0.0.0/24 network
|
||||
allowedIPs = [
|
||||
"0.0.0.0/5"
|
||||
"8.0.0.0/7"
|
||||
"10.0.1.0/24"
|
||||
"10.0.2.0/23"
|
||||
"10.0.4.0/22"
|
||||
"10.0.8.0/21"
|
||||
"10.0.16.0/20"
|
||||
"10.0.32.0/19"
|
||||
"10.0.64.0/18"
|
||||
"10.0.128.0/17"
|
||||
"10.1.0.0/16"
|
||||
"10.2.0.0/15"
|
||||
"10.4.0.0/14"
|
||||
"10.8.0.0/13"
|
||||
"10.16.0.0/12"
|
||||
"10.32.0.0/11"
|
||||
"10.64.0.0/10"
|
||||
"10.128.0.0/9"
|
||||
"11.0.0.0/8"
|
||||
"12.0.0.0/6"
|
||||
"16.0.0.0/4"
|
||||
"32.0.0.0/3"
|
||||
"64.0.0.0/2"
|
||||
"128.0.0.0/1"
|
||||
];
|
||||
persistentKeepalive = 25;
|
||||
}];
|
||||
};
|
||||
|
||||
# Open firewall for Tailscale
|
||||
|
||||
# Open firewall for Tailscale + UxPlay AirPlay receiver
|
||||
networking.firewall = {
|
||||
checkReversePath = "loose";
|
||||
trustedInterfaces = [ "tailscale0" ];
|
||||
allowedUDPPorts = [ config.services.tailscale.port ];
|
||||
trustedInterfaces = [ "tailscale0" "wg0" ];
|
||||
allowedTCPPorts = [ 7000 7001 7100 ];
|
||||
allowedUDPPorts = [ config.services.tailscale.port 6000 6001 7011 ];
|
||||
};
|
||||
|
||||
# Auto-connect tailscale on boot
|
||||
@@ -216,10 +273,40 @@
|
||||
# Enable necessary services
|
||||
xdg.portal = {
|
||||
enable = true;
|
||||
extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
|
||||
};
|
||||
|
||||
services.pcscd.enable = true;
|
||||
|
||||
# iPhone USB mount (libimobiledevice)
|
||||
services.usbmuxd.enable = true;
|
||||
|
||||
# mDNS for AirPlay receiver (UxPlay) discovery from iPhone
|
||||
services.avahi = {
|
||||
enable = true;
|
||||
nssmdns4 = true;
|
||||
openFirewall = true;
|
||||
publish = {
|
||||
enable = true;
|
||||
addresses = true;
|
||||
userServices = true;
|
||||
};
|
||||
};
|
||||
|
||||
# Auto-start UxPlay with the graphical session so iOS Screen Mirroring
|
||||
# can find this host without manually launching it.
|
||||
systemd.user.services.uxplay = {
|
||||
description = "UxPlay AirPlay Mirror Receiver";
|
||||
partOf = [ "graphical-session.target" ];
|
||||
after = [ "graphical-session.target" "pipewire.service" ];
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
serviceConfig = {
|
||||
ExecStart = "${pkgs.uxplay}/bin/uxplay";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 5;
|
||||
};
|
||||
};
|
||||
|
||||
security.pam.services = {
|
||||
login.u2fAuth = true;
|
||||
sudo.u2fAuth = true;
|
||||
|
||||
Generated
+44
-10
@@ -1,5 +1,21 @@
|
||||
{
|
||||
"nodes": {
|
||||
"caveman": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1776507098,
|
||||
"narHash": "sha256-M+NoWXxrhtbkbe/lmq7P0/KpmqOZzJjhgeUVjY+7N2k=",
|
||||
"owner": "JuliusBrussee",
|
||||
"repo": "caveman",
|
||||
"rev": "84cc3c14fa1e10182adaced856e003406ccd250d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "JuliusBrussee",
|
||||
"repo": "caveman",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
@@ -25,11 +41,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772633058,
|
||||
"narHash": "sha256-SO7JapRy2HPhgmqiLbfnW1kMx5rakPMKZ9z3wtRLQjI=",
|
||||
"lastModified": 1775077333,
|
||||
"narHash": "sha256-OXcxobt7lBkh1B8AjwreU+24myhtKpqeLfAeIyNLFY8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "080657a04188aca25f8a6c70a0fb2ea7e37f1865",
|
||||
"rev": "49ca96b2714c5931e17401eff87f3edd42d2b0f2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -76,11 +92,11 @@
|
||||
},
|
||||
"nixpkgs-unstable": {
|
||||
"locked": {
|
||||
"lastModified": 1773597492,
|
||||
"narHash": "sha256-hQ284SkIeNaeyud+LS0WVLX+WL2rxcVZLFEaK0e03zg=",
|
||||
"lastModified": 1779536132,
|
||||
"narHash": "sha256-q+fF42iv/geEbHfgSzy3tS0FF/EyD6XTZ98E6yxiBO8=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a07d4ce6bee67d7c838a8a5796e75dff9caa21ef",
|
||||
"rev": "3d8f0f3f72a6cd4d93d0ad13203f2ea1cb7e1456",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -92,11 +108,11 @@
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1772822230,
|
||||
"narHash": "sha256-yf3iYLGbGVlIthlQIk5/4/EQDZNNEmuqKZkQssMljuw=",
|
||||
"lastModified": 1775002709,
|
||||
"narHash": "sha256-d3Yx83vSrN+2z/loBh4mJpyRqr9aAJqlke4TkpFmRJA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "71caefce12ba78d84fe618cf61644dce01cf3a96",
|
||||
"rev": "bcd464ccd2a1a7cd09aa2f8d4ffba83b761b1d0e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -106,12 +122,30 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"oh-my-claudecode": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1776693787,
|
||||
"narHash": "sha256-C/m8Vlt6MXy8nlgqtoey9A5JnVTHCPkGUjar9x5Y2uw=",
|
||||
"owner": "Yeachan-Heo",
|
||||
"repo": "oh-my-claudecode",
|
||||
"rev": "084fc47266824b35f4c8cbe886c0990ae716c184",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Yeachan-Heo",
|
||||
"repo": "oh-my-claudecode",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"caveman": "caveman",
|
||||
"home-manager": "home-manager",
|
||||
"kickstart-nvim": "kickstart-nvim",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable"
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"oh-my-claudecode": "oh-my-claudecode"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
|
||||
@@ -9,9 +9,17 @@
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
kickstart-nvim.url = "github:0xWheatyz/kickstart.nvim";
|
||||
caveman = {
|
||||
url = "github:JuliusBrussee/caveman";
|
||||
flake = false;
|
||||
};
|
||||
oh-my-claudecode = {
|
||||
url = "github:Yeachan-Heo/oh-my-claudecode";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, kickstart-nvim, ... }:
|
||||
outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, kickstart-nvim, caveman, oh-my-claudecode, ... }:
|
||||
let
|
||||
system = "x86_64-linux";
|
||||
pkgs-unstable = import nixpkgs-unstable {
|
||||
@@ -31,7 +39,7 @@
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users.l-wyatt = import ./home.nix;
|
||||
home-manager.extraSpecialArgs = {
|
||||
inherit kickstart-nvim;
|
||||
inherit kickstart-nvim caveman oh-my-claudecode;
|
||||
};
|
||||
home-manager.sharedModules = [
|
||||
kickstart-nvim.homeManagerModules.default
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, pkgs, ... }:
|
||||
{ config, pkgs, lib, caveman, oh-my-claudecode, ... }:
|
||||
|
||||
{
|
||||
home.username = "l-wyatt";
|
||||
@@ -20,13 +20,15 @@
|
||||
bitwarden-cli
|
||||
lunarvim
|
||||
minicom
|
||||
kicad
|
||||
ghostty
|
||||
gnupg
|
||||
pinentry-gnome3
|
||||
gnomeExtensions.blur-my-shell
|
||||
gnomeExtensions.just-perfection
|
||||
gnomeExtensions.arc-menu
|
||||
freecad
|
||||
gtk3 # Provides org.gtk.Settings.FileChooser schema for FreeCAD
|
||||
nodejs # Required by claude-code and oh-my-claudecode (HUD, npm plugins)
|
||||
];
|
||||
|
||||
# --------------------------
|
||||
@@ -121,6 +123,9 @@
|
||||
};
|
||||
};
|
||||
|
||||
# Disable GCR ssh-agent so gpg-agent handles SSH
|
||||
systemd.user.sockets.gcr-ssh-agent.Install.WantedBy = lib.mkForce [];
|
||||
|
||||
# GPG configuration
|
||||
programs.gpg = {
|
||||
enable = true;
|
||||
@@ -141,7 +146,7 @@
|
||||
programs.git = {
|
||||
enable = true;
|
||||
signing = {
|
||||
key = null; # Will be set after GPG key generation
|
||||
key = "0xADCEAC560B498269";
|
||||
signByDefault = true;
|
||||
};
|
||||
settings = {
|
||||
@@ -202,9 +207,30 @@
|
||||
# Use kickstart.nvim configuration from flake
|
||||
programs.neovim-kickstart.enable = true;
|
||||
|
||||
# Claude Code skills (managed declaratively via flake inputs)
|
||||
home.file.".claude/skills/caveman" = {
|
||||
source = "${caveman}/skills/caveman";
|
||||
recursive = true;
|
||||
};
|
||||
home.file.".claude/skills/caveman-help" = {
|
||||
source = "${caveman}/skills/caveman-help";
|
||||
recursive = true;
|
||||
};
|
||||
home.file.".claude/skills" = {
|
||||
source = "${oh-my-claudecode}/skills";
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
# Claude Code agents (managed declaratively via flake inputs)
|
||||
home.file.".claude/agents" = {
|
||||
source = "${oh-my-claudecode}/agents";
|
||||
recursive = true;
|
||||
};
|
||||
|
||||
# Claude Code configuration
|
||||
home.file.".claude/CLAUDE.md" = {
|
||||
text = ''
|
||||
text = builtins.readFile "${oh-my-claudecode}/CLAUDE.md" + ''
|
||||
|
||||
## Commit Behavior
|
||||
|
||||
After completing each logical unit of work, use the /commit skill to stage
|
||||
@@ -245,18 +271,35 @@
|
||||
|
||||
home.file.".claude/settings.json" = {
|
||||
text = builtins.toJSON {
|
||||
hasCompletedOnboarding = true;
|
||||
permissions = {
|
||||
allow = [
|
||||
"Edit"
|
||||
"Write"
|
||||
"Bash(git:*)"
|
||||
"Bash(nix-shell:*)"
|
||||
"Bash(nix eval:*)"
|
||||
"Bash(nix flake check:*)"
|
||||
];
|
||||
"Read"
|
||||
"Glob"
|
||||
"Grep"
|
||||
"Bash"
|
||||
"WebFetch"
|
||||
"WebSearch"
|
||||
"Agent"
|
||||
"NotebookEdit"
|
||||
"Monitor"
|
||||
];
|
||||
};
|
||||
alwaysThinkingEnabled = true;
|
||||
includeCoAuthoredBy = false;
|
||||
statusLine = {
|
||||
type = "command";
|
||||
command = "node \${CLAUDE_CONFIG_DIR:-$HOME/.claude}/hud/omc-hud.mjs";
|
||||
};
|
||||
env = {
|
||||
CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS = "1";
|
||||
OMC_PLUGIN_ROOT = "${oh-my-claudecode}";
|
||||
#ANTHROPIC_BASE_URL = "http://10.0.1.16:20128/v1";
|
||||
#ANTHROPIC_AUTH_TOKEN = "sk-634d6ea8670969de-qzxian-1a74cc97";
|
||||
};
|
||||
teammateMode = "tmux";
|
||||
};
|
||||
force = true;
|
||||
};
|
||||
@@ -290,7 +333,7 @@
|
||||
proxyJump = "_JumpHost";
|
||||
};
|
||||
"git" = {
|
||||
hostname = "10.0.1.10";
|
||||
hostname = "gitea.leeworks.dev";
|
||||
port = 22;
|
||||
user = "git";
|
||||
};
|
||||
|
||||
-22
@@ -1,27 +1,5 @@
|
||||
# Post-Rebuild YubiKey Setup Guide
|
||||
|
||||
## Step 0: Rebuild & Reboot
|
||||
|
||||
```bash
|
||||
nixos-rebuild switch
|
||||
# Then reboot to ensure gpg-agent replaces gnome-keyring as SSH agent
|
||||
reboot
|
||||
```
|
||||
|
||||
After reboot, verify the new environment:
|
||||
|
||||
```bash
|
||||
gpg --version # Should show GnuPG 2.4+
|
||||
ykman info # Should show your YubiKey model/serial
|
||||
gpg --card-status # Should show the YubiKey smartcard
|
||||
echo $SSH_AUTH_SOCK # Should point to gpg-agent socket, NOT gcr
|
||||
```
|
||||
|
||||
> If `gpg --card-status` hangs or errors, restart pcscd:
|
||||
> `sudo systemctl restart pcscd`
|
||||
|
||||
---
|
||||
|
||||
## Step 1: Generate GPG Master Key
|
||||
|
||||
```bash
|
||||
|
||||
Reference in New Issue
Block a user