Compare commits
276 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| eb06533174 | |||
| 0d81b0e5e9 | |||
| 0ea8b8d2eb | |||
| 30a9a23de2 | |||
| 6d0149ee6e | |||
| d19b87f8cd | |||
| 8f5d076d7b | |||
| 3c9a107608 | |||
| cc01c1d0aa | |||
| d59a6b82b6 | |||
| d44bdad73a | |||
| 797ffb2b8a | |||
| 73bd2b1f2e | |||
| f3749c5679 | |||
| 9908b9e335 | |||
| 06b430e067 | |||
| 1b5bcae686 | |||
| b1eb50a350 | |||
| 383f4ef56f | |||
| d47680aef7 | |||
| 047b60a6a8 | |||
| 382b4c8c98 | |||
| 90fbdfe346 | |||
| 7e0d60c95b | |||
| e289698960 | |||
| 24e39d19e3 | |||
| 197704ee95 | |||
| 53a30c7af3 | |||
| 4684c5dc3e | |||
| 55aac2c910 | |||
| fa608ae399 | |||
| 717e7b0291 | |||
| 40507bb930 | |||
| 7bf686481c | |||
| 3868f69958 | |||
| ab3332e45b | |||
| c92868308b | |||
| 6a58b3656a | |||
| 6853bb3063 | |||
| 38c27eff1c | |||
| d9d4b6cd85 | |||
| 44c0234739 | |||
| 4f0a92e43b | |||
| 87939ce630 | |||
| 1bc1616a4f | |||
| 43523cf2d8 | |||
| 08baa5ee83 | |||
| 114644ce63 | |||
| 411c67d2c6 | |||
| e9f20d7dda | |||
| 4ae2bb0f48 | |||
| b08be9132b | |||
| e4195230a5 | |||
| 674ce6957c | |||
| a9022a4f55 | |||
| fa9747f3e9 | |||
| 4920029c65 | |||
| a12958b68f | |||
| 2e550b91f5 | |||
| 1d3564f360 | |||
| 8ead26a791 | |||
| 87baf2377f | |||
| 7b9caedaa4 | |||
| 105e573c53 | |||
| eda9f2a1f9 | |||
| f3536919f0 | |||
| 5c0fe5abda | |||
| f80e907277 | |||
| ffed020289 | |||
| a7ac2232ee | |||
| c28c1953d0 | |||
| f7a1591451 | |||
| b6dab69d42 | |||
| b6fa6c1bcf | |||
| 2449532b30 | |||
| 39d2b5a609 | |||
| 3b2d19f8a6 | |||
| 4439e6d173 | |||
| 048244f122 | |||
| 09e93ef6f0 | |||
| dd59d2a56d | |||
| f9415c05f9 | |||
| e1de4805ce | |||
| f482759c2e | |||
| ad35d27135 | |||
| 18ef6174bb | |||
| 9dfaccb77e | |||
| 5e4e007b67 | |||
| 1316d3268f | |||
| b76db4800a | |||
| 5ff19bccbe | |||
| 5713202dc9 | |||
| 4b386040db | |||
| e7a02dc45e | |||
| 9566e6cd77 | |||
| c1f274d63a | |||
| 1092fc98a5 | |||
| b2fff7b104 | |||
| c8752086a2 | |||
| 175f971809 | |||
| bb85c4b40d | |||
| 21957d895c | |||
| ffd26b3139 | |||
| b2cdc7db2a | |||
| eab4c26ca4 | |||
| f615f3bd6a | |||
| 841d7abbe7 | |||
| 6ac20b65f4 | |||
| 460fc927ec | |||
| 949e017b22 | |||
| 27d162f3ae | |||
| 90a5e53510 | |||
| 5d707efe7b | |||
| 2f4273c86f | |||
| 436928b187 | |||
| f529c59400 | |||
| 0e6ea7e6a3 | |||
| aaf82b29da | |||
| d24c6b28f8 | |||
| 8f4b39d277 | |||
| dea4ca9377 | |||
| 6cd1fdd651 | |||
| b66553888b | |||
| 35becfdea4 | |||
| b2ad6005bc | |||
| 150dd20d32 | |||
| bab10c3273 | |||
| d5e13e2099 | |||
| 20706ce6a3 | |||
| e9baa42695 | |||
| 2e6bf051f0 | |||
| a5f544e8d3 | |||
| a81aee81b1 | |||
| d2c127c396 | |||
| 846a88475a | |||
| bbb79160ae | |||
| cc0f4c66ce | |||
| 7c355127c7 | |||
| 6ce51f5cf2 | |||
| d96e054ef3 | |||
| 7a3f368aca | |||
| 9e44101016 | |||
| d5b06c496d | |||
| 669ed55dc0 | |||
| 578bfd527f | |||
| 2715ddc617 | |||
| eedf92819c | |||
| 0ff5c04d23 | |||
| 55e8c6cae5 | |||
| b54213cfbb | |||
| a11ee7ee02 | |||
| 8c9860674b | |||
| e1719204e9 | |||
| 72ceffc61d | |||
| 22cbc7c5a2 | |||
| 68ecbd3bf1 | |||
| f85332f321 | |||
| 040d03423d | |||
| cf731e7309 | |||
| e0aa2783bb | |||
| 7854d75742 | |||
| 80cff4278d | |||
| f33bfec02e | |||
| 20bdd1c7b6 | |||
| 7fec29f602 | |||
| a3a85c3596 | |||
| 279d00ae82 | |||
| ad87c67161 | |||
| 53ce9740bd | |||
| 881a65263d | |||
| 32503965ab | |||
| 3d52c0576e | |||
| cc38372ee0 | |||
| e461fc494a | |||
| 5a5b434efd | |||
| d69a9b9b38 | |||
| b6e8a1614b | |||
| f560c59be5 | |||
| 01a2cbc808 | |||
| 9b6e6a6992 | |||
| 02f8b6d787 | |||
| 40d6c9692a | |||
| 374a17e6fc | |||
| b1e1a95a1c | |||
| 74e7ee8364 | |||
| c32a94b82c | |||
| 0e6ea2bacb | |||
| 8a2b5438af | |||
| 81ee763318 | |||
| 1c0b67c2a0 | |||
| 42aa44a56b | |||
| 466cbaf048 | |||
| b47e20afad | |||
| e93bdf20a3 | |||
| 779473317d | |||
| 39782b6eb9 | |||
| 960ea9503d | |||
| df41024693 | |||
| 73fd3ef108 | |||
| 221ffed715 | |||
| 3637aee724 | |||
| c0e8cfd773 | |||
| ede0af92cd | |||
| f812a1de83 | |||
| eb84e24369 | |||
| d51894816c | |||
| c7fb70c88d | |||
| 2db7d8c1fd | |||
| ce168609ca | |||
| 842b01b647 | |||
| fa734b5c85 | |||
| a4d8d6890c | |||
| 262902c018 | |||
| 2ffd84eb4e | |||
| 39e1187948 | |||
| 74d4940e27 | |||
| 25b1fa76d7 | |||
| b281290bef | |||
| e02d76f981 | |||
| 9bcb33e58a | |||
| 994f7f6f74 | |||
| e98e224af9 | |||
| b2e01747e5 | |||
| 75ae18b73e | |||
| 4a48ee92cb | |||
| e0dda1eb0a | |||
| bd97658bd2 | |||
| 8785824cde | |||
| f5ca531962 | |||
| 446be80ef1 | |||
| 28ab56d302 | |||
| 190fb2d6d1 | |||
| e4b87c6908 | |||
| 65a69df52b | |||
| e75166e5fc | |||
| c18b2d1f94 | |||
| a39436da6f | |||
| 05c614d3b1 | |||
| b3c4a9b3ba | |||
| 4c0c2181ef | |||
| 6606d63a20 | |||
| 38187bc92c | |||
| 4f39502228 | |||
| 5e128fb2bc | |||
| 85515be4f0 | |||
| a9453ed3a0 | |||
| 61588df0b3 | |||
| e94c5d4df8 | |||
| 5c2ba374f9 | |||
| 0d7efd1c33 | |||
| 157fc4d38c | |||
| 4c9988a7af | |||
| 24a7fa1313 | |||
| 2b6fc478ff | |||
| 4789069624 | |||
| 2f970debdd | |||
| 12a3620712 | |||
| 6ff2466245 | |||
| 50332e55e8 | |||
| 1251081494 | |||
| e16566bf09 | |||
| ccca2ab4ff | |||
| 0007b10a71 | |||
| 0fde93d646 | |||
| 936b6b5c9b | |||
| 657df4e92b | |||
| 1864141a1b | |||
| 79df3dd5c7 | |||
| 431188a943 | |||
| 0ebf64e7ee | |||
| ff3d1735c0 | |||
| 8912665aa6 | |||
| 2c6c92140f | |||
| 74f93cb0e3 | |||
| 6b24828482 | |||
| 5c0ad5d634 |
@@ -0,0 +1,73 @@
|
||||
# Dolt database (managed by Dolt, not git)
|
||||
dolt/
|
||||
embeddeddolt/
|
||||
|
||||
# Runtime files
|
||||
bd.sock
|
||||
bd.sock.startlock
|
||||
sync-state.json
|
||||
last-touched
|
||||
.exclusive-lock
|
||||
|
||||
# Daemon runtime (lock, log, pid)
|
||||
daemon.*
|
||||
|
||||
# Interactions log (runtime, not versioned)
|
||||
interactions.jsonl
|
||||
|
||||
# Push state (runtime, per-machine)
|
||||
push-state.json
|
||||
|
||||
# Lock files (various runtime locks)
|
||||
*.lock
|
||||
|
||||
# Credential key (encryption key for federation peer auth — never commit)
|
||||
.beads-credential-key
|
||||
|
||||
# Local version tracking (prevents upgrade notification spam after git ops)
|
||||
.local_version
|
||||
|
||||
# Worktree redirect file (contains relative path to main repo's .beads/)
|
||||
# Must not be committed as paths would be wrong in other clones
|
||||
redirect
|
||||
|
||||
# Sync state (local-only, per-machine)
|
||||
# These files are machine-specific and should not be shared across clones
|
||||
.sync.lock
|
||||
export-state/
|
||||
export-state.json
|
||||
|
||||
# Ephemeral store (SQLite - wisps/molecules, intentionally not versioned)
|
||||
ephemeral.sqlite3
|
||||
ephemeral.sqlite3-journal
|
||||
ephemeral.sqlite3-wal
|
||||
ephemeral.sqlite3-shm
|
||||
|
||||
# Dolt server management (auto-started by bd)
|
||||
dolt-server.pid
|
||||
dolt-server.log
|
||||
dolt-server.lock
|
||||
dolt-server.port
|
||||
dolt-server.activity
|
||||
|
||||
# Corrupt backup directories (created by bd doctor --fix recovery)
|
||||
*.corrupt.backup/
|
||||
|
||||
# Backup data (auto-exported JSONL, local-only)
|
||||
backup/
|
||||
|
||||
# Per-project environment file (Dolt connection config, GH#2520)
|
||||
.env
|
||||
|
||||
# Legacy files (from pre-Dolt versions)
|
||||
*.db
|
||||
*.db?*
|
||||
*.db-journal
|
||||
*.db-wal
|
||||
*.db-shm
|
||||
db.sqlite
|
||||
bd.db
|
||||
# NOTE: Do NOT add negation patterns here.
|
||||
# They would override fork protection in .git/info/exclude.
|
||||
# Config files (metadata.json, config.yaml) are tracked by git by default
|
||||
# since no pattern above ignores them.
|
||||
@@ -0,0 +1,81 @@
|
||||
# Beads - AI-Native Issue Tracking
|
||||
|
||||
Welcome to Beads! This repository uses **Beads** for issue tracking - a modern, AI-native tool designed to live directly in your codebase alongside your code.
|
||||
|
||||
## What is Beads?
|
||||
|
||||
Beads is issue tracking that lives in your repo, making it perfect for AI coding agents and developers who want their issues close to their code. No web UI required - everything works through the CLI and integrates seamlessly with git.
|
||||
|
||||
**Learn more:** [github.com/steveyegge/beads](https://github.com/steveyegge/beads)
|
||||
|
||||
## Quick Start
|
||||
|
||||
### Essential Commands
|
||||
|
||||
```bash
|
||||
# Create new issues
|
||||
bd create "Add user authentication"
|
||||
|
||||
# View all issues
|
||||
bd list
|
||||
|
||||
# View issue details
|
||||
bd show <issue-id>
|
||||
|
||||
# Update issue status
|
||||
bd update <issue-id> --claim
|
||||
bd update <issue-id> --status done
|
||||
|
||||
# Sync with Dolt remote
|
||||
bd dolt push
|
||||
```
|
||||
|
||||
### Working with Issues
|
||||
|
||||
Issues in Beads are:
|
||||
- **Git-native**: Stored in Dolt database with version control and branching
|
||||
- **AI-friendly**: CLI-first design works perfectly with AI coding agents
|
||||
- **Branch-aware**: Issues can follow your branch workflow
|
||||
- **Always in sync**: Auto-syncs with your commits
|
||||
|
||||
## Why Beads?
|
||||
|
||||
✨ **AI-Native Design**
|
||||
- Built specifically for AI-assisted development workflows
|
||||
- CLI-first interface works seamlessly with AI coding agents
|
||||
- No context switching to web UIs
|
||||
|
||||
🚀 **Developer Focused**
|
||||
- Issues live in your repo, right next to your code
|
||||
- Works offline, syncs when you push
|
||||
- Fast, lightweight, and stays out of your way
|
||||
|
||||
🔧 **Git Integration**
|
||||
- Automatic sync with git commits
|
||||
- Branch-aware issue tracking
|
||||
- Dolt-native three-way merge resolution
|
||||
|
||||
## Get Started with Beads
|
||||
|
||||
Try Beads in your own projects:
|
||||
|
||||
```bash
|
||||
# Install Beads
|
||||
curl -sSL https://raw.githubusercontent.com/steveyegge/beads/main/scripts/install.sh | bash
|
||||
|
||||
# Initialize in your repo
|
||||
bd init
|
||||
|
||||
# Create your first issue
|
||||
bd create "Try out Beads"
|
||||
```
|
||||
|
||||
## Learn More
|
||||
|
||||
- **Documentation**: [github.com/steveyegge/beads/docs](https://github.com/steveyegge/beads/tree/main/docs)
|
||||
- **Quick Start Guide**: Run `bd quickstart`
|
||||
- **Examples**: [github.com/steveyegge/beads/examples](https://github.com/steveyegge/beads/tree/main/examples)
|
||||
|
||||
---
|
||||
|
||||
*Beads: Issue tracking that moves at the speed of thought* ⚡
|
||||
@@ -0,0 +1,56 @@
|
||||
# Beads Configuration File
|
||||
# This file configures default behavior for all bd commands in this repository
|
||||
# All settings can also be set via environment variables (BD_* prefix)
|
||||
# or overridden with command-line flags
|
||||
|
||||
# Issue prefix for this repository (used by bd init)
|
||||
# If not set, bd init will auto-detect from directory name
|
||||
# Example: issue-prefix: "myproject" creates issues like "myproject-1", "myproject-2", etc.
|
||||
# issue-prefix: ""
|
||||
|
||||
# Use no-db mode: JSONL-only, no Dolt database
|
||||
# When true, bd will use .beads/issues.jsonl as the source of truth
|
||||
# no-db: false
|
||||
|
||||
# Enable JSON output by default
|
||||
# json: false
|
||||
|
||||
# Feedback title formatting for mutating commands (create/update/close/dep/edit)
|
||||
# 0 = hide titles, N > 0 = truncate to N characters
|
||||
# output:
|
||||
# title-length: 255
|
||||
|
||||
# Default actor for audit trails (overridden by BEADS_ACTOR or --actor)
|
||||
# actor: ""
|
||||
|
||||
# Export events (audit trail) to .beads/events.jsonl on each flush/sync
|
||||
# When enabled, new events are appended incrementally using a high-water mark.
|
||||
# Use 'bd export --events' to trigger manually regardless of this setting.
|
||||
# events-export: false
|
||||
|
||||
# Multi-repo configuration (experimental - bd-307)
|
||||
# Allows hydrating from multiple repositories and routing writes to the correct database
|
||||
# repos:
|
||||
# primary: "." # Primary repo (where this database lives)
|
||||
# additional: # Additional repos to hydrate from (read-only)
|
||||
# - ~/beads-planning # Personal planning repo
|
||||
# - ~/work-planning # Work planning repo
|
||||
|
||||
# JSONL backup (periodic export for off-machine recovery)
|
||||
# Auto-enabled when a git remote exists. Override explicitly:
|
||||
# backup:
|
||||
# enabled: false # Disable auto-backup entirely
|
||||
# interval: 15m # Minimum time between auto-exports
|
||||
# git-push: false # Disable git push (export locally only)
|
||||
# git-repo: "" # Separate git repo for backups (default: project repo)
|
||||
|
||||
# Integration settings (access with 'bd config get/set')
|
||||
# These are stored in the database, not in this file:
|
||||
# - jira.url
|
||||
# - jira.project
|
||||
# - linear.url
|
||||
# - linear.api-key
|
||||
# - github.org
|
||||
# - github.repo
|
||||
|
||||
sync.remote: "git+ssh://gitea@code.m3ta.dev/m3tam3re/nixos-config.git"
|
||||
Executable
+24
@@ -0,0 +1,24 @@
|
||||
#!/usr/bin/env sh
|
||||
# --- BEGIN BEADS INTEGRATION v1.0.2 ---
|
||||
# This section is managed by beads. Do not remove these markers.
|
||||
if command -v bd >/dev/null 2>&1; then
|
||||
export BD_GIT_HOOK=1
|
||||
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
|
||||
if command -v timeout >/dev/null 2>&1; then
|
||||
timeout "$_bd_timeout" bd hooks run post-checkout "$@"
|
||||
_bd_exit=$?
|
||||
if [ $_bd_exit -eq 124 ]; then
|
||||
echo >&2 "beads: hook 'post-checkout' timed out after ${_bd_timeout}s — continuing without beads"
|
||||
_bd_exit=0
|
||||
fi
|
||||
else
|
||||
bd hooks run post-checkout "$@"
|
||||
_bd_exit=$?
|
||||
fi
|
||||
if [ $_bd_exit -eq 3 ]; then
|
||||
echo >&2 "beads: database not initialized — skipping hook 'post-checkout'"
|
||||
_bd_exit=0
|
||||
fi
|
||||
if [ $_bd_exit -ne 0 ]; then exit $_bd_exit; fi
|
||||
fi
|
||||
# --- END BEADS INTEGRATION v1.0.2 ---
|
||||
Executable
+24
@@ -0,0 +1,24 @@
|
||||
#!/usr/bin/env sh
|
||||
# --- BEGIN BEADS INTEGRATION v1.0.2 ---
|
||||
# This section is managed by beads. Do not remove these markers.
|
||||
if command -v bd >/dev/null 2>&1; then
|
||||
export BD_GIT_HOOK=1
|
||||
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
|
||||
if command -v timeout >/dev/null 2>&1; then
|
||||
timeout "$_bd_timeout" bd hooks run post-merge "$@"
|
||||
_bd_exit=$?
|
||||
if [ $_bd_exit -eq 124 ]; then
|
||||
echo >&2 "beads: hook 'post-merge' timed out after ${_bd_timeout}s — continuing without beads"
|
||||
_bd_exit=0
|
||||
fi
|
||||
else
|
||||
bd hooks run post-merge "$@"
|
||||
_bd_exit=$?
|
||||
fi
|
||||
if [ $_bd_exit -eq 3 ]; then
|
||||
echo >&2 "beads: database not initialized — skipping hook 'post-merge'"
|
||||
_bd_exit=0
|
||||
fi
|
||||
if [ $_bd_exit -ne 0 ]; then exit $_bd_exit; fi
|
||||
fi
|
||||
# --- END BEADS INTEGRATION v1.0.2 ---
|
||||
Executable
+24
@@ -0,0 +1,24 @@
|
||||
#!/usr/bin/env sh
|
||||
# --- BEGIN BEADS INTEGRATION v1.0.2 ---
|
||||
# This section is managed by beads. Do not remove these markers.
|
||||
if command -v bd >/dev/null 2>&1; then
|
||||
export BD_GIT_HOOK=1
|
||||
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
|
||||
if command -v timeout >/dev/null 2>&1; then
|
||||
timeout "$_bd_timeout" bd hooks run pre-commit "$@"
|
||||
_bd_exit=$?
|
||||
if [ $_bd_exit -eq 124 ]; then
|
||||
echo >&2 "beads: hook 'pre-commit' timed out after ${_bd_timeout}s — continuing without beads"
|
||||
_bd_exit=0
|
||||
fi
|
||||
else
|
||||
bd hooks run pre-commit "$@"
|
||||
_bd_exit=$?
|
||||
fi
|
||||
if [ $_bd_exit -eq 3 ]; then
|
||||
echo >&2 "beads: database not initialized — skipping hook 'pre-commit'"
|
||||
_bd_exit=0
|
||||
fi
|
||||
if [ $_bd_exit -ne 0 ]; then exit $_bd_exit; fi
|
||||
fi
|
||||
# --- END BEADS INTEGRATION v1.0.2 ---
|
||||
Executable
+24
@@ -0,0 +1,24 @@
|
||||
#!/usr/bin/env sh
|
||||
# --- BEGIN BEADS INTEGRATION v1.0.2 ---
|
||||
# This section is managed by beads. Do not remove these markers.
|
||||
if command -v bd >/dev/null 2>&1; then
|
||||
export BD_GIT_HOOK=1
|
||||
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
|
||||
if command -v timeout >/dev/null 2>&1; then
|
||||
timeout "$_bd_timeout" bd hooks run pre-push "$@"
|
||||
_bd_exit=$?
|
||||
if [ $_bd_exit -eq 124 ]; then
|
||||
echo >&2 "beads: hook 'pre-push' timed out after ${_bd_timeout}s — continuing without beads"
|
||||
_bd_exit=0
|
||||
fi
|
||||
else
|
||||
bd hooks run pre-push "$@"
|
||||
_bd_exit=$?
|
||||
fi
|
||||
if [ $_bd_exit -eq 3 ]; then
|
||||
echo >&2 "beads: database not initialized — skipping hook 'pre-push'"
|
||||
_bd_exit=0
|
||||
fi
|
||||
if [ $_bd_exit -ne 0 ]; then exit $_bd_exit; fi
|
||||
fi
|
||||
# --- END BEADS INTEGRATION v1.0.2 ---
|
||||
Executable
+24
@@ -0,0 +1,24 @@
|
||||
#!/usr/bin/env sh
|
||||
# --- BEGIN BEADS INTEGRATION v1.0.2 ---
|
||||
# This section is managed by beads. Do not remove these markers.
|
||||
if command -v bd >/dev/null 2>&1; then
|
||||
export BD_GIT_HOOK=1
|
||||
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
|
||||
if command -v timeout >/dev/null 2>&1; then
|
||||
timeout "$_bd_timeout" bd hooks run prepare-commit-msg "$@"
|
||||
_bd_exit=$?
|
||||
if [ $_bd_exit -eq 124 ]; then
|
||||
echo >&2 "beads: hook 'prepare-commit-msg' timed out after ${_bd_timeout}s — continuing without beads"
|
||||
_bd_exit=0
|
||||
fi
|
||||
else
|
||||
bd hooks run prepare-commit-msg "$@"
|
||||
_bd_exit=$?
|
||||
fi
|
||||
if [ $_bd_exit -eq 3 ]; then
|
||||
echo >&2 "beads: database not initialized — skipping hook 'prepare-commit-msg'"
|
||||
_bd_exit=0
|
||||
fi
|
||||
if [ $_bd_exit -ne 0 ]; then exit $_bd_exit; fi
|
||||
fi
|
||||
# --- END BEADS INTEGRATION v1.0.2 ---
|
||||
@@ -0,0 +1,7 @@
|
||||
{
|
||||
"database": "dolt",
|
||||
"backend": "dolt",
|
||||
"dolt_mode": "embedded",
|
||||
"dolt_database": "home_profile_restructuring",
|
||||
"project_id": "664fc7e3-94eb-4874-aab6-e47835abe9d8"
|
||||
}
|
||||
@@ -0,0 +1,3 @@
|
||||
|
||||
# Use bd merge for beads JSONL files
|
||||
.beads/issues.jsonl merge=beads
|
||||
+40
@@ -0,0 +1,40 @@
|
||||
# Sisyphus work session data
|
||||
.sisyphus/
|
||||
|
||||
# Editor files
|
||||
*~
|
||||
.*.swp
|
||||
.*.swo
|
||||
.*.swx
|
||||
|
||||
# Build artifacts
|
||||
result
|
||||
result-*
|
||||
.direnv/
|
||||
|
||||
# IDE
|
||||
.vscode/
|
||||
.idea/
|
||||
*.iml
|
||||
|
||||
# OS
|
||||
.DS_Store
|
||||
Thumbs.db
|
||||
|
||||
# Opencode rules
|
||||
.opencode-rules
|
||||
opencode.json
|
||||
|
||||
# AI agent state
|
||||
.sidecar/
|
||||
.sidecar-*
|
||||
.sisyphus/
|
||||
.sidecar-agent
|
||||
.sidecar-task
|
||||
.sidecar-pr
|
||||
.sidecar-start.sh
|
||||
.sidecar-base
|
||||
.td-root
|
||||
.cache
|
||||
.pi*
|
||||
.worktrees/
|
||||
@@ -0,0 +1,274 @@
|
||||
# NIXOS CONFIGURATION KNOWLEDGE BASE
|
||||
|
||||
**Generated:** 2025-12-31 16:13:40 UTC
|
||||
**Commit:** ebc8291
|
||||
**Branch:** HEAD
|
||||
|
||||
## OVERVIEW
|
||||
Personal NixOS configuration managing 6 hosts (4 servers, 2 desktops) using flakes, agenix secrets, and feature-based home-manager setup.
|
||||
|
||||
## STRUCTURE
|
||||
```
|
||||
./
|
||||
├── flake.nix # Main entry: host definitions, inputs, outputs
|
||||
├── secrets.nix # Agenix public key mappings
|
||||
├── hosts/
|
||||
│ ├── common/ # Shared: base config, users, extraServices, ports
|
||||
│ ├── m3-atlas/ # Server: 20+ containerized services with Traefik
|
||||
│ ├── m3-helios/ # Server: AdGuard, internal routing
|
||||
│ ├── m3-ares/ # Desktop: NVIDIA GPU, Btrfs
|
||||
│ ├── m3-kratos/ # Desktop: AMD GPU, ZFS
|
||||
│ └── m3-aether/ # Cloud VM
|
||||
├── home/
|
||||
│ ├── common/ # Home-manager base config
|
||||
│ ├── features/ # Modular feature toggles (cli, desktop, coding)
|
||||
│ └── m3tam3re/ # Per-host user configs
|
||||
├── modules/ # Custom NixOS/home-manager modules
|
||||
├── overlays/ # Package overlays (stable, locked, pinned, master)
|
||||
├── pkgs/ # Custom package definitions
|
||||
└── secrets/ # Agenix encrypted .age files (19 secrets)
|
||||
```
|
||||
|
||||
## WHERE TO LOOK
|
||||
|
||||
| Task | Location | Notes |
|
||||
|------|----------|-------|
|
||||
| Add new host | `flake.nix` + `hosts/<name>/` | Copy template from m3-atlas (server) or m3-ares (desktop) |
|
||||
| Add service to m3-atlas | `hosts/m3-atlas/services/` | See containers/ for Podman + Traefik pattern |
|
||||
| Configure desktop features | `home/features/desktop/` | Feature toggles with mkEnableOption |
|
||||
| Add CLI tool | `home/features/cli/` | Fish + Nushell integration expected |
|
||||
| Manage secrets | `secrets.nix` + `agenix -e` | SSH keys defined in secrets.nix |
|
||||
| Define ports | `hosts/common/ports.nix` | Centralized port registry |
|
||||
| Add user | `hosts/common/users/` | Shared across all hosts |
|
||||
| Custom packages | `pkgs/default.nix` | Exposed via flake outputs |
|
||||
|
||||
## CONVENTIONS
|
||||
|
||||
### Secrets (agenix)
|
||||
- **Create**: `agenix -e secrets/<name>.age` after adding keys to `secrets.nix`
|
||||
- **Reference**: `config.age.secrets.<name>.path` in service configs
|
||||
- **Pattern**: Service env files use `environmentFiles = [config.age.secrets.<service>-env.path]`
|
||||
|
||||
### Service Organization
|
||||
- **Native services**: `hosts/<host>/services/<service>.nix`
|
||||
- **Containers**: `hosts/<host>/services/containers/<service>.nix`
|
||||
- **Traefik integration**: All m3-atlas services include dynamic config for SSL + routing
|
||||
- **Networking**: Containers use dedicated `web` network (10.89.0.0/24) with static IPs
|
||||
|
||||
### Port Management
|
||||
- **Registry**: All ports defined in `hosts/common/ports.nix`
|
||||
- **Access**: `config.m3ta.ports.get "service-name"`
|
||||
- **Convention**: Internal services use 3000-3020 range
|
||||
|
||||
### Home-Manager Features
|
||||
- **Enable**: `features.<category>.<feature>.enable = true` in user config
|
||||
- **Categories**: `cli`, `desktop`, `coding`
|
||||
- **Pattern**: Features are opt-in modules with default.nix aggregators
|
||||
|
||||
### Multiple nixpkgs Inputs
|
||||
- **stable**: 25.11 release
|
||||
- **locked/pinned**: Specific commits for compatibility
|
||||
- **master**: Bleeding edge
|
||||
- **m3ta-nixpkgs**: Custom local overlay at `path:/home/m3tam3re/p/nix/nixpkgs`
|
||||
|
||||
## CODING RULES
|
||||
|
||||
This project uses coding rules from the AGENTS repository (`inputs.agents`) plus project-specific conventions.
|
||||
|
||||
### Standard Rules (AGENTS repo)
|
||||
|
||||
| Rule | Source | Purpose |
|
||||
|------|--------|---------|
|
||||
| `languages/nix.md` | AGENTS/rules/ | Nix language conventions, flake patterns |
|
||||
| `concerns/coding-style.md` | AGENTS/rules/ | General coding principles |
|
||||
| `concerns/naming.md` | AGENTS/rules/ | Naming conventions per language |
|
||||
| `concerns/documentation.md` | AGENTS/rules/ | Documentation standards |
|
||||
| `concerns/testing.md` | AGENTS/rules/ | Testing guidelines |
|
||||
| `concerns/git-workflow.md` | AGENTS/rules/ | Commit message format, branch naming |
|
||||
| `concerns/project-structure.md` | AGENTS/rules/ | Project layout conventions |
|
||||
|
||||
### NixOS-Config Specific Rules
|
||||
|
||||
#### Project Structure
|
||||
|
||||
```
|
||||
nixos-config/
|
||||
├── flake.nix # Entry point
|
||||
├── hosts/ # Host-specific NixOS configs
|
||||
│ ├── common/ # Shared: ports, users, base config
|
||||
│ ├── m3-atlas/ # Server with Traefik hub
|
||||
│ ├── m3-helios/ # AdGuard DNS
|
||||
│ ├── m3-ares/ # Desktop (NVIDIA)
|
||||
│ └── m3-kratos/ # Desktop (AMD)
|
||||
├── home/ # Home-manager configs
|
||||
│ ├── common/ # Shared home config
|
||||
│ ├── features/ # Feature modules (cli, desktop, coding)
|
||||
│ └── m3tam3re/ # User-specific configs
|
||||
├── modules/ # Custom NixOS/HM modules
|
||||
├── overlays/ # Package overlays
|
||||
├── pkgs/ # Custom packages
|
||||
└── secrets/ # Agenix encrypted secrets
|
||||
```
|
||||
|
||||
#### Naming Conventions
|
||||
|
||||
| Type | Convention | Example |
|
||||
|------|------------|---------|
|
||||
| Hosts | mythological-names | `m3-atlas`, `m3-helios` |
|
||||
| Files | hyphen-case | `my-service.nix` |
|
||||
| Variables | camelCase | `portHelpers`, `serviceConfig` |
|
||||
| Options | m3ta.* | `config.m3ta.ports.get` |
|
||||
| Packages | lowercase-hyphen | `hyprpaper-random` |
|
||||
|
||||
#### Nix Module Pattern
|
||||
|
||||
```nix
|
||||
{ config, lib, pkgs, ... }:
|
||||
with lib; let
|
||||
cfg = config.m3ta.myModule;
|
||||
in {
|
||||
options.m3ta.myModule = {
|
||||
enable = mkEnableOption "my module";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
# Configuration here
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
#### Anti-Patterns (Never Do)
|
||||
|
||||
| Don't | Do Instead |
|
||||
|-------|------------|
|
||||
| Hardcode ports | `config.m3ta.ports.get "service"` |
|
||||
| Skip secrets.nix update | Add keys first, then `agenix -e` |
|
||||
| Containers outside web network | `--network=web --ip=10.89.0.N` |
|
||||
| Skip Traefik for public services | Configure dynamic config |
|
||||
| Bypass extraServices flags | Use feature flags properly |
|
||||
| Use `fetchTarball` | Use flake inputs |
|
||||
| Use `with pkgs;` in modules | Explicit `pkgs.package` |
|
||||
|
||||
### Formatting & Linting
|
||||
|
||||
```bash
|
||||
# Format (alejandra)
|
||||
nix fmt
|
||||
|
||||
# Lint (statix, deadnix - only in dev shell)
|
||||
nix develop
|
||||
statix check .
|
||||
deadnix .
|
||||
|
||||
# Validate flake
|
||||
nix flake check
|
||||
```
|
||||
|
||||
### Commit Conventions
|
||||
|
||||
Format: `<type>: <brief description>`
|
||||
|
||||
Types: `feat`, `fix`, `docs`, `style`, `refactor`, `chore`
|
||||
|
||||
Examples:
|
||||
- `feat: add new host m3-hermes`
|
||||
- `fix: resolve port conflict in mem0 module`
|
||||
- `docs: update AGENTS.md with new service`
|
||||
- `style: format nix files`
|
||||
- `refactor: simplify port management`
|
||||
- `chore: update nixpkgs inputs`
|
||||
|
||||
### Tools in Dev Shell
|
||||
|
||||
| Tool | Purpose |
|
||||
|------|---------|
|
||||
| `alejandra` | Nix code formatter |
|
||||
| `nixd` | Nix language server |
|
||||
| `statix` | Nix linter |
|
||||
| `deadnix` | Find dead code |
|
||||
| `agenix` | Secret management |
|
||||
|
||||
## COMMANDS
|
||||
```bash
|
||||
# Build/deploy specific host
|
||||
sudo nixos-rebuild switch --flake .#m3-ares
|
||||
|
||||
# Build/deploy current host
|
||||
sudo nixos-rebuild switch --flake .#$(uname -n)
|
||||
|
||||
# Home-manager update
|
||||
home-manager --flake . switch
|
||||
|
||||
# Update all flake inputs
|
||||
nix flake update
|
||||
|
||||
# Add/edit secret
|
||||
agenix -e secrets/<name>.age
|
||||
|
||||
# Infrastructure shell (OpenTofu)
|
||||
nix develop .#infraShell
|
||||
|
||||
# Check configuration (no activation)
|
||||
nixos-rebuild dry-build --flake .#<hostname>
|
||||
```
|
||||
|
||||
## TRAEFIK PATTERNS (m3-atlas only)
|
||||
|
||||
### SSL Termination
|
||||
- **Provider**: Godaddy DNS challenge
|
||||
- **Cert storage**: `/var/lib/traefik/acme.json`
|
||||
- **Config**: `hosts/m3-atlas/services/traefik.nix`
|
||||
|
||||
### Service Integration Template
|
||||
```nix
|
||||
services.traefik.dynamicConfigOptions.http = {
|
||||
services.<name>.loadBalancer.servers = [{ url = "http://127.0.0.1:<port>"; }];
|
||||
routers.<name> = {
|
||||
rule = "Host(`<subdomain>.m3ta.dev`)";
|
||||
service = "<name>";
|
||||
tls.certResolver = "godaddy";
|
||||
};
|
||||
};
|
||||
```
|
||||
|
||||
### Container Pattern
|
||||
- **Network**: `--network=web --ip=10.89.0.<sequential>`
|
||||
- **Ports**: Bind localhost only (`127.0.0.1:<external>:<internal>`)
|
||||
- **Database access**: `--add-host=mysql:10.89.0.1` (gateway IP)
|
||||
|
||||
## HOST ROLES
|
||||
|
||||
| Host | Type | Hardware | Purpose |
|
||||
|------|------|----------|---------|
|
||||
| m3-atlas | Server | x86_64, disko | 20+ services, Traefik hub, PostgreSQL, MySQL |
|
||||
| m3-helios | Server | x86_64, disko | AdGuard DNS, internal routing |
|
||||
| m3-ares | Desktop | NVIDIA, Btrfs | Personal workstation, n8n, PostgreSQL |
|
||||
| m3-kratos | Desktop | AMD, ZFS | Workstation, mem0, PostgreSQL |
|
||||
| m3-aether | Cloud | QEMU | General purpose VM |
|
||||
| m3-daedalus | Laptop | home-only | Portable (no full NixOS config) |
|
||||
|
||||
## ANTI-PATTERNS (THIS PROJECT)
|
||||
|
||||
- **DON'T** add secrets to `secrets/` without updating `secrets.nix` public keys
|
||||
- **DON'T** hardcode ports - use `config.m3ta.ports.get` or add to registry
|
||||
- **DON'T** create containers outside the `web` network on m3-atlas
|
||||
- **DON'T** skip Traefik config for public-facing services on m3-atlas
|
||||
- **DON'T** bypass extraServices flags - use `hosts/common/extraServices/` pattern
|
||||
- **DON'T** commit unencrypted secrets or test with real credentials
|
||||
|
||||
## UNIQUE TO THIS CONFIG
|
||||
|
||||
- **Custom m3ta-nixpkgs**: Local overlay for unreleased/patched packages
|
||||
- **extraServices abstraction**: Boolean flags to toggle Podman, Ollama, virtualisation per host
|
||||
- **Mythological naming**: All hosts named after Greek mythology
|
||||
- **Dual domain strategy**: New services on `m3ta.dev`, legacy redirects from `m3tam3re.com`
|
||||
- **Per-host nixpkgs versions**: Different hosts can use different nixpkgs commits via specialArgs
|
||||
- **Container IP registry**: Static IP assignments in 10.89.0.0/24 subnet for predictable networking
|
||||
|
||||
## NOTES
|
||||
|
||||
- m3-atlas is the service hub - most complex configuration
|
||||
- Secrets require host SSH keys defined in `secrets.nix` before `agenix -e` works
|
||||
- Fish and Nushell both configured - choose per-user with shell aliases
|
||||
- Color scheme (Dracula) applied via nix-colors across all visual tools
|
||||
- See subdirectory AGENTS.md for deep dives on containers, desktop features, CLI tools
|
||||
@@ -1,7 +0,0 @@
|
||||
This repository is being used as a Dolt remote.
|
||||
|
||||
ref=refs/dolt/data
|
||||
|
||||
head=b30121458bb0b75b61e483e49b5084835b3777d8
|
||||
|
||||
timestamp=2026-06-13T06:18:23Z
|
||||
@@ -0,0 +1 @@
|
||||
{"$schema":"https://opencode.ai/config.json","instructions":[".opencode-rules/concerns/coding-style.md",".opencode-rules/concerns/naming.md",".opencode-rules/concerns/documentation.md",".opencode-rules/concerns/testing.md",".opencode-rules/concerns/git-workflow.md",".opencode-rules/concerns/project-structure.md",".opencode-rules/languages/nix.md"]}
|
||||
@@ -0,0 +1,191 @@
|
||||
# Agenix Secret Management Guide
|
||||
|
||||
A guide for creating and managing encrypted secrets using agenix in the nixos-config project.
|
||||
|
||||
## Prerequisites
|
||||
|
||||
- SSH key pair (ed25519 or rsa) in `~/.ssh/`
|
||||
- Access to the nixos-config repository
|
||||
- Secret added to `secrets.nix` with appropriate public keys
|
||||
|
||||
---
|
||||
|
||||
## Creating a New Secret
|
||||
|
||||
### Step 1: Add Secret to secrets.nix
|
||||
|
||||
Edit `secrets.nix` and add a new entry:
|
||||
|
||||
```nix
|
||||
"secrets/<your-secret-name>.age".publicKeys = systems ++ users;
|
||||
```
|
||||
|
||||
Where:
|
||||
- `<your-secret-name>` is the desired filename (without `.age`)
|
||||
- `systems` = hosts that can decrypt this secret
|
||||
- `users` = users that can decrypt this secret
|
||||
|
||||
Example:
|
||||
```nix
|
||||
"secrets/my-service-api-key.age".publicKeys = systems ++ users;
|
||||
```
|
||||
|
||||
### Step 2: Create the Encrypted Secret
|
||||
|
||||
Navigate to the nixos-config directory:
|
||||
|
||||
```bash
|
||||
cd ~/p/NIX/nixos-config
|
||||
```
|
||||
|
||||
Generate a secure random token (if needed):
|
||||
|
||||
```bash
|
||||
head -c 32 /dev/urandom | base64 | tr -d '\n'
|
||||
```
|
||||
|
||||
Or use a specific value:
|
||||
|
||||
```bash
|
||||
echo -n "your-secret-value-here" > /tmp/token.txt
|
||||
```
|
||||
|
||||
Encrypt and create the secret file:
|
||||
|
||||
```bash
|
||||
cat /tmp/token.txt | RULES=./secrets.nix nix develop . --command sh -c 'agenix -e secrets/<your-secret-name>.age'
|
||||
```
|
||||
|
||||
The `-e` flag encrypts stdin content into the age file. If no stdin is provided, agenix opens your editor.
|
||||
|
||||
### Step 3: Verify the Secret
|
||||
|
||||
Decrypt to verify:
|
||||
|
||||
```bash
|
||||
RULES=./secrets.nix nix develop . --command agenix -d secrets/<your-secret-name>.age
|
||||
```
|
||||
|
||||
You should see your secret value printed to stdout.
|
||||
|
||||
### Step 4: Use in NixOS Configuration
|
||||
|
||||
Reference the secret in your service config:
|
||||
|
||||
```nix
|
||||
{ config, ... }:
|
||||
|
||||
{
|
||||
# For environment files
|
||||
environmentFiles = [ config.age.secrets."my-secret-name".path ];
|
||||
|
||||
# For file-based secrets
|
||||
environmentFile = config.age.secrets."my-secret-name".path;
|
||||
}
|
||||
```
|
||||
|
||||
The secret will be available at `/run/agenix/<your-secret-name>` when the system builds.
|
||||
|
||||
---
|
||||
|
||||
## Common Patterns
|
||||
|
||||
### Token-Based Registration (e.g., Tuwunel)
|
||||
|
||||
```nix
|
||||
# secrets.nix
|
||||
"secrets/tuwunel-registration-token.age".publicKeys = systems ++ users;
|
||||
```
|
||||
|
||||
```nix
|
||||
# services/tuwunel.nix
|
||||
settings.global = {
|
||||
allow_registration = true;
|
||||
registration_token_file = config.age.secrets."tuwunel-registration-token".path;
|
||||
};
|
||||
```
|
||||
|
||||
### API Keys via Environment Files
|
||||
|
||||
```nix
|
||||
# secrets.nix
|
||||
"secrets/my-service-env.age".publicKeys = systems ++ users;
|
||||
```
|
||||
|
||||
Create `my-service-env.age` containing:
|
||||
```
|
||||
MY_SERVICE_API_KEY=your-key-here
|
||||
DATABASE_URL=postgres://...
|
||||
```
|
||||
|
||||
Reference in config:
|
||||
```nix
|
||||
environmentFiles = [ config.age.secrets."my-service-env".path ];
|
||||
```
|
||||
|
||||
### File-Based Secrets
|
||||
|
||||
For binary files or specific file paths:
|
||||
|
||||
```nix
|
||||
settings = {
|
||||
tls.cert = config.age.secrets."tls-cert".path;
|
||||
tls.key = config.age.secrets."tls-key".path;
|
||||
};
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Agenix Command Reference
|
||||
|
||||
| Command | Description |
|
||||
|---------|-------------|
|
||||
| `agenix -e <file.age>` | Edit/create encrypted secret (opens editor or uses stdin) |
|
||||
| `agenix -d <file.age>` | Decrypt and print to stdout |
|
||||
| `agenix -r` | Re-encrypt all secrets (after changing public keys) |
|
||||
| `agenix --validate-config` | Validate secrets.nix syntax |
|
||||
|
||||
### Environment Variables
|
||||
|
||||
| Variable | Default | Description |
|
||||
|----------|---------|-------------|
|
||||
| `RULES` | `./secrets.nix` | Path to secrets.nix file |
|
||||
| `EDITOR` | `$EDITOR` | Editor for interactive editing |
|
||||
|
||||
---
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
### "No identity found to decrypt"
|
||||
|
||||
**Cause**: No SSH private key available.
|
||||
|
||||
**Solution**: Ensure your private key is in `~/.ssh/`:
|
||||
- `~/.ssh/id_rsa`
|
||||
- `~/.ssh/id_ed25519`
|
||||
- Or specify with `-i /path/to/private/key`
|
||||
|
||||
### "Failed to find config root"
|
||||
|
||||
**Cause**: Agenix can't find `secrets.nix`.
|
||||
|
||||
**Solution**: Use `RULES=./secrets.nix` or run from the nixos-config directory.
|
||||
|
||||
### Rekeying Secrets
|
||||
|
||||
After adding new public keys to `secrets.nix`, re-encrypt all secrets:
|
||||
|
||||
```bash
|
||||
cd ~/p/NIX/nixos-config
|
||||
RULES=./secrets.nix nix develop . --command agenix -r
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Security Notes
|
||||
|
||||
- Never commit plaintext secrets to git
|
||||
- Always use `secrets.nix` for encryption keys
|
||||
- Include only necessary hosts/users in public keys
|
||||
- Rotate secrets periodically
|
||||
- Use `agenix -r` after modifying public keys
|
||||
@@ -0,0 +1,727 @@
|
||||
# Home Profile Restructuring Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** Restructure nixos-config/home/ from host-based to profile-based organization with clear separation between base, coding, profiles, desktop, and server layers.
|
||||
|
||||
**Architecture:** Three-layer model: Base (always loaded) → Coding (profile-independent) → Profiles/Context (freely combinable with constraints). Desktop and Server contexts are mutually exclusive.
|
||||
|
||||
**Tech Stack:** NixOS, Home Manager, Nix flakes
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
```
|
||||
home/
|
||||
├── base/ # IMMER geladen
|
||||
│ ├── default.nix
|
||||
│ ├── shell/
|
||||
│ │ ├── default.nix
|
||||
│ │ ├── nushell.nix # PRIMARY Shell
|
||||
│ │ └── starship.nix
|
||||
│ ├── cli-tools/
|
||||
│ │ ├── default.nix
|
||||
│ │ ├── fzf.nix
|
||||
│ │ ├── zellij.nix
|
||||
│ │ ├── nitch.nix
|
||||
│ │ └── television.nix
|
||||
│ └── secrets/
|
||||
│ └── secrets.nix
|
||||
│
|
||||
├── coding/ # Profil-unabhängig
|
||||
│ ├── default.nix
|
||||
│ ├── editor/
|
||||
│ │ ├── default.nix
|
||||
│ │ └── neovim.nix # Basis NeoVim (aus nixpkgs referenziert)
|
||||
│ ├── lsp/
|
||||
│ │ ├── default.nix
|
||||
│ │ └── servers.nix
|
||||
│ ├── git/
|
||||
│ │ └── git.nix
|
||||
│ └── agents/
|
||||
│ └── agents.nix # Agent-System (aus nixpkgs referenziert)
|
||||
│
|
||||
├── profiles/ # FREI KOMBINIERBAR
|
||||
│ ├── gaming/
|
||||
│ │ ├── default.nix
|
||||
│ │ ├── steam.nix
|
||||
│ │ └── gamescope.nix
|
||||
│ │
|
||||
│ └── media/
|
||||
│ ├── default.nix
|
||||
│ ├── obs.nix
|
||||
│ ├── ffmpeg.nix
|
||||
│ ├── yt-dlp.nix
|
||||
│ ├── kdenlive.nix
|
||||
│ └── handbrake.nix
|
||||
│
|
||||
├── desktop/ # NUR wenn context=desktop
|
||||
│ ├── default.nix
|
||||
│ ├── wm/
|
||||
│ │ ├── default.nix
|
||||
│ │ ├── hyprland.nix
|
||||
│ │ ├── wayland.nix
|
||||
│ │ └── rofi.nix
|
||||
│ ├── apps/
|
||||
│ │ ├── default.nix
|
||||
│ │ ├── obsidian.nix
|
||||
│ │ ├── office.nix
|
||||
│ │ ├── webapps.nix
|
||||
│ │ └── crypto.nix
|
||||
│ └── theme/
|
||||
│ ├── default.nix
|
||||
│ ├── fonts.nix
|
||||
│ ├── theme.nix
|
||||
│ └── wallpapers.nix
|
||||
│
|
||||
└── server/
|
||||
└── default.nix
|
||||
```
|
||||
|
||||
**Key Integration Points:**
|
||||
|
||||
| Component | Source | Notes |
|
||||
|-----------|--------|-------|
|
||||
| NeoVim Config | `inputs.m3ta-nixpkgs.pkgs.neovim-config` | Custom package in nixpkgs |
|
||||
| OpenCode Desktop | `inputs.m3ta-nixpkgs.pkgs.opencode-desktop` | Custom package |
|
||||
| Agent-System | `inputs.m3ta-nixpkgs.homeModules.coding.agents` | OpenCode, Claude Code, Pi |
|
||||
| Zed Editor | `inputs.m3ta-nixpkgs.homeModules.coding.editors` | Desktop-only via Zed Remote |
|
||||
| Editor Module | `inputs.m3ta-nixpkgs.homeModules.coding.editors` | NeoVim (base) + Zed (desktop) |
|
||||
|
||||
---
|
||||
|
||||
## Phase 1: Create New Structure
|
||||
|
||||
### Task 1: Create Directory Structure
|
||||
|
||||
**Files:**
|
||||
|
||||
- Create: `home/base/default.nix`
|
||||
- Create: `home/base/shell/default.nix`
|
||||
- Create: `home/base/shell/nushell.nix`
|
||||
- Create: `home/base/shell/starship.nix`
|
||||
- Create: `home/base/cli-tools/default.nix`
|
||||
- Create: `home/base/cli-tools/fzf.nix`
|
||||
- Create: `home/base/cli-tools/zellij.nix`
|
||||
- Create: `home/base/cli-tools/nitch.nix`
|
||||
- Create: `home/base/cli-tools/television.nix`
|
||||
- Create: `home/base/secrets/secrets.nix`
|
||||
- Create: `home/coding/default.nix`
|
||||
- Create: `home/coding/editor/default.nix`
|
||||
- Create: `home/coding/editor/neovim.nix`
|
||||
- Create: `home/coding/lsp/default.nix`
|
||||
- Create: `home/coding/lsp/servers.nix`
|
||||
- Create: `home/coding/git/git.nix`
|
||||
- Create: `home/coding/agents/agents.nix`
|
||||
- Create: `home/profiles/gaming/default.nix`
|
||||
- Create: `home/profiles/gaming/steam.nix`
|
||||
- Create: `home/profiles/gaming/gamescope.nix`
|
||||
- Create: `home/profiles/media/default.nix`
|
||||
- Create: `home/profiles/media/obs.nix`
|
||||
- Create: `home/profiles/media/ffmpeg.nix`
|
||||
- Create: `home/profiles/media/yt-dlp.nix`
|
||||
- Create: `home/profiles/media/kdenlive.nix`
|
||||
- Create: `home/profiles/media/handbrake.nix`
|
||||
- Create: `home/desktop/default.nix`
|
||||
- Create: `home/desktop/wm/default.nix`
|
||||
- Create: `home/desktop/wm/hyprland.nix`
|
||||
- Create: `home/desktop/wm/wayland.nix`
|
||||
- Create: `home/desktop/wm/rofi.nix`
|
||||
- Create: `home/desktop/apps/default.nix`
|
||||
- Create: `home/desktop/apps/obsidian.nix`
|
||||
- Create: `home/desktop/apps/office.nix`
|
||||
- Create: `home/desktop/apps/webapps.nix`
|
||||
- Create: `home/desktop/apps/crypto.nix`
|
||||
- Create: `home/desktop/theme/default.nix`
|
||||
- Create: `home/desktop/theme/fonts.nix`
|
||||
- Create: `home/desktop/theme/theme.nix`
|
||||
- Create: `home/desktop/theme/wallpapers.nix`
|
||||
- Create: `home/server/default.nix`
|
||||
- Modify: `home/default.nix` (Hauptaggregator)
|
||||
|
||||
- [ ] **Step 1: Create home/base/default.nix**
|
||||
|
||||
```nix
|
||||
# home/base/default.nix
|
||||
# Basis-Konfiguration: Shell + CLI-Tools + Secrets
|
||||
# Wird IMMER geladen (kein enable-Flag)
|
||||
|
||||
{ inputs, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./shell
|
||||
./cli-tools
|
||||
./secrets
|
||||
];
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Create home/base/shell/default.nix**
|
||||
|
||||
```nix
|
||||
# home/base/shell/default.nix
|
||||
{ inputs, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./nushell.nix
|
||||
./starship.nix
|
||||
];
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 3: Create home/base/shell/nushell.nix**
|
||||
|
||||
Migrated from: `home/features/cli/nushell.nix`
|
||||
|
||||
```nix
|
||||
# home/base/shell/nushell.nix
|
||||
# Primary shell - Nushell
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.nushell = {
|
||||
enable = true;
|
||||
configFile = ...;
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
nushell
|
||||
];
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 4: Create home/base/shell/starship.nix**
|
||||
|
||||
Migrated from: `home/features/cli/starship.nix`
|
||||
|
||||
- [ ] **Step 5: Create home/base/cli-tools/default.nix**
|
||||
|
||||
```nix
|
||||
# home/base/cli-tools/default.nix
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./fzf.nix
|
||||
./zellij.nix
|
||||
./nitch.nix
|
||||
./television.nix
|
||||
];
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 6: Create CLI tool modules**
|
||||
|
||||
Migrate from `home/features/cli/`:
|
||||
- `fzf.nix` → `home/base/cli-tools/fzf.nix`
|
||||
- `zellij.nix` → `home/base/cli-tools/zellij.nix`
|
||||
- `nitch.nix` → `home/base/cli-tools/nitch.nix`
|
||||
- `television.nix` → `home/base/cli-tools/television.nix`
|
||||
|
||||
- [ ] **Step 7: Create home/base/secrets/secrets.nix**
|
||||
|
||||
Migrated from: `home/features/cli/secrets.nix`
|
||||
|
||||
- [ ] **Step 8: Create home/coding/default.nix**
|
||||
|
||||
```nix
|
||||
# home/coding/default.nix
|
||||
# Coding-Konfiguration: Editor + LSP + Git + Agents
|
||||
# Wird geladen wenn coding Profil aktiviert
|
||||
|
||||
{ inputs, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./editor
|
||||
./lsp
|
||||
./git
|
||||
./agents
|
||||
];
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 9: Create home/coding/editor/default.nix**
|
||||
|
||||
References: `inputs.m3ta-nixpkgs.homeModules.coding.editors`
|
||||
|
||||
```nix
|
||||
# home/coding/editor/default.nix
|
||||
{ inputs, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# Importiert NeoVim (immer) + Zed (desktop)
|
||||
imports = [
|
||||
inputs.m3ta-nixpkgs.homeModules.coding.editors
|
||||
];
|
||||
|
||||
# NeoVim Config Package
|
||||
home.packages = [ inputs.m3ta-nixpkgs.packages.${pkgs.system}.neovim-config ];
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 10: Create home/coding/lsp/default.nix + servers.nix**
|
||||
|
||||
Migrate LSP configuration from existing setup
|
||||
|
||||
- [ ] **Step 11: Create home/coding/git/git.nix**
|
||||
|
||||
```nix
|
||||
# home/coding/git/git.nix
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
programs.git = {
|
||||
enable = true;
|
||||
# Git configuration
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 12: Create home/coding/agents/agents.nix**
|
||||
|
||||
References: `inputs.m3ta-nixpkgs.homeModules.coding.agents`
|
||||
|
||||
```nix
|
||||
# home/coding/agents/agents.nix
|
||||
{ inputs, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
inputs.m3ta-nixpkgs.homeModules.coding.agents
|
||||
];
|
||||
|
||||
# Agent-Konfiguration
|
||||
coding.agents.opencode = {
|
||||
enable = true;
|
||||
agentsInput = inputs.agents;
|
||||
# modelOverrides...
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 13: Create home/profiles/gaming/default.nix**
|
||||
|
||||
```nix
|
||||
# home/profiles/gaming/default.nix
|
||||
# Gaming Profile - frei kombinierbar
|
||||
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./steam.nix
|
||||
./gamescope.nix
|
||||
];
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 14: Create gaming profile modules**
|
||||
|
||||
- `steam.nix` - Steam + Steam Deck Tools
|
||||
- `gamescope.nix` - Gamescope Session
|
||||
|
||||
- [ ] **Step 15: Create home/profiles/media/default.nix**
|
||||
|
||||
```nix
|
||||
# home/profiles/media/default.nix
|
||||
# Media Profile - Content Creation / Streaming
|
||||
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./obs.nix
|
||||
./ffmpeg.nix
|
||||
./yt-dlp.nix
|
||||
./kdenlive.nix
|
||||
./handbrake.nix
|
||||
];
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 16: Create media profile modules**
|
||||
|
||||
Migrate from `home/features/desktop/media.nix`:
|
||||
- `obs.nix` - OBS Studio
|
||||
- `ffmpeg.nix` - FFmpeg + Tools
|
||||
- `yt-dlp.nix` - YouTube Downloader
|
||||
- `kdenlive.nix` - Kdenlive Video Editor
|
||||
- `handbrake.nix` - HandBrake
|
||||
|
||||
- [ ] **Step 17: Create home/desktop/default.nix**
|
||||
|
||||
```nix
|
||||
# home/desktop/default.nix
|
||||
# Desktop-Konfiguration - nur wenn context=desktop
|
||||
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# Zed Remote: Server-Zugriff via SSH
|
||||
programs.zed-editor = {
|
||||
enable = true;
|
||||
# Remote Connections Config
|
||||
};
|
||||
|
||||
imports = [
|
||||
./wm
|
||||
./apps
|
||||
./theme
|
||||
];
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 18: Create home/desktop/wm modules**
|
||||
|
||||
Migrate from `home/features/desktop/`:
|
||||
- `hyprland.nix` → `home/desktop/wm/hyprland.nix`
|
||||
- `wayland.nix` → `home/desktop/wm/wayland.nix`
|
||||
- `rofi.nix` → `home/desktop/wm/rofi.nix`
|
||||
|
||||
- [ ] **Step 19: Create home/desktop/apps modules**
|
||||
|
||||
Migrate from `home/features/desktop/`:
|
||||
- `obsidian.nix` → `home/desktop/apps/obsidian.nix`
|
||||
- `office.nix` → `home/desktop/apps/office.nix`
|
||||
- `webapps.nix` → `home/desktop/apps/webapps.nix`
|
||||
- `crypto.nix` → `home/desktop/apps/crypto.nix`
|
||||
|
||||
- [ ] **Step 20: Create home/desktop/theme modules**
|
||||
|
||||
Migrate from `home/features/desktop/`:
|
||||
- `fonts.nix` → `home/desktop/theme/fonts.nix`
|
||||
- `theme.nix` → `home/desktop/theme/theme.nix`
|
||||
- `wallpapers.nix` → `home/desktop/theme/wallpapers.nix`
|
||||
|
||||
- [ ] **Step 21: Create home/server/default.nix**
|
||||
|
||||
```nix
|
||||
# home/server/default.nix
|
||||
# Server-Konfiguration - nur wenn context=server
|
||||
# Minimal da primär via Zed Remote gearbeitet wird
|
||||
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# Server-spezifische Konfiguration falls nötig
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 22: Commit Phase 1**
|
||||
|
||||
```bash
|
||||
git add home/
|
||||
git commit -m "feat(home): create new directory structure
|
||||
|
||||
- Add base/ with shell, cli-tools, secrets
|
||||
- Add coding/ with editor, lsp, git, agents
|
||||
- Add profiles/ with gaming, media
|
||||
- Add desktop/ with wm, apps, theme
|
||||
- Add server/ minimal config
|
||||
- Reference m3ta-nixpkgs modules where appropriate"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Phase 2: Create Profile System with Constraints
|
||||
|
||||
### Task 2: Implement Profile Loader with Mutual Exclusion
|
||||
|
||||
**Files:**
|
||||
|
||||
- Create: `home/lib/default.nix` (Profile loading utilities)
|
||||
- Modify: `flake.nix` (Host-spezifische Home-Config)
|
||||
- Modify: `hosts/common/users/home.nix`
|
||||
|
||||
- [ ] **Step 1: Create home/lib/default.nix**
|
||||
|
||||
```nix
|
||||
# home/lib/default.nix
|
||||
# Profile loading utilities
|
||||
|
||||
{ lib }:
|
||||
|
||||
{
|
||||
# Generiert Home-Manager Konfiguration basierend auf Profilen
|
||||
mkHomeConfig = {
|
||||
profiles ? [],
|
||||
context ? null, # "desktop" | "server" | null
|
||||
}: let
|
||||
inherit (lib) optionalAttrs mkIf;
|
||||
|
||||
# Profile die immer geladen werden
|
||||
baseModules = [ ./base ];
|
||||
|
||||
# Profile die optional geladen werden
|
||||
profileModules = optionalAttrs (builtins.elem "coding" profiles) [ ./coding ];
|
||||
|
||||
# Context-spezifische Module
|
||||
contextModules = {
|
||||
desktop = [ ./desktop ];
|
||||
server = [ ./server ];
|
||||
};
|
||||
|
||||
# Profile-spezifische Module
|
||||
profileSpecific = {
|
||||
gaming = [ ./profiles/gaming ];
|
||||
media = [ ./profiles/media ];
|
||||
};
|
||||
|
||||
in {
|
||||
imports = baseModules ++ profileModules
|
||||
++ (contextModules.${context} or [])
|
||||
++ (builtins.map (p: ./profiles.${p})
|
||||
(builtins.filter (p: builtins.hasAttr p profileSpecific) profiles));
|
||||
};
|
||||
|
||||
# Assertion: desktop und server schließen sich aus
|
||||
mutualExclusiveContexts = builtins.hasAttr "desktop" && builtins.hasAttr "server";
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: Update flake.nix for m3-ares (Desktop)**
|
||||
|
||||
```nix
|
||||
# hosts/m3-ares/ (Desktop Beispiel)
|
||||
{ inputs, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
# Home-Manager für m3tam3re auf m3-ares
|
||||
home-manager.users.m3tam3re = { config, ... }: {
|
||||
# NEU: Profile-System
|
||||
m3ta.profiles = [ "coding" "gaming" "media" ]; # Freie Kombination
|
||||
m3ta.context = "desktop"; # Schließt "server" aus
|
||||
|
||||
# Alternativ: Legacy-Kompatibilität
|
||||
# imports = [ ./home ];
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 3: Update flake.nix for m3-atlas (Server)**
|
||||
|
||||
```nix
|
||||
# hosts/m3-atlas/ (Server Beispiel)
|
||||
{ inputs, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
home-manager.users.m3tam3re = { config, ... }: {
|
||||
m3ta.profiles = [ "coding" ]; # Nur Coding auf Server
|
||||
m3ta.context = "server"; # Schließt "desktop" aus
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 4: Add assertions in flake.nix**
|
||||
|
||||
```nix
|
||||
# Validation: Context constraints
|
||||
assertion = hostConfig.m3ta.context != "desktop" || hostConfig.m3ta.context != "server"
|
||||
|| (hostConfig.m3ta.context == null); # Mutually exclusive
|
||||
```
|
||||
|
||||
- [ ] **Step 5: Commit Phase 2**
|
||||
|
||||
```bash
|
||||
git add flake.nix hosts/
|
||||
git commit -m "feat: implement profile system with constraints
|
||||
|
||||
- Add home/lib for profile loading utilities
|
||||
- Add m3ta.profiles option (list of profiles)
|
||||
- Add m3ta.context option (desktop|server|null)
|
||||
- Add mutual exclusion assertion
|
||||
- Update m3-ares and m3-atlas as examples"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Phase 3: Migrate Existing Configuration
|
||||
|
||||
### Task 3: Migrate home/features to new Structure
|
||||
|
||||
**Files:**
|
||||
|
||||
- Modify: Multiple files in `home/features/` (move content, update paths)
|
||||
|
||||
- [ ] **Step 1: Map existing features to new structure**
|
||||
|
||||
| Old Location | New Location | Notes |
|
||||
|--------------|--------------|-------|
|
||||
| `home/features/cli/nushell.nix` | `home/base/shell/nushell.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/cli/starship.nix` | `home/base/shell/starship.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/cli/fzf.nix` | `home/base/cli-tools/fzf.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/cli/zellij.nix` | `home/base/cli-tools/zellij.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/cli/nitch.nix` | `home/base/cli-tools/nitch.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/cli/television.nix` | `home/base/cli-tools/television.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/cli/secrets.nix` | `home/base/secrets/secrets.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/coding/opencode.nix` | Reference via `m3ta-nixpkgs` | Update import |
|
||||
| `home/features/coding/pi.nix` | Reference via `m3ta-nixpkgs` | Update import |
|
||||
| `home/features/desktop/hyprland.nix` | `home/desktop/wm/hyprland.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/desktop/wayland.nix` | `home/desktop/wm/wayland.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/desktop/rofi.nix` | `home/desktop/wm/rofi.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/desktop/obsidian.nix` | `home/desktop/apps/obsidian.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/desktop/office.nix` | `home/desktop/apps/office.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/desktop/webapps.nix` | `home/desktop/apps/webapps.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/desktop/crypto.nix` | `home/desktop/apps/crypto.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/desktop/fonts.nix` | `home/desktop/theme/fonts.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/desktop/theme.nix` | `home/desktop/theme/theme.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/desktop/wallpapers.nix` | `home/desktop/theme/wallpapers.nix` | ✓ Done in Task 1 |
|
||||
| `home/features/desktop/media.nix` | `home/profiles/media/*.nix` | Split into modules |
|
||||
| `home/features/desktop/gaming.nix` | `home/profiles/gaming/*.nix` | Split into modules |
|
||||
|
||||
- [ ] **Step 2: Archive old structure**
|
||||
|
||||
```bash
|
||||
# After migration, archive old features/
|
||||
git mv home/features home/features.old
|
||||
```
|
||||
|
||||
- [ ] **Step 3: Verify all configurations are imported**
|
||||
|
||||
```bash
|
||||
# Check that all features are accessible in new structure
|
||||
nix flake check
|
||||
home-manager dry-activate
|
||||
```
|
||||
|
||||
- [ ] **Step 4: Commit Phase 3**
|
||||
|
||||
```bash
|
||||
git add -A
|
||||
git commit -m "chore: migrate features to profile structure
|
||||
|
||||
- Move all cli features to base/shell and base/cli-tools
|
||||
- Move desktop features to desktop/* subdirectories
|
||||
- Split media into individual profile modules
|
||||
- Split gaming into individual profile modules
|
||||
- Archive old features/ directory"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Phase 4: Test and Validate
|
||||
|
||||
### Task 4: Test Profile Combinations
|
||||
|
||||
**Files:**
|
||||
|
||||
- Test: Manual testing on m3-ares (Desktop)
|
||||
- Test: Manual testing on m3-atlas (Server)
|
||||
|
||||
- [ ] **Step 1: Test m3-ares (Desktop with all profiles)**
|
||||
|
||||
```bash
|
||||
# Build and test on m3-ares
|
||||
nixos-rebuild dry-build --flake .#m3-ares
|
||||
home-manager dry-activate --flake .#m3tam3re@m3-ares
|
||||
```
|
||||
|
||||
Expected: Loads base + coding + desktop + gaming + media
|
||||
|
||||
- [ ] **Step 2: Test m3-atlas (Server with coding only)**
|
||||
|
||||
```bash
|
||||
# Build and test on m3-atlas
|
||||
nixos-rebuild dry-build --flake .#m3-atlas
|
||||
home-manager dry-activate --flake .#m3tam3re@m3-atlas
|
||||
```
|
||||
|
||||
Expected: Loads base + coding + server (no desktop modules)
|
||||
|
||||
- [ ] **Step 3: Test assertion (should fail)**
|
||||
|
||||
```nix
|
||||
# This SHOULD fail - desktop and server together
|
||||
m3ta.context = "desktop";
|
||||
m3ta.profiles = [ "coding" ];
|
||||
# Nix should throw assertion error
|
||||
```
|
||||
|
||||
- [ ] **Step 4: Commit Phase 4**
|
||||
|
||||
```bash
|
||||
git commit -m "test: validate profile combinations on all hosts
|
||||
|
||||
- m3-ares: base + coding + desktop + gaming + media ✓
|
||||
- m3-atlas: base + coding + server ✓
|
||||
- Constraint assertion working ✓"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Phase 5: Cleanup
|
||||
|
||||
### Task 5: Remove Old Structure
|
||||
|
||||
**Files:**
|
||||
|
||||
- Delete: `home/features.old/` (after verification)
|
||||
|
||||
- [ ] **Step 1: Verify no broken imports**
|
||||
|
||||
```bash
|
||||
# Search for any references to old paths
|
||||
grep -r "home/features" --include="*.nix"
|
||||
```
|
||||
|
||||
Expected: No results
|
||||
|
||||
- [ ] **Step 2: Delete old directory**
|
||||
|
||||
```bash
|
||||
git rm -rf home/features.old
|
||||
```
|
||||
|
||||
- [ ] **Step 3: Final format and check**
|
||||
|
||||
```bash
|
||||
nix fmt
|
||||
nix flake check
|
||||
```
|
||||
|
||||
- [ ] **Step 4: Final commit**
|
||||
|
||||
```bash
|
||||
git commit -m "chore: remove old features directory
|
||||
|
||||
Cleanup complete. New structure:
|
||||
- home/base/ (always loaded)
|
||||
- home/coding/ (profile-independent)
|
||||
- home/profiles/ (gaming, media)
|
||||
- home/desktop/ (context=desktop)
|
||||
- home/server/ (context=server)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Summary
|
||||
|
||||
| Phase | Tasks | Description |
|
||||
|-------|-------|-------------|
|
||||
| 1 | 1 | Create new directory structure |
|
||||
| 2 | 2 | Implement profile system with constraints |
|
||||
| 3 | 3 | Migrate existing features |
|
||||
| 4 | 4 | Test profile combinations |
|
||||
| 5 | 5 | Remove old structure |
|
||||
|
||||
**Total:** 5 tasks, ~22 steps
|
||||
|
||||
**Expected Duration:** 2-4 hours (depending on migration complexity)
|
||||
|
||||
---
|
||||
|
||||
## Migration Notes
|
||||
|
||||
1. **NeoVim Config**: Already in nixpkgs, reference via `inputs.m3ta-nixpkgs.packages.neovim-config`
|
||||
|
||||
2. **Agent-System**: Already in nixpkgs, reference via `inputs.m3ta-nixpkgs.homeModules.coding.agents`
|
||||
|
||||
3. **Zed Remote**: Desktop-only feature, works via SSH. No server-side installation needed.
|
||||
|
||||
4. **Fish Shell**: Removed from base (Nushell is primary). Can be added as optional profile if needed.
|
||||
|
||||
5. **Feature Flags**: Old `features.*.enable` options → New profile lists `m3ta.profiles = [ "gaming" "media" ]`
|
||||
@@ -0,0 +1,259 @@
|
||||
# Missing Packages Implementation Plan
|
||||
|
||||
> **Goal:** Restore missing packages from old configuration to new profile-based structure
|
||||
|
||||
**Context:** The home profile restructuring (Task 1-5) moved files but left many packages unaccounted for. This plan categorizes and assigns each package to the appropriate location.
|
||||
|
||||
---
|
||||
|
||||
## Package Categorization
|
||||
|
||||
### Base Layer (`home/base/`) — Always Available
|
||||
|
||||
These are CLI tools that work on any system (server or desktop):
|
||||
|
||||
| Package | Source | Module | Option |
|
||||
|---------|--------|--------|--------|
|
||||
| `jq` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `ripgrep` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `fd` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `coreutils` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `htop` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `httpie` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `just` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `lazygit` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `lf` | old cli | `home/base/cli-tools/default.nix` | `home/packages` |
|
||||
| `tldr` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `trash-cli` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `unzip` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `zip` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `yazi` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `gcc` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `go` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `sqlite` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `sqlite-vec` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `nix-index` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `nix-update` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `progress` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `devenv` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `libnotify` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `basecamp` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `comma` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `fabric-ai` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `llm` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
| `hyprpaper-random` | old cli | `home/base/cli-tools/default.nix` | `home.packages` |
|
||||
|
||||
**Note:** `hyprpaper-random` is in base despite being Hyprland-specific. Alternative: move to `desktop/wm/` if it causes issues on non-Hyprland systems.
|
||||
|
||||
### Base Programs (CLI Integration)
|
||||
|
||||
These are programs with shell integration, placed in `home/base/cli-tools/`:
|
||||
|
||||
| Program | Source | Module | Option |
|
||||
|---------|--------|--------|--------|
|
||||
| `carapace` | old cli | `home/base/cli-tools/default.nix` | `programs.carapace` |
|
||||
| `zoxide` | old cli | `home/base/cli-tools/default.nix` | `programs.zoxide` |
|
||||
| `bat` | old cli | `home/base/cli-tools/default.nix` | `programs.bat` |
|
||||
| `direnv` | old cli | `home/base/cli-tools/default.nix` | `programs.direnv` |
|
||||
| `eza` | old cli | `home/base/cli-tools/default.nix` | `programs.eza` |
|
||||
| `lf` | old cli | `home/base/cli-tools/default.nix` | `programs.lf` |
|
||||
| `zellij-ps` | old cli | `home/base/cli-tools/default.nix` | `cli.zellij-ps` |
|
||||
|
||||
### Coding Layer (`home/coding/`) — Developer Tools
|
||||
|
||||
| Package | Source | Module | Option |
|
||||
|---------|--------|--------|--------|
|
||||
| `bruno` | old desktop/coding | `home/coding/packages.nix` | `home.packages` |
|
||||
| `insomnia` | old desktop/coding | `home/coding/packages.nix` | `home.packages` |
|
||||
| `vim` | - | `home/coding/packages.nix` | `home.packages` |
|
||||
|
||||
**New module:** `home/coding/packages.nix` (or inline into `coding/default.nix`)
|
||||
|
||||
### Desktop Layer (`home/desktop/`) — Desktop-Specific
|
||||
|
||||
| Package | Source | Module | Option |
|
||||
|---------|--------|--------|--------|
|
||||
| `vibetyper` | old desktop | `home/desktop/apps/default.nix` | `home.packages` |
|
||||
| `pomodoro-timer` | old cli | `home/desktop/apps/default.nix` | `home.packages` |
|
||||
| `launch-timer` | - | `home/desktop/apps/default.nix` | `home.packages` |
|
||||
|
||||
**Note:** `launch-timer` needs investigation - is it a custom script or nixpkgs package?
|
||||
|
||||
### Gaming Profile (`home/profiles/gaming/`) — Gaming Only
|
||||
|
||||
| Package | Source | Module | Option |
|
||||
|---------|--------|--------|--------|
|
||||
| `rocmPackages.rocm-smi` | old cli | `home/profiles/gaming/default.nix` | `home.packages` |
|
||||
| `rocmPackages.rocminfo` | old cli | `home/profiles/gaming/default.nix` | `home.packages` |
|
||||
| `rocmPackages.rocm-runtime` | old cli | `home/profiles/gaming/default.nix` | `home.packages` |
|
||||
| `vulkan-tools` | old cli | `home/profiles/gaming/default.nix` | `home.packages` |
|
||||
|
||||
**Rationale:** ROCm is for AMD GPUs used in gaming (e.g., ROG Ally, gaming laptops with AMD dGPUs). This keeps server configs clean.
|
||||
|
||||
### Media Profile (`home/profiles/media/`) — Media Creation
|
||||
|
||||
| Package | Source | Module | Option |
|
||||
|---------|--------|--------|--------|
|
||||
| `plexamp` | old desktop/media | `home/profiles/media/default.nix` | `home.packages` |
|
||||
| `webcord` | old desktop/media | `home/profiles/media/default.nix` | `home.packages` |
|
||||
| `unimatrix` | old cli | `home/profiles/media/default.nix` | `home.packages` |
|
||||
| `mpv` (config) | old desktop/media | `home/profiles/media/default.nix` | `programs.mpv` |
|
||||
|
||||
**Note:** `unimatrix` is a terminal screensaver - fits well with media profile.
|
||||
|
||||
---
|
||||
|
||||
## NOT Needed (Explicitly Removed)
|
||||
|
||||
These packages should NOT be added:
|
||||
|
||||
| Package | Reason |
|
||||
|---------|--------|
|
||||
| `wireguard-tools` | No longer needed |
|
||||
| `wttrbar` | No longer needed |
|
||||
| `nushellPlugins.skim` | No longer needed |
|
||||
|
||||
---
|
||||
|
||||
## Tasks
|
||||
|
||||
### Task 1: Update `home/base/cli-tools/default.nix`
|
||||
|
||||
Add missing packages to the CLI tools aggregator:
|
||||
|
||||
```nix
|
||||
home.packages = with pkgs; [
|
||||
# Core utilities
|
||||
jq ripgrep fd coreutils htop
|
||||
# Dev tools
|
||||
just lazylib lf tldr devenv
|
||||
gcc go sqlite sqlite-vec
|
||||
nix-index nix-update progress
|
||||
# AI tools
|
||||
comma fabric-ai llm
|
||||
# Misc
|
||||
libnotify basecamp hyprpaper-random
|
||||
trash-cli unzip zip yazi
|
||||
];
|
||||
```
|
||||
|
||||
Also add programs: carapace, zoxide, bat, direnv, eza, lf, zellij-ps
|
||||
|
||||
### Task 2: Create `home/coding/packages.nix`
|
||||
|
||||
New module for coding-specific packages:
|
||||
|
||||
```nix
|
||||
{ lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
options.coding.packages = {
|
||||
enable = mkEnableOption "additional coding packages";
|
||||
};
|
||||
|
||||
config = mkIf config.coding.packages.enable {
|
||||
home.packages = with pkgs; [
|
||||
bruno
|
||||
insomnia
|
||||
];
|
||||
};
|
||||
}
|
||||
```
|
||||
|
||||
### Task 3: Update `home/profiles/gaming/default.nix`
|
||||
|
||||
Add GPU monitoring tools:
|
||||
|
||||
```nix
|
||||
home.packages = with pkgs; [
|
||||
# Gaming utilities
|
||||
gamescope gamemode goverlay mangohud protonplus
|
||||
# AMD GPU monitoring (ROCm)
|
||||
rocmPackages.rocm-smi
|
||||
rocmPackages.rocminfo
|
||||
rocmPackages.rocm-runtime
|
||||
vulkan-tools
|
||||
];
|
||||
```
|
||||
|
||||
### Task 4: Update `home/profiles/media/default.nix`
|
||||
|
||||
Add missing media packages:
|
||||
|
||||
```nix
|
||||
home.packages = with pkgs; [
|
||||
# Already present: ffmpeg_6-full, gimp, handbrake, etc.
|
||||
# Add missing:
|
||||
plexamp
|
||||
webcord
|
||||
unimatrix
|
||||
];
|
||||
|
||||
programs.mpv = {
|
||||
enable = true;
|
||||
bindings = {
|
||||
WHEEL_UP = "seek 10";
|
||||
WHEEL_DOWN = "seek -10";
|
||||
};
|
||||
config = {
|
||||
profile = "gpu-hq";
|
||||
ytdl-format = "bestvideo+bestaudio";
|
||||
};
|
||||
};
|
||||
```
|
||||
|
||||
### Task 5: Update Desktop Apps
|
||||
|
||||
Add desktop-specific packages to `home/desktop/apps/default.nix`:
|
||||
|
||||
```nix
|
||||
home.packages = with pkgs; [
|
||||
# Already present
|
||||
# Add missing:
|
||||
pomodoro-timer
|
||||
# launch-timer - needs investigation
|
||||
];
|
||||
```
|
||||
|
||||
### Task 6: Update Host Configs
|
||||
|
||||
Ensure all desktop hosts import the new modules:
|
||||
|
||||
- `home/m3tam3re/m3-ares.nix` - Should have `coding.packages.enable = true`
|
||||
- `home/m3tam3re/m3-kratos.nix` - Should have `coding.packages.enable = true`
|
||||
|
||||
---
|
||||
|
||||
## Implementation Order
|
||||
|
||||
1. **Task 1** - Base CLI tools (largest impact, affects all hosts)
|
||||
2. **Task 2** - Coding packages (small, new module)
|
||||
3. **Task 3** - Gaming profile (ROCm)
|
||||
4. **Task 4** - Media profile (plexamp, webcord, unimatrix, mpv)
|
||||
5. **Task 5** - Desktop apps (vibetyper already present, add pomodoro-timer)
|
||||
6. **Task 6** - Host config updates (if needed)
|
||||
|
||||
---
|
||||
|
||||
## Verification
|
||||
|
||||
```bash
|
||||
nix flake check
|
||||
# Should pass with no new errors
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Summary
|
||||
|
||||
| Layer | New Files | Modified Files |
|
||||
|-------|-----------|----------------|
|
||||
| base/cli-tools | - | `default.nix` |
|
||||
| coding | `packages.nix` | `default.nix` |
|
||||
| profiles/gaming | - | `default.nix` |
|
||||
| profiles/media | - | `default.nix` |
|
||||
| desktop/apps | - | `default.nix` |
|
||||
|
||||
**Total packages to restore:** ~30
|
||||
**Programs to restore:** 7
|
||||
**Packages excluded:** 3 (wireguard, wttrbar, nushellPlugins.skim)
|
||||
Generated
+1242
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,203 @@
|
||||
{
|
||||
description = ''
|
||||
For questions just DM me on X: https://twitter.com/@m3tam3re
|
||||
There is also some NIXOS content on my YT channel: https://www.youtube.com/@m3tam3re
|
||||
|
||||
One of the best ways to learn NIXOS is to read other peoples configurations. I have personally learned a lot from Gabriel Fontes configs:
|
||||
https://github.com/Misterio77/nix-starter-configs
|
||||
https://github.com/Misterio77/nix-config
|
||||
|
||||
Please also check out the starter configs mentioned above.
|
||||
'';
|
||||
|
||||
inputs = {
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
nixpkgs-45570c2.url = "github:nixos/nixpkgs/45570c299dc2b63c8c574c4cd77f0b92f7e2766e";
|
||||
nixpkgs-locked.url = "github:nixos/nixpkgs/2744d988fa116fc6d46cdfa3d1c936d0abd7d121";
|
||||
nixpkgs-9e58ed7.url = "github:nixos/nixpkgs/9e58ed7ba759d81c98f033b7f5eba21ca68f53b0";
|
||||
nixpkgs-master.url = "github:nixos/nixpkgs/master";
|
||||
|
||||
m3ta-nixpkgs.url = "git+https://code.m3ta.dev/m3tam3re/nixpkgs";
|
||||
# m3ta-nixpkgs.url = "path:/home/m3tam3re/p/NIX/nixpkgs";
|
||||
llm-agents.url = "github:numtide/llm-agents.nix";
|
||||
|
||||
#
|
||||
nur = {
|
||||
url = "github:nix-community/NUR";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
agenix.url = "github:ryantm/agenix";
|
||||
|
||||
disko = {
|
||||
url = "github:nix-community/disko";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nixos-generators = {url = "github:nix-community/nixos-generators";};
|
||||
|
||||
hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
|
||||
rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
|
||||
nix-colors.url = "github:misterio77/nix-colors";
|
||||
|
||||
agents = {
|
||||
# url = "path:/home/m3tam3re/p/AI/AGENTS";
|
||||
url = "git+https://code.m3ta.dev/m3tam3re/AGENTS";
|
||||
};
|
||||
## Skills
|
||||
skills-basecamp = {
|
||||
url = "github:basecamp/basecamp-cli";
|
||||
flake = false;
|
||||
};
|
||||
skills-anthropic = {
|
||||
url = "github:anthropics/skills";
|
||||
flake = false;
|
||||
};
|
||||
skills-kestra = {
|
||||
url = "github:kestra-io/agent-skills";
|
||||
flake = false;
|
||||
};
|
||||
skills-superpowers = {
|
||||
url = "github:obra/superpowers";
|
||||
flake = false;
|
||||
};
|
||||
skills-vercel = {
|
||||
url = "github:vercel-labs/skills";
|
||||
flake = false;
|
||||
};
|
||||
hermes-agent.url = "github:NousResearch/hermes-agent/v2026.4.23";
|
||||
};
|
||||
|
||||
outputs = {
|
||||
self,
|
||||
agenix,
|
||||
home-manager,
|
||||
nixpkgs,
|
||||
m3ta-nixpkgs,
|
||||
nur,
|
||||
agents,
|
||||
...
|
||||
} @ inputs: let
|
||||
inherit (self) outputs;
|
||||
systems = [
|
||||
"aarch64-linux"
|
||||
"i686-linux"
|
||||
"x86_64-linux"
|
||||
"aarch64-darwin"
|
||||
"x86_64-darwin"
|
||||
];
|
||||
forAllSystems = nixpkgs.lib.genAttrs systems;
|
||||
allOverlays = import ./overlays {inherit inputs outputs;};
|
||||
in {
|
||||
packages =
|
||||
forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
|
||||
overlays = builtins.removeAttrs allOverlays ["mkLlmAgentsOverlay"];
|
||||
lib.mkLlmAgentsOverlay = allOverlays.mkLlmAgentsOverlay;
|
||||
homeManagerModules = import ./modules/home-manager;
|
||||
|
||||
nixosConfigurations = {
|
||||
m3-ares = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit inputs outputs;
|
||||
system = "x86_64-linux";
|
||||
hostname = "m3-ares";
|
||||
};
|
||||
modules = [
|
||||
./hosts/m3-ares
|
||||
agenix.nixosModules.default
|
||||
m3ta-nixpkgs.nixosModules.default
|
||||
inputs.hermes-agent.nixosModules.default
|
||||
];
|
||||
};
|
||||
m3-atlas = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit inputs outputs;
|
||||
system = "x86_64-linux";
|
||||
};
|
||||
modules = [
|
||||
./hosts/m3-atlas
|
||||
inputs.disko.nixosModules.disko
|
||||
agenix.nixosModules.default
|
||||
m3ta-nixpkgs.nixosModules.default
|
||||
];
|
||||
};
|
||||
m3-kratos = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit inputs outputs;
|
||||
system = "x86_64-linux";
|
||||
hostname = "m3-kratos";
|
||||
};
|
||||
modules = [
|
||||
./hosts/m3-kratos
|
||||
agenix.nixosModules.default
|
||||
nur.modules.nixos.default
|
||||
m3ta-nixpkgs.nixosModules.default
|
||||
inputs.hermes-agent.nixosModules.default
|
||||
];
|
||||
};
|
||||
m3-helios = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit inputs outputs;
|
||||
system = "x86_64-linux";
|
||||
};
|
||||
modules = [
|
||||
./hosts/m3-helios
|
||||
inputs.disko.nixosModules.disko
|
||||
agenix.nixosModules.default
|
||||
m3ta-nixpkgs.nixosModules.default
|
||||
];
|
||||
};
|
||||
m3-hermes = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = {
|
||||
inherit inputs outputs;
|
||||
system = "x86_64-linux";
|
||||
};
|
||||
modules = [
|
||||
./hosts/m3-hermes
|
||||
inputs.disko.nixosModules.disko
|
||||
agenix.nixosModules.default
|
||||
m3ta-nixpkgs.nixosModules.default
|
||||
inputs.hermes-agent.nixosModules.default
|
||||
];
|
||||
};
|
||||
};
|
||||
homeConfigurations = {
|
||||
"m3tam3re@m3-daedalus" = home-manager.lib.homeManagerConfiguration {
|
||||
pkgs = nixpkgs.legacyPackages."x86_64-linux";
|
||||
extraSpecialArgs = {
|
||||
inherit inputs outputs;
|
||||
system = "x86_64-linux";
|
||||
hostname = "m3-daedalus";
|
||||
};
|
||||
modules = [./home/m3tam3re/m3-daedalus.nix];
|
||||
};
|
||||
};
|
||||
devShells = forAllSystems (system: let
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
config.allowUnfree = true; # Allow unfree packages in devShell
|
||||
};
|
||||
m3taLib = m3ta-nixpkgs.lib.x86_64-linux;
|
||||
rules = m3taLib.coding-rules.mkCodingRules {
|
||||
inherit agents;
|
||||
languages = ["nix"];
|
||||
};
|
||||
in {
|
||||
default = pkgs.mkShell {
|
||||
buildInputs = with pkgs; [
|
||||
alejandra
|
||||
nixd
|
||||
openssh
|
||||
agenix.packages.${system}.default
|
||||
statix
|
||||
deadnix
|
||||
];
|
||||
inherit (rules) instructions shellHook;
|
||||
};
|
||||
});
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,145 @@
|
||||
# Bat — cat replacement with nix-colors syntax highlighting theme.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.cliTools.bat;
|
||||
palette = config.colorScheme.palette;
|
||||
in {
|
||||
# Enabled by default — base modules are always-on.
|
||||
options.base.cliTools.bat.enable = (mkEnableOption "enable bat with nix-colors theme") // {default = true;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.bat = {
|
||||
enable = true;
|
||||
config = {theme = "universal";};
|
||||
themes = {
|
||||
universal = {
|
||||
src = pkgs.writeText "universal.tmTheme" ''
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>Universal (nix-colors)</string>
|
||||
<key>settings</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>settings</key>
|
||||
<dict>
|
||||
<key>background</key>
|
||||
<string>#${palette.base00}</string>
|
||||
<key>foreground</key>
|
||||
<string>#${palette.base05}</string>
|
||||
<key>caret</key>
|
||||
<string>#${palette.base05}</string>
|
||||
<key>selection</key>
|
||||
<string>#${palette.base02}</string>
|
||||
<key>selectionForeground</key>
|
||||
<string>#${palette.base05}</string>
|
||||
<key>lineHighlight</key>
|
||||
<string>#${palette.base01}</string>
|
||||
</dict>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>Comment</string>
|
||||
<key>scope</key>
|
||||
<string>comment</string>
|
||||
<key>settings</key>
|
||||
<dict>
|
||||
<key>foreground</key>
|
||||
<string>#${palette.base03}</string>
|
||||
<key>fontStyle</key>
|
||||
<string>italic</string>
|
||||
</dict>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>String</string>
|
||||
<key>scope</key>
|
||||
<string>string</string>
|
||||
<key>settings</key>
|
||||
<dict>
|
||||
<key>foreground</key>
|
||||
<string>#${palette.base0A}</string>
|
||||
</dict>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>Number</string>
|
||||
<key>scope</key>
|
||||
<string>constant.numeric</string>
|
||||
<key>settings</key>
|
||||
<dict>
|
||||
<key>foreground</key>
|
||||
<string>#${palette.base0E}</string>
|
||||
</dict>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>Keyword</string>
|
||||
<key>scope</key>
|
||||
<string>keyword</string>
|
||||
<key>settings</key>
|
||||
<dict>
|
||||
<key>foreground</key>
|
||||
<string>#${palette.base08}</string>
|
||||
</dict>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>Function</string>
|
||||
<key>scope</key>
|
||||
<string>entity.name.function</string>
|
||||
<key>settings</key>
|
||||
<dict>
|
||||
<key>foreground</key>
|
||||
<string>#${palette.base0B}</string>
|
||||
</dict>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>Type</string>
|
||||
<key>scope</key>
|
||||
<string>entity.name.type, storage.type</string>
|
||||
<key>settings</key>
|
||||
<dict>
|
||||
<key>foreground</key>
|
||||
<string>#${palette.base0D}</string>
|
||||
</dict>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>Variable</string>
|
||||
<key>scope</key>
|
||||
<string>variable</string>
|
||||
<key>settings</key>
|
||||
<dict>
|
||||
<key>foreground</key>
|
||||
<string>#${palette.base05}</string>
|
||||
</dict>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>name</key>
|
||||
<string>Constant</string>
|
||||
<key>scope</key>
|
||||
<string>constant</string>
|
||||
<key>settings</key>
|
||||
<dict>
|
||||
<key>foreground</key>
|
||||
<string>#${palette.base0E}</string>
|
||||
</dict>
|
||||
</dict>
|
||||
</array>
|
||||
</dict>
|
||||
</plist>
|
||||
'';
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
# Carapace — multi-shell completion engine with Fish, Nushell, and Bash integration.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.cliTools.carapace;
|
||||
in {
|
||||
# Enabled by default — base modules are always-on.
|
||||
options.base.cliTools.carapace.enable = (mkEnableOption "enable carapace completion engine") // {default = true;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.carapace = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
enableNushellIntegration = true;
|
||||
enableBashIntegration = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
# CLI tools aggregator — imports all base command-line utilities.
|
||||
{...}: {
|
||||
imports = [
|
||||
./bat.nix
|
||||
./carapace.nix
|
||||
./direnv.nix
|
||||
./eza.nix
|
||||
./fzf.nix
|
||||
./lf.nix
|
||||
./nitch.nix
|
||||
./packages.nix
|
||||
./television.nix
|
||||
./zellij.nix
|
||||
./zellij-ps.nix
|
||||
./zoxide.nix
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
# Direnv — automatic environment loading with nix-direnv integration.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.cliTools.direnv;
|
||||
in {
|
||||
# Enabled by default — base modules are always-on.
|
||||
options.base.cliTools.direnv.enable = (mkEnableOption "enable direnv with nix-direnv") // {default = true;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.direnv = {
|
||||
enable = true;
|
||||
enableNushellIntegration = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
# Eza — modern ls replacement with icons, git status, and long format by default.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.cliTools.eza;
|
||||
in {
|
||||
# Enabled by default — base modules are always-on.
|
||||
options.base.cliTools.eza.enable = (mkEnableOption "enable eza modern ls replacement") // {default = true;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.eza = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
enableBashIntegration = true;
|
||||
extraOptions = ["-l" "--icons" "--git" "-a"];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
# Fuzzy finder with nix-colors palette and Wayland clipboard integration.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.cliTools.fzf;
|
||||
in {
|
||||
# Enabled by default — base modules are always-on.
|
||||
options.base.cliTools.fzf.enable = (mkEnableOption "enable fuzzy finder") // {default = true;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.fzf = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
colors = {
|
||||
"fg" = "#${config.colorScheme.palette.base05}";
|
||||
"bg" = "#${config.colorScheme.palette.base00}";
|
||||
"hl" = "#${config.colorScheme.palette.base0E}";
|
||||
"fg+" = "#${config.colorScheme.palette.base05}";
|
||||
"bg+" = "#${config.colorScheme.palette.base02}";
|
||||
"hl+" = "#${config.colorScheme.palette.base0E}";
|
||||
"info" = "#${config.colorScheme.palette.base09}";
|
||||
"prompt" = "#${config.colorScheme.palette.base0B}";
|
||||
"pointer" = "#${config.colorScheme.palette.base08}";
|
||||
"marker" = "#${config.colorScheme.palette.base08}";
|
||||
"spinner" = "#${config.colorScheme.palette.base09}";
|
||||
"header" = "#${config.colorScheme.palette.base03}";
|
||||
};
|
||||
defaultOptions = [
|
||||
"--preview='bat --color=always -n {}'"
|
||||
"--bind 'ctrl-/:toggle-preview'"
|
||||
"--header 'Press CTRL-Y to copy command into clipboard'"
|
||||
"--bind 'ctrl-y:execute-silent(echo -n {2..} | wl-copy)+abort'"
|
||||
];
|
||||
defaultCommand = "fd --type f --exclude .git --follow --hidden";
|
||||
changeDirWidgetCommand = "fd --type d --exclude .git --follow --hidden";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
# Lf — terminal file manager with bat preview and Dracula theme.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.cliTools.lf;
|
||||
in {
|
||||
# Enabled by default — base modules are always-on.
|
||||
options.base.cliTools.lf.enable = (mkEnableOption "enable lf terminal file manager") // {default = true;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = [pkgs.lf];
|
||||
|
||||
programs.lf = {
|
||||
enable = true;
|
||||
settings = {
|
||||
preview = true;
|
||||
drawbox = true;
|
||||
hidden = true;
|
||||
icons = true;
|
||||
previewer = "bat";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
# Nitch — minimal system information display tool.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.cliTools.nitch;
|
||||
in {
|
||||
# Enabled by default — base modules are always-on.
|
||||
options.base.cliTools.nitch.enable = (mkEnableOption "enable nitch") // {default = true;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = [pkgs.nitch];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
# Essential CLI packages — core utilities always available on every host.
|
||||
# NOTE: `lazylib` does not exist in nixpkgs. `lazygit` is the correct package
|
||||
# (Git TUI) and is intentionally used here instead.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.cliTools.essentials;
|
||||
in {
|
||||
# Enabled by default — base modules are always-on.
|
||||
options.base.cliTools.essentials.enable = (mkEnableOption "enable essential CLI packages") // {default = true;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
# Core utilities
|
||||
coreutils
|
||||
fd
|
||||
htop
|
||||
jq
|
||||
ripgrep
|
||||
|
||||
# Nix
|
||||
alejandra
|
||||
comma
|
||||
nixd
|
||||
nix-diff
|
||||
nix-index
|
||||
nix-update
|
||||
|
||||
# Dev tools
|
||||
bc
|
||||
cmake
|
||||
devenv
|
||||
gcc
|
||||
gnumake
|
||||
go
|
||||
httpie
|
||||
just
|
||||
lazygit
|
||||
progress
|
||||
sqlite
|
||||
sqlite-vec
|
||||
tldr
|
||||
|
||||
# AI tools
|
||||
fabric-ai
|
||||
llm
|
||||
|
||||
# Misc
|
||||
basecamp
|
||||
hyprpaper-random
|
||||
libnotify
|
||||
trash-cli
|
||||
unzip
|
||||
yazi
|
||||
zip
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
# Television — fuzzy finder with custom channels for tldr, git-diff, and git-log.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.cliTools.television;
|
||||
in {
|
||||
# Enabled by default — base modules are always-on.
|
||||
options.base.cliTools.television.enable = (mkEnableOption "enable television") // {default = true;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.television = {
|
||||
enable = true;
|
||||
channels = {
|
||||
tldr = {
|
||||
metadata = {
|
||||
description = "Browse TLDR pages";
|
||||
name = "tldr";
|
||||
requirements = ["tldr"];
|
||||
};
|
||||
preview = {
|
||||
command = "tldr '{}'";
|
||||
};
|
||||
source = {
|
||||
command = "tldr --list";
|
||||
};
|
||||
};
|
||||
git-diff = {
|
||||
metadata = {
|
||||
description = "A channel to select files from git diff commands";
|
||||
name = "git-diff";
|
||||
requirements = ["git"];
|
||||
};
|
||||
preview = {
|
||||
command = "git diff HEAD --color=always -- '{}'";
|
||||
};
|
||||
source = {
|
||||
command = "git diff --name-only HEAD";
|
||||
};
|
||||
};
|
||||
git-log = {
|
||||
metadata = {
|
||||
description = "A channel to select from git log entries";
|
||||
name = "git-log";
|
||||
requirements = ["git"];
|
||||
};
|
||||
preview = {
|
||||
command = "git show -p --stat --pretty=fuller --color=always '{0}'";
|
||||
};
|
||||
source = {
|
||||
command = "git log --oneline --date=short --pretty=\"format:%h %s %an %cd\" \"$@\"";
|
||||
output = "{split: :0}";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
# Zellij-ps — project-aware Zellij session manager from m3ta-nixpkgs.
|
||||
# Delegates to `cli.zellij-ps` — the home-manager module namespace provided by
|
||||
# m3ta-nixpkgs (inputs.m3ta-nixpkgs.nixosModules.default). This is intentional;
|
||||
# `cli.*` is the convention used by m3ta-nixpkgs home-manager modules.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.cliTools.zellijPs;
|
||||
in {
|
||||
options.base.cliTools.zellijPs = {
|
||||
# Enabled by default — base modules are always-on.
|
||||
enable = (mkEnableOption "enable zellij-ps project session manager") // {default = true;};
|
||||
|
||||
projectFolders = mkOption {
|
||||
type = types.listOf types.path;
|
||||
description = "Project root folders scanned by zellij-ps.";
|
||||
default = ["${config.home.homeDirectory}/p"];
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
cli.zellij-ps = {
|
||||
enable = true;
|
||||
projectFolders = cfg.projectFolders;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
# Zellij terminal multiplexer with nix-colors theming.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.cliTools.zellij;
|
||||
in {
|
||||
# Enabled by default — base modules are always-on.
|
||||
options.base.cliTools.zellij.enable = (mkEnableOption "enable zellij multiplexer") // {default = true;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.zellij = {
|
||||
enable = true;
|
||||
settings = {
|
||||
theme = "universal";
|
||||
themes.universal = {
|
||||
bg = "#${config.colorScheme.palette.base00}";
|
||||
fg = "#${config.colorScheme.palette.base05}";
|
||||
black = "#${config.colorScheme.palette.base01}";
|
||||
red = "#${config.colorScheme.palette.base08}";
|
||||
green = "#${config.colorScheme.palette.base0B}";
|
||||
yellow = "#${config.colorScheme.palette.base0A}";
|
||||
blue = "#${config.colorScheme.palette.base0D}";
|
||||
magenta = "#${config.colorScheme.palette.base0E}";
|
||||
cyan = "#${config.colorScheme.palette.base0C}";
|
||||
white = "#${config.colorScheme.palette.base07}";
|
||||
orange = "#${config.colorScheme.palette.base09}";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
# Zoxide — smarter cd with Fish and Nushell integration.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.cliTools.zoxide;
|
||||
in {
|
||||
# Enabled by default — base modules are always-on.
|
||||
options.base.cliTools.zoxide.enable = (mkEnableOption "enable zoxide smarter cd") // {default = true;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.zoxide = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
enableNushellIntegration = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
# Base home-manager configuration — always loaded on every host.
|
||||
# Includes shell, CLI tools, and secrets modules.
|
||||
{...}: {
|
||||
imports = [
|
||||
./shell
|
||||
./cli-tools
|
||||
./secrets/secrets.nix
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
# Password store and secrets management via pass-wayland with OTP and import extensions.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.secrets;
|
||||
in {
|
||||
# Enabled by default — base modules are always-on.
|
||||
options.base.secrets.enable = (mkEnableOption "enable secrets management") // {default = true;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.password-store = {
|
||||
enable = true;
|
||||
package =
|
||||
pkgs.pass-wayland.withExtensions
|
||||
(exts: [exts.pass-otp exts.pass-import]);
|
||||
settings = {PASSWORD_STORE_DIR = "$XDG_DATA_HOME/password-store";};
|
||||
};
|
||||
home.packages = [pkgs.pinentry-gnome3];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
# Shell aggregator — imports Nushell (primary), Fish, and Starship prompt.
|
||||
{...}: {
|
||||
imports = [
|
||||
./nushell.nix
|
||||
./fish.nix
|
||||
./starship.nix
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,118 @@
|
||||
# Fish shell configuration exposed under the new base namespace.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.shell.fish;
|
||||
in {
|
||||
# Enabled by default — base modules are always-on.
|
||||
options.base.shell.fish.enable = (mkEnableOption "enable fish shell") // {default = true;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.fish = {
|
||||
enable = true;
|
||||
interactiveShellInit = ''
|
||||
# Fish colors using universal nix-colors palette
|
||||
# Text colors
|
||||
set -g fish_color_normal ${config.colorScheme.palette.base05} # text
|
||||
set -g fish_color_param ${config.colorScheme.palette.base05} # text
|
||||
set -g fish_color_comment ${config.colorScheme.palette.base03} # muted
|
||||
set -g fish_color_autosuggestion ${config.colorScheme.palette.base03} # muted
|
||||
|
||||
# Command colors
|
||||
set -g fish_color_command ${config.colorScheme.palette.base0D} # accent6 (blue)
|
||||
set -g fish_color_quote ${config.colorScheme.palette.base0A} # accent3 (yellow)
|
||||
set -g fish_color_redirection ${config.colorScheme.palette.base0E} # accent7 (purple)
|
||||
set -g fish_color_end ${config.colorScheme.palette.base08} # accent1 (red)
|
||||
set -g fish_color_error ${config.colorScheme.palette.base08} # accent1 (red)
|
||||
set -g fish_color_operator ${config.colorScheme.palette.base0C} # accent5 (cyan)
|
||||
set -g fish_color_escape ${config.colorScheme.palette.base09} # accent2 (orange)
|
||||
|
||||
# Path colors
|
||||
set -g fish_color_cwd ${config.colorScheme.palette.base0B} # accent4 (green)
|
||||
set -g fish_color_cwd_root ${config.colorScheme.palette.base08} # accent1 (red)
|
||||
set -g fish_color_valid_path --underline
|
||||
|
||||
# Interactive colors
|
||||
set -g fish_color_match ${config.colorScheme.palette.base0B} # accent4 (green)
|
||||
set -g fish_color_selection --background=${config.colorScheme.palette.base02} # overlay
|
||||
set -g fish_color_search_match --background=${config.colorScheme.palette.base02} # overlay
|
||||
set -g fish_color_history_current --bold
|
||||
set -g fish_color_user ${config.colorScheme.palette.base0B} # accent4 (green)
|
||||
set -g fish_color_host ${config.colorScheme.palette.base0D} # accent6 (blue)
|
||||
set -g fish_color_cancel -r
|
||||
|
||||
# Pager colors
|
||||
set -g fish_pager_color_completion normal
|
||||
set -g fish_pager_color_description ${config.colorScheme.palette.base03} # muted
|
||||
set -g fish_pager_color_prefix ${config.colorScheme.palette.base0E} # accent7 (purple)
|
||||
set -g fish_pager_color_progress ${config.colorScheme.palette.base0B} # accent4 (green)
|
||||
'';
|
||||
loginShellInit = ''
|
||||
set -x NIX_PATH nixpkgs=channel:nixos-unstable
|
||||
set -x NIX_LOG info
|
||||
set -x WEBKIT_DISABLE_COMPOSITING_MODE 1
|
||||
set -x TERMINAL ghostty
|
||||
set -x EDITOR nvim
|
||||
set -x VISUAL zed
|
||||
set -x XDG_DATA_HOME $HOME/.local/share
|
||||
set -x FZF_CTRL_R_OPTS "
|
||||
--preview='bat --color=always -n {}'
|
||||
--preview-window up:3:hidden:wrap
|
||||
--bind 'ctrl-/:toggle-preview'
|
||||
--bind 'ctrl-y:execute-silent(echo -n {2..} | wl-copy)+abort'
|
||||
--color header:bold
|
||||
--header 'Press CTRL-Y to copy command into clipboard'"
|
||||
set -x FZF_DEFAULT_COMMAND fd --type f --exclude .git --follow --hidden
|
||||
set -x FZF_CTRL_T_COMMAND "$FZF_DEFAULT_COMMAND"
|
||||
set -x FLAKE $HOME/p/nixos/nixos-config
|
||||
source /run/agenix/${config.home.username}-secrets
|
||||
|
||||
if test (tty) = "/dev/tty1"
|
||||
exec uwsm start -F /run/current-system/sw/bin/Hyprland
|
||||
end
|
||||
if test (tty) = "/dev/tty2"
|
||||
exec gamescope -O HDMI-A-1 -W 1920 -H 1080 --adaptive-sync --hdr-enabled --rt --steam -- steam -pipewire-dmabuf -tenfoot
|
||||
end
|
||||
'';
|
||||
shellAbbrs = {
|
||||
".." = "cd ..";
|
||||
"..." = "cd ../..";
|
||||
b = "yazi";
|
||||
ls = "eza";
|
||||
l = "eza -l --icons --git -a";
|
||||
lt = "eza --tree --level=2 --long --icons --git";
|
||||
grep = "rg";
|
||||
ps = "procs";
|
||||
just = "just --unstable";
|
||||
node = "bun";
|
||||
npx = "bunx";
|
||||
fs = "du -ah . | sort -hr | head -n 10";
|
||||
|
||||
n = "nix";
|
||||
nd = "nix develop -c $SHELL";
|
||||
ns = "nix shell";
|
||||
nsn = "nix shell nixpkgs#";
|
||||
nb = "nix build";
|
||||
nbn = "nix build nixpkgs#";
|
||||
nf = "nix flake";
|
||||
|
||||
nr = "sudo nixos-rebuild --flake .";
|
||||
nrs = "sudo nixos-rebuild switch --flake .#(uname -n)";
|
||||
snr = "sudo nixos-rebuild --flake .";
|
||||
snrs = "sudo nixos-rebuild --flake . switch";
|
||||
hm = "home-manager --flake .";
|
||||
hms = "home-manager --flake . switch";
|
||||
hmr = "cd ~/projects/nix-configurations; nix flake lock --update-input dotfiles; home-manager --flake .#(whoami)@(hostname) switch";
|
||||
|
||||
tsu = "sudo tailscale up";
|
||||
tsd = "sudo tailscale down";
|
||||
|
||||
vi = "nvim";
|
||||
vim = "nvim";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,86 @@
|
||||
# Primary shell configuration — Nushell with environment, aliases, and integrations.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.shell.nushell;
|
||||
in {
|
||||
# Enabled by default — base modules are always-on.
|
||||
options.base.shell.nushell.enable = (mkEnableOption "enable nushell") // {default = true;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.nushell = {
|
||||
enable = true;
|
||||
envFile.text = ''
|
||||
$env.config.show_banner = false
|
||||
$env.NIX_PATH = "nixpkgs=channel:nixos-unstable"
|
||||
$env.NIX_LOG = "iunfo"
|
||||
$env.WEBKIT_DISABLE_COMPOSITING_MODE = "1"
|
||||
$env.TERMINAL = "ghostty"
|
||||
$env.EDITOR = "nvim"
|
||||
$env.VISUAL = "zeditor"
|
||||
$env.FZF_DEFAULT_COMMAND = "fd --type f --exclude .git --follow --hidden"
|
||||
$env.FZF_DEFAULT_OPTS = "--preview='bat --color=always -n {}' --bind 'ctrl-/:toggle-preview' --header 'Press CTRL-Y to copy command into clipboard' --bind 'ctrl-y:execute-silent(echo -n {2..} | wl-copy)+abort' --color bg:#282a36,bg+:#44475a,fg:#f8f8f2,fg+:#f8f8f2,header:#6272a4,hl:#bd93f9,hl+:#bd93f9,info:#ffb86c,marker:#ff79c6,pointer:#ff79c6,prompt:#50fa7b,spinner:#ffb86c"
|
||||
$env.XDG_DATA_HOME = $"($env.HOME)/.local/share"
|
||||
$env.SSH_AUTH_SOCK = "/run/user/1000/gnupg/S.gpg-agent.ssh"
|
||||
$env.PATH = ($env.PATH | split row (char esep) | append $"($env.HOME)/.cache/.bun/bin" | append $"($env.HOME)/.npm-global/bin" | uniq)
|
||||
$env.NPM_CONFIG_PREFIX = $"($env.HOME)/.npm-global"
|
||||
$env.FLAKE = $"($env.HOME)/p/NIX/nixos-config"
|
||||
|
||||
# Load kestractl-env from agenix
|
||||
if ("/run/agenix/kestractl-env" | path exists) {
|
||||
open /run/agenix/kestractl-env
|
||||
| lines
|
||||
| where {($in | str trim | str length) > 0}
|
||||
| parse "{key}={value}"
|
||||
| update value {str trim -c '"'}
|
||||
| transpose -r -d
|
||||
| load-env
|
||||
}
|
||||
'';
|
||||
|
||||
configFile.text = ''
|
||||
# Aliases
|
||||
alias .. = cd ..
|
||||
alias ... = cd ...
|
||||
alias h = cd $env.HOME
|
||||
alias b = yazi
|
||||
alias lt = eza --tree --level=2 --long --icons --git
|
||||
alias grep = rg
|
||||
alias just = just --unstable
|
||||
|
||||
alias node = bun
|
||||
alias npx = bunx
|
||||
|
||||
alias n = nix
|
||||
alias nd = nix develop -c $nu.current-shell
|
||||
alias ns = nix shell
|
||||
alias nsn = nix shell nixpkgs#
|
||||
alias nb = nix build
|
||||
alias nbn = nix build nixpkgs#
|
||||
alias nf = nix flake
|
||||
|
||||
alias nr = sudo nixos-rebuild --flake .
|
||||
alias nrs = sudo nixos-rebuild switch --flake .#(sys host | get hostname)
|
||||
alias snr = sudo nixos-rebuild --flake .
|
||||
alias snrs = sudo nixos-rebuild --flake . switch
|
||||
alias hm = home-manager --flake .
|
||||
alias hms = home-manager --flake . switch
|
||||
alias hmr = do { cd ~/projects/nix-configurations; nix flake lock --update-input dotfiles; home-manager --flake .#(whoami)@(hostname) switch }
|
||||
|
||||
alias tsu = sudo tailscale up
|
||||
alias tsd = sudo tailscale down
|
||||
|
||||
alias vi = nvim
|
||||
alias vim = nvim
|
||||
|
||||
if (which tv | is-not-empty) {
|
||||
mkdir ($nu.data-dir | path join "vendor/autoload")
|
||||
tv init nu | save -f ($nu.data-dir | path join "vendor/autoload/tv.nu")
|
||||
}
|
||||
'';
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,70 @@
|
||||
# Starship cross-shell prompt with nix-colors theming.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.base.shell.starship;
|
||||
in {
|
||||
# Enabled by default — base modules are always-on.
|
||||
options.base.shell.starship.enable = (mkEnableOption "enable starship prompt") // {default = true;};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
enableNushellIntegration = true;
|
||||
settings = {
|
||||
format = "$all$character";
|
||||
palette = "universal";
|
||||
|
||||
palettes.universal = {
|
||||
background = "#${config.colorScheme.palette.base00}";
|
||||
surface = "#${config.colorScheme.palette.base01}";
|
||||
muted = "#${config.colorScheme.palette.base03}";
|
||||
text = "#${config.colorScheme.palette.base05}";
|
||||
bright = "#${config.colorScheme.palette.base07}";
|
||||
accent1 = "#${config.colorScheme.palette.base08}";
|
||||
accent2 = "#${config.colorScheme.palette.base09}";
|
||||
accent3 = "#${config.colorScheme.palette.base0A}";
|
||||
accent4 = "#${config.colorScheme.palette.base0B}";
|
||||
accent5 = "#${config.colorScheme.palette.base0C}";
|
||||
accent6 = "#${config.colorScheme.palette.base0D}";
|
||||
accent7 = "#${config.colorScheme.palette.base0E}";
|
||||
};
|
||||
|
||||
character = {
|
||||
success_symbol = "[❯](accent7)";
|
||||
error_symbol = "[❯](accent1)";
|
||||
};
|
||||
|
||||
directory = {
|
||||
style = "accent6";
|
||||
truncation_length = 3;
|
||||
truncate_to_repo = false;
|
||||
};
|
||||
|
||||
git_branch = {
|
||||
style = "accent7";
|
||||
};
|
||||
|
||||
git_status = {
|
||||
style = "accent5";
|
||||
};
|
||||
|
||||
cmd_duration = {
|
||||
style = "accent3";
|
||||
};
|
||||
|
||||
hostname = {
|
||||
style = "accent4";
|
||||
};
|
||||
|
||||
username = {
|
||||
style_user = "accent2";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
# AI agent system — OpenCode, Pi, and MCP server configuration.
|
||||
# Relies on coding.agents options provided by home/common/default.nix
|
||||
# (inputs.m3ta-nixpkgs.homeManagerModules.default).
|
||||
{
|
||||
config,
|
||||
inputs,
|
||||
lib,
|
||||
pkgs,
|
||||
videoDrivers ? [],
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
# OpenCode and Pi agent configurations
|
||||
./opencode.nix
|
||||
./pi.nix
|
||||
];
|
||||
|
||||
coding.agents.skills = {
|
||||
agentsInput = inputs.agents;
|
||||
externalSkills = [
|
||||
{
|
||||
src = inputs.skills-anthropic;
|
||||
selectSkills = ["pdf" "docx" "frontend-design"];
|
||||
}
|
||||
{src = inputs.skills-superpowers;}
|
||||
{src = inputs.skills-vercel;}
|
||||
{src = inputs.skills-basecamp;}
|
||||
{src = inputs.skills-kestra;}
|
||||
];
|
||||
};
|
||||
|
||||
programs.mcp = {
|
||||
enable = true;
|
||||
servers = {
|
||||
DeepWiki = {
|
||||
url = "https://mcp.deepwiki.com/mcp";
|
||||
};
|
||||
Ref = {
|
||||
command = "bash";
|
||||
args = ["-c" "REF_API_KEY=$(cat /run/agenix/ref-key) exec bunx ref-tools-mcp@latest"];
|
||||
};
|
||||
Exa = {
|
||||
command = "bash";
|
||||
args = ["-c" "EXA_API_KEY=$(cat /run/agenix/exa-key) exec bunx exa-mcp-server@latest tools=web_search_exa"];
|
||||
};
|
||||
Outline = {
|
||||
url = "https://wiki.az-gruppe.com/mcp";
|
||||
};
|
||||
ContextMode = {
|
||||
command = "bash";
|
||||
args = ["-c" "exec bunx context-mode@latest"];
|
||||
};
|
||||
Honcho = {
|
||||
command = "bash";
|
||||
args = [
|
||||
"-c"
|
||||
''exec bunx mcp-remote@latest https://mcp.honcho.dev --header "Authorization:Bearer $(cat /run/agenix/honcho-key)" --header "X-Honcho-User-Name:m3tam3re"''
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
agenix-cli
|
||||
agent-browser
|
||||
pyrefly
|
||||
(qmd.override {
|
||||
vulkanSupport = videoDrivers == ["amdgpu"];
|
||||
cudaSupport = videoDrivers == ["nvidia"];
|
||||
})
|
||||
openshell
|
||||
openspec
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,116 @@
|
||||
{
|
||||
inputs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
coding.agents.opencode = {
|
||||
enable = true;
|
||||
agentsInput = inputs.agents;
|
||||
};
|
||||
|
||||
coding.opencode = {
|
||||
enable = true;
|
||||
|
||||
ohMyOpencodeSettings = {
|
||||
agents = {
|
||||
sisyphus.model = "litellm/claude-opus-4-6";
|
||||
oracle.model = "litellm/claude-sonnet-4-6";
|
||||
librarian.model = "litellm/claude-sonnet-4-6";
|
||||
explore.model = "litellm/claude-haiku-4-5";
|
||||
multimodal-looker.model = "litellm/gpt-5.3-codex";
|
||||
prometheus.model = "litellm/claude-opus-4-6";
|
||||
metis.model = "litellm/claude-opus-4-6";
|
||||
momus.model = "litellm/claude-opus-4-6";
|
||||
atlas.model = "litellm/claude-sonnet-4-6";
|
||||
};
|
||||
categories = {
|
||||
visual-engineering.model = "zai-coding-plan/glm-5.1";
|
||||
ultrabrain.model = "litellm/claude-opus-4-6";
|
||||
deep.model = "litellm/claude-sonnet-4-6";
|
||||
artistry.model = "zai-coding-plan/glm-5.1";
|
||||
quick.model = "litellm/claude-haiku-4-5";
|
||||
unspecified-low.model = "litellm/claude-sonnet-4-6";
|
||||
unspecified-high.model = "litellm/claude-opus-4-6";
|
||||
writing.model = "zai-coding-plan/glm-5.1";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# Keep TUI settings in programs.opencode.tui to satisfy OpenCode v1.2.15+.
|
||||
programs.opencode.tui.theme = "opencode";
|
||||
|
||||
# Override legacy default settings to avoid deprecated TUI keys in settings.
|
||||
programs.opencode.settings = lib.mkForce {
|
||||
plugin = ["oh-my-openagent"];
|
||||
formatter = {
|
||||
alejandra = {
|
||||
command = ["alejandra" "-q" "-"];
|
||||
extensions = [".nix"];
|
||||
};
|
||||
};
|
||||
|
||||
# AZ-Gruppe LiteLLM endpoint + available models
|
||||
provider = {
|
||||
litellm = {
|
||||
npm = "@ai-sdk/openai-compatible";
|
||||
name = "LiteLLM (AZ-Gruppe)";
|
||||
options.baseURL = "https://llm.az-gruppe.com/v1";
|
||||
models = {
|
||||
"gpt-5.2" = {
|
||||
name = "GPT-5.2";
|
||||
limit = {
|
||||
context = 400000;
|
||||
output = 128000;
|
||||
};
|
||||
};
|
||||
"gpt-5.3-codex" = {
|
||||
name = "GPT-5.3 Codex";
|
||||
limit = {
|
||||
context = 400000;
|
||||
output = 128000;
|
||||
};
|
||||
};
|
||||
"claude-haiku-4-5" = {
|
||||
name = "Claude Haiku 4.5";
|
||||
options = {
|
||||
thinking = {
|
||||
type = "enabled";
|
||||
budget_tokens = 16000;
|
||||
};
|
||||
};
|
||||
limit = {
|
||||
context = 200000;
|
||||
output = 64000;
|
||||
};
|
||||
};
|
||||
"claude-sonnet-4-6" = {
|
||||
name = "Claude Sonnet 4.6";
|
||||
options = {
|
||||
thinking = {
|
||||
type = "enabled";
|
||||
budget_tokens = 16000;
|
||||
};
|
||||
};
|
||||
limit = {
|
||||
context = 200000;
|
||||
output = 64000;
|
||||
};
|
||||
};
|
||||
"claude-opus-4-6" = {
|
||||
name = "Claude Opus 4.6";
|
||||
options = {
|
||||
thinking = {
|
||||
type = "enabled";
|
||||
budget_tokens = 16000;
|
||||
};
|
||||
};
|
||||
limit = {
|
||||
context = 200000;
|
||||
output = 128000;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
{inputs, ...}: {
|
||||
coding.agents.pi = {
|
||||
enable = true;
|
||||
agentsInput = inputs.agents;
|
||||
|
||||
modelOverrides = {
|
||||
chiron = "minimax/MiniMax-M2.7";
|
||||
chiron-forge = "minimax/MiniMax-M2.7";
|
||||
};
|
||||
|
||||
# Coding rules for Pi agent
|
||||
# Rules sourced from AGENTS repo
|
||||
codingRules = {
|
||||
# Language-specific rules
|
||||
languages = [
|
||||
"nix" # Nix language conventions
|
||||
];
|
||||
|
||||
# Standard concerns from AGENTS repo
|
||||
concerns = [
|
||||
"coding-style" # General coding principles
|
||||
"naming" # Naming conventions (camelCase, snake_case, etc.)
|
||||
"documentation" # Documentation standards
|
||||
"testing" # Testing guidelines (Arrange-Act-Assert)
|
||||
"git-workflow" # Conventional commits, branch naming
|
||||
"project-structure" # Project layout conventions
|
||||
];
|
||||
|
||||
# No framework-specific rules for NixOS config
|
||||
frameworks = [];
|
||||
};
|
||||
|
||||
settings = {
|
||||
packages = [
|
||||
"npm:@thesethrose/pi-zai-provider"
|
||||
"npm:pi-mcp-adapter"
|
||||
"npm:pi-subagents"
|
||||
"npm:pi-lens"
|
||||
"npm:pi-web-access"
|
||||
"npm:pi-prompt-template-model"
|
||||
"npm:@plannotator/pi-extension"
|
||||
"npm:pi-powerline-footer"
|
||||
"npm:pi-markdown-preview"
|
||||
"npm:pi-tool-display"
|
||||
"npm:pi-agent-browser-native"
|
||||
"git:github.com/hk-vk/pi-connect"
|
||||
];
|
||||
|
||||
defaultProvider = "minimax";
|
||||
defaultModel = "MiniMax-M2.7";
|
||||
defaultThinkingLevel = "high";
|
||||
};
|
||||
|
||||
# MCP servers auto-inherited from programs.mcp in default.nix
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
# Coding environment aggregator — profile-independent development tooling.
|
||||
# Imports editors, LSP servers, git configuration, the agent system, language runtimes, and optional packages.
|
||||
{...}: {
|
||||
imports = [
|
||||
./editor
|
||||
./lsp
|
||||
./git/git.nix
|
||||
./agents/agents.nix
|
||||
./languages
|
||||
./packages.nix
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
# Editor aggregator — delegates to m3ta-nixpkgs editor modules.
|
||||
{...}: {
|
||||
imports = [
|
||||
./neovim.nix
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
# NeoVim base configuration via m3ta-nixpkgs coding.editors module.
|
||||
# The option `coding.editors.neovim.enable` is declared by
|
||||
# inputs.m3ta-nixpkgs.homeManagerModules.default — no re-declaration here.
|
||||
{...}: {
|
||||
# Placeholder for host-agnostic NeoVim overrides.
|
||||
# Set coding.editors.neovim.enable = true in per-host files to activate.
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
# Git configuration with signing, aliases, and global ignore.
|
||||
# Identity and host-specific SSH keys are set per-host in home/m3tam3re/.
|
||||
{
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; {
|
||||
programs.git = {
|
||||
enable = true;
|
||||
signing.format = null;
|
||||
settings = {
|
||||
user = {
|
||||
name = lib.mkDefault "m3tam3re";
|
||||
email = lib.mkDefault "p@m3ta.dev";
|
||||
};
|
||||
core.excludesfile = "~/.gitignore_global";
|
||||
init.defaultBranch = "master";
|
||||
alias = {
|
||||
st = "status";
|
||||
logd = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.difftastic.enable = true;
|
||||
|
||||
programs.jujutsu = {
|
||||
enable = true;
|
||||
settings = {
|
||||
user = {
|
||||
email = "m@m3tam3re.com";
|
||||
name = "Sascha Koenig";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
lazygit
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
# Language runtimes — Python, JavaScript, Rust, Go, TypeScript.
|
||||
{...}: {
|
||||
imports = [
|
||||
./python.nix
|
||||
./javascript.nix
|
||||
./rust-toolchain.nix
|
||||
./go.nix
|
||||
./typescript.nix
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
# Go toolchain — compiler and language server.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.coding.languages.go;
|
||||
in {
|
||||
options.coding.languages.go.enable = mkEnableOption "Go toolchain";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
go
|
||||
gopls
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
# JavaScript/TypeScript runtime — Node.js and Bun.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.coding.languages.javascript;
|
||||
npmGlobalPrefix = "${config.home.homeDirectory}/.npm-global";
|
||||
in {
|
||||
options.coding.languages.javascript.enable = mkEnableOption "JavaScript runtime (Node.js + Bun)";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
nodejs
|
||||
bun
|
||||
];
|
||||
|
||||
home.file.".npmrc".text = ''
|
||||
prefix=${npmGlobalPrefix}
|
||||
'';
|
||||
home.sessionVariables.NPM_CONFIG_PREFIX = npmGlobalPrefix;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
# Python runtime with pip and uv.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.coding.languages.python;
|
||||
in {
|
||||
options.coding.languages.python = {
|
||||
enable = mkEnableOption "Python runtime with pip and uv";
|
||||
extraPackages = mkOption {
|
||||
type = types.listOf types.package;
|
||||
default = [];
|
||||
example = literalExpression "[ pkgs.python3Packages.numpy ]";
|
||||
description = "Additional Python packages to include";
|
||||
};
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = [
|
||||
(pkgs.python3.withPackages (ps:
|
||||
with ps; [
|
||||
pip
|
||||
uv
|
||||
] ++ cfg.extraPackages))
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
# Rust toolchain — compiler, package manager, and language server.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.coding.languages.rustToolchain;
|
||||
in {
|
||||
options.coding.languages.rustToolchain.enable = mkEnableOption "Rust toolchain";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
rustc
|
||||
cargo
|
||||
rust-analyzer
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
# TypeScript support — language server and type checking tools.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.coding.languages.typescript;
|
||||
in {
|
||||
options.coding.languages.typescript.enable = mkEnableOption "TypeScript support";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
typescript
|
||||
typescript-language-server
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
# LSP aggregator — language server protocol tooling.
|
||||
{...}: {
|
||||
imports = [
|
||||
./servers.nix
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
# LSP server configuration — language servers for the development environment.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.coding.lsp;
|
||||
in {
|
||||
options.coding.lsp.enable = mkEnableOption "enable LSP servers";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
# Nix
|
||||
nixd
|
||||
# General
|
||||
typescript-language-server
|
||||
tailwindcss-language-server
|
||||
pyrefly
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
# Additional coding packages — API clients and GUI development tools.
|
||||
# Opt-in since not all coding hosts need these desktop-oriented tools.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.coding.packages;
|
||||
in {
|
||||
options.coding.packages.enable = mkEnableOption "additional coding packages (bruno, insomnia)";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = [
|
||||
pkgs.bruno
|
||||
pkgs.insomnia
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
{
|
||||
inputs,
|
||||
lib,
|
||||
outputs,
|
||||
pkgs,
|
||||
system,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
inputs.nix-colors.homeManagerModules.default
|
||||
inputs.m3ta-nixpkgs.homeManagerModules.default
|
||||
]; #imports = builtins.attrValues outputs.homeManagerModules;
|
||||
nixpkgs = {
|
||||
# You can add overlays here
|
||||
overlays = [
|
||||
# Add overlays your own flake exports (from overlays and pkgs dir):
|
||||
#outputs.overlays.additions
|
||||
#outputs.overlays.modifications
|
||||
outputs.overlays.temp-packages
|
||||
outputs.overlays.stable-packages
|
||||
outputs.overlays.locked-packages
|
||||
outputs.overlays.pinned-packages
|
||||
outputs.overlays.master-packages
|
||||
|
||||
inputs.nur.overlays.default
|
||||
inputs.m3ta-nixpkgs.overlays.default
|
||||
inputs.m3ta-nixpkgs.overlays.modifications
|
||||
(outputs.lib.mkLlmAgentsOverlay system)
|
||||
# You can also add overlays exported from other flakes:
|
||||
# neovim-nightly-overlay.overlays.default
|
||||
|
||||
# Or define it inline, for example:
|
||||
# (final: prev: {
|
||||
# hi = final.hello.overrideAttrs (oldAttrs: {
|
||||
# patches = [ ./change-hello-to-hi.patch ];
|
||||
# });
|
||||
# })
|
||||
];
|
||||
# Configure your nixpkgs instance
|
||||
config = {
|
||||
# Disable if you don't want unfree packages
|
||||
allowUnfree = true;
|
||||
# Workaround for https://github.com/nix-community/home-manager/issues/2942
|
||||
allowUnfreePredicate = _: true;
|
||||
};
|
||||
};
|
||||
|
||||
nix = {
|
||||
package = lib.mkDefault pkgs.nix;
|
||||
settings = {
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
warn-dirty = false;
|
||||
};
|
||||
};
|
||||
colorScheme = inputs.nix-colors.colorSchemes.dracula;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
# Cryptocurrency applications — Bisq, Monero GUI, and Trezor Suite.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.desktop.apps.crypto;
|
||||
in {
|
||||
options.desktop.apps.crypto.enable = mkEnableOption "enable crypto applications";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [bisq2 monero-gui trezor-suite];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
# Desktop apps aggregator — Obsidian, Office, web apps, crypto tools, and productivity.
|
||||
{...}: {
|
||||
imports = [
|
||||
./obsidian.nix
|
||||
./office.nix
|
||||
./webapps.nix
|
||||
./crypto.nix
|
||||
./productivity.nix
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
# Obsidian knowledge base with markdown MIME association.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.desktop.apps.obsidian;
|
||||
in {
|
||||
options.desktop.apps.obsidian.enable = mkEnableOption "enable Obsidian knowledge base";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.obsidian.enable = true;
|
||||
|
||||
xdg.mimeApps = {
|
||||
enable = true;
|
||||
associations.added = {
|
||||
"text/markdown" = ["obsidian.desktop"];
|
||||
};
|
||||
defaultApplications = {
|
||||
"text/markdown" = ["obsidian.desktop"];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
# Office and productivity applications — LibreOffice and document tools.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.desktop.apps.office;
|
||||
in {
|
||||
options.desktop.apps.office.enable = mkEnableOption "install office and paperwork apps";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = [pkgs.libreoffice-fresh];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
# Productivity tools — Pomodoro timer and focus utilities.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.desktop.apps.productivity;
|
||||
in {
|
||||
options.desktop.apps.productivity.enable = mkEnableOption "enable productivity tools";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
pomodoro-timer
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
# Web application desktop entries — Teams, Outlook, Basecamp, and OpenCode launchers.
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
icons = {
|
||||
teams = pkgs.fetchurl {
|
||||
url = "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/microsoft-teams.svg";
|
||||
sha256 = "sha256-Pr9QS8nnXJq97r4/G3c6JXi34zxHl0ps9gcyI8cN/s8=";
|
||||
};
|
||||
outlook = pkgs.fetchurl {
|
||||
url = "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/microsoft-outlook.svg";
|
||||
sha256 = "sha256-3u8t5QNHFZvrAegxBiGicO4PjtMWhEaQSCv7MSSfLLc=";
|
||||
};
|
||||
opencode = pkgs.fetchurl {
|
||||
url = "https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/opencode-dark.svg";
|
||||
sha256 = "1lms4f8habamvdh2qqqz9psx4py9wx23mmlkkds44pvrbq3bkj3n";
|
||||
};
|
||||
};
|
||||
in {
|
||||
xdg.desktopEntries = {
|
||||
teams = {
|
||||
name = "Microsoft Teams";
|
||||
exec = "launch-webapp https://teams.microsoft.com";
|
||||
comment = "Open Microsoft Teams as a Desktop App";
|
||||
categories = ["Application" "Network" "Chat"];
|
||||
terminal = false;
|
||||
icon = icons.teams;
|
||||
};
|
||||
outlook = {
|
||||
name = "Microsoft Outlook";
|
||||
exec = "launch-webapp https://outlook.office.com/mail/";
|
||||
comment = "Open Microsoft Outlook as a Desktop App";
|
||||
categories = ["Application" "Network"];
|
||||
terminal = false;
|
||||
icon = icons.outlook;
|
||||
};
|
||||
basecamp = {
|
||||
name = "Basecamp";
|
||||
exec = "launch-webapp https://3.basecamp.com/5996442/";
|
||||
comment = "Open Basecamp as a Desktop App";
|
||||
categories = ["Application" "Network"];
|
||||
terminal = false;
|
||||
icon = "${config.home.homeDirectory}/.local/share/icons/basecamp-logo.png";
|
||||
};
|
||||
opencode = {
|
||||
name = "Opencode";
|
||||
exec = "rofi-project-opener";
|
||||
comment = "Open Opencode Terminal App";
|
||||
categories = ["Application" "Development"];
|
||||
terminal = false;
|
||||
icon = icons.opencode;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
# Desktop environment aggregator — only loaded when context=desktop.
|
||||
# Includes window manager, applications, theming, and desktop session config.
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./wm
|
||||
./apps
|
||||
./theme
|
||||
];
|
||||
|
||||
xdg = {
|
||||
enable = true;
|
||||
configFile."mimeapps.list".force = true;
|
||||
mimeApps = {
|
||||
enable = true;
|
||||
associations.added = {
|
||||
"application/zip" = ["org.gnome.FileRoller.desktop"];
|
||||
"application/csv" = ["calc.desktop"];
|
||||
"application/pdf" = ["okularApplication_pdf.desktop"];
|
||||
};
|
||||
defaultApplications = {
|
||||
"application/zip" = ["org.gnome.FileRoller.desktop"];
|
||||
"application/csv" = ["calc.desktop"];
|
||||
"application/pdf" = ["okularApplication_pdf.desktop"];
|
||||
"application/md" = ["nvim.desktop"];
|
||||
"application/text" = ["nvim.desktop"];
|
||||
"x-scheme-handler/http" = ["io.github.zen_browser.zen"];
|
||||
"x-scheme-handler/https" = ["io.github.zen_browser.zen"];
|
||||
};
|
||||
};
|
||||
userDirs = {
|
||||
enable = true;
|
||||
createDirectories = true;
|
||||
setSessionVariables = true;
|
||||
};
|
||||
};
|
||||
|
||||
home.sessionVariables = {
|
||||
WEBKIT_DISABLE_COMPOSITING_MODE = "1";
|
||||
NIXOS_OZONE_WL = "1";
|
||||
TERMINAL = "ghostty";
|
||||
QT_QPA_PLATFORM = "wayland";
|
||||
XDG_CURRENT_DESKTOP = "Hyprland";
|
||||
XDG_SESSION_TYPE = "wayland";
|
||||
XDG_SESSION_DESKTOP = "Hyprland";
|
||||
};
|
||||
|
||||
home.sessionPath = [
|
||||
"\${XDG_BIN_HOME}"
|
||||
"\${HOME}/.cargo/bin"
|
||||
"$HOME/.npm-global/bin"
|
||||
"$HOME/.cache/.bun/bin"
|
||||
];
|
||||
|
||||
fonts.fontconfig.enable = true;
|
||||
|
||||
programs.ghostty = {
|
||||
enable = true;
|
||||
enableFishIntegration = true;
|
||||
enableBashIntegration = true;
|
||||
settings = {
|
||||
font-family = "Fira Code";
|
||||
copy-on-select = true;
|
||||
foreground = "#${config.colorScheme.palette.base05}";
|
||||
background = "#${config.colorScheme.palette.base00}";
|
||||
selection-foreground = "#${config.colorScheme.palette.base07}";
|
||||
selection-background = "#${config.colorScheme.palette.base02}";
|
||||
cursor-color = "#${config.colorScheme.palette.base05}";
|
||||
palette = [
|
||||
"0=#${config.colorScheme.palette.base01}"
|
||||
"1=#${config.colorScheme.palette.base08}"
|
||||
"2=#${config.colorScheme.palette.base0B}"
|
||||
"3=#${config.colorScheme.palette.base0A}"
|
||||
"4=#${config.colorScheme.palette.base0D}"
|
||||
"5=#${config.colorScheme.palette.base0E}"
|
||||
"6=#${config.colorScheme.palette.base0C}"
|
||||
"7=#${config.colorScheme.palette.base05}"
|
||||
"8=#${config.colorScheme.palette.base03}"
|
||||
"9=#${config.colorScheme.palette.base08}"
|
||||
"10=#${config.colorScheme.palette.base0B}"
|
||||
"11=#${config.colorScheme.palette.base0A}"
|
||||
"12=#${config.colorScheme.palette.base0D}"
|
||||
"13=#${config.colorScheme.palette.base0E}"
|
||||
"14=#${config.colorScheme.palette.base0C}"
|
||||
"15=#${config.colorScheme.palette.base07}"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
home.pointerCursor = {
|
||||
gtk.enable = true;
|
||||
package = pkgs.bibata-cursors;
|
||||
name = "Bibata-Modern-Ice";
|
||||
size = 20;
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
appimage-run
|
||||
bemoji
|
||||
brave
|
||||
distrobox
|
||||
eigent
|
||||
(element-desktop.override {
|
||||
commandLineArgs = "--password-store=gnome-libsecret";
|
||||
})
|
||||
launch-webapp
|
||||
file-roller
|
||||
hyprpanel
|
||||
seahorse
|
||||
sushi
|
||||
ksnip
|
||||
msty-studio
|
||||
nwg-look
|
||||
rose-pine-hyprcursor
|
||||
remmina
|
||||
slack
|
||||
telegram-desktop
|
||||
vivaldi
|
||||
vivaldi-ffmpeg-codecs
|
||||
vibetyper
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
# Theme aggregator — fonts, GTK/Qt theming, and wallpapers.
|
||||
{...}: {
|
||||
imports = [
|
||||
./fonts.nix
|
||||
./theme.nix
|
||||
./wallpapers.nix
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
# Font packages — Fira Code, JetBrains Mono Nerd Font, and supporting icon fonts.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.desktop.theme.fonts;
|
||||
in {
|
||||
options.desktop.theme.fonts.enable = mkEnableOption "install desktop fonts";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
fira-code
|
||||
fira-code-symbols
|
||||
nerd-fonts.fira-code
|
||||
nerd-fonts.jetbrains-mono
|
||||
font-manager
|
||||
font-awesome_5
|
||||
noto-fonts
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
# GTK and Qt theming — Dracula theme with matching icons and cursor.
|
||||
{
|
||||
pkgs,
|
||||
config,
|
||||
...
|
||||
}: {
|
||||
qt = {
|
||||
enable = true;
|
||||
platformTheme.name = "gtk";
|
||||
};
|
||||
|
||||
gtk = {
|
||||
enable = true;
|
||||
theme = {
|
||||
name = "Dracula";
|
||||
package = pkgs.dracula-theme;
|
||||
};
|
||||
iconTheme = {
|
||||
name = "Dracula";
|
||||
package = pkgs.dracula-icon-theme;
|
||||
};
|
||||
gtk4.theme = config.gtk.theme;
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
# Wallpaper collection — copies wallpapers to Hyprland config directory.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.desktop.theme.wallpapers.enable;
|
||||
in {
|
||||
options.desktop.theme.wallpapers.enable = mkEnableOption "wallpapers for Hyprland";
|
||||
|
||||
config = mkIf cfg {
|
||||
xdg.configFile."hypr/wallpapers" = {
|
||||
# Wallpapers are stored relative to the home/m3tam3re directory.
|
||||
source = ../../m3tam3re/wallpapers;
|
||||
recursive = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
# Window manager aggregator — Hyprland, Wayland tools, and Rofi launcher.
|
||||
{...}: {
|
||||
imports = [
|
||||
./hyprland.nix
|
||||
./wayland.nix
|
||||
./rofi.nix
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,318 @@
|
||||
# Hyprland window manager with keybindings, window rules, idle/lock, and hyprpaper.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.desktop.wm.hyprland;
|
||||
in {
|
||||
options.desktop.wm.hyprland.enable = mkEnableOption "Hyprland window manager";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
wayland.windowManager.hyprland = {
|
||||
settings = {
|
||||
xwayland = {
|
||||
force_zero_scaling = true;
|
||||
};
|
||||
|
||||
exec-once = [
|
||||
"hyprpanel"
|
||||
"while ! hyprpaper-random; do sleep 0.5; done"
|
||||
"wl-paste --type text --watch cliphist store"
|
||||
"wl-paste --type image --watch cliphist store"
|
||||
"vibetyper"
|
||||
];
|
||||
|
||||
env = [
|
||||
"XCURSOR_SIZE,32"
|
||||
"HYPRCURSOR_THEME,Bibata-Modern-Ice"
|
||||
"WLR_NO_HARDWARE_CURSORS,1"
|
||||
"GTK_THEME,Dracula"
|
||||
"XDG_CURRENT_DESKTOP,Hyprland"
|
||||
"XDG_SESSION_TYPE,wayland"
|
||||
"XDG_SESSION_DESKTOP,Hyprland"
|
||||
"XKB_DEFAULT_LAYOUT,de"
|
||||
"NIXOS_OZONE_WL,1"
|
||||
];
|
||||
|
||||
input = {
|
||||
kb_layout = "de,us";
|
||||
kb_variant = "";
|
||||
kb_model = "";
|
||||
kb_rules = "";
|
||||
kb_options = "ctrl:nocaps";
|
||||
follow_mouse = 1;
|
||||
};
|
||||
|
||||
general = {
|
||||
gaps_in = 5;
|
||||
gaps_out = 5;
|
||||
border_size = 1;
|
||||
"col.active_border" = "rgba(9742b5ee) rgba(9742b5ee) 45deg";
|
||||
"col.inactive_border" = "rgba(${config.colorScheme.palette.base03}aa)";
|
||||
layout = "dwindle";
|
||||
};
|
||||
|
||||
decoration = {
|
||||
shadow = {
|
||||
enabled = true;
|
||||
range = 60;
|
||||
render_power = 3;
|
||||
color = "rgba(${config.colorScheme.palette.base00}66)";
|
||||
offset = "1 2";
|
||||
scale = 0.97;
|
||||
};
|
||||
rounding = 8;
|
||||
blur = {
|
||||
enabled = true;
|
||||
size = 3;
|
||||
passes = 3;
|
||||
};
|
||||
active_opacity = 0.9;
|
||||
inactive_opacity = 0.5;
|
||||
};
|
||||
|
||||
animations = {
|
||||
enabled = true;
|
||||
bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
|
||||
animation = [
|
||||
"windows, 1, 7, myBezier"
|
||||
"windowsOut, 1, 7, default, popin 80%"
|
||||
"border, 1, 10, default"
|
||||
"borderangle, 1, 8, default"
|
||||
"fade, 1, 7, default"
|
||||
"workspaces, 1, 6, default"
|
||||
];
|
||||
};
|
||||
|
||||
dwindle = {
|
||||
pseudotile = true;
|
||||
preserve_split = true;
|
||||
};
|
||||
|
||||
master = {
|
||||
new_status = "master";
|
||||
};
|
||||
|
||||
device = [
|
||||
{
|
||||
name = "epic-mouse-v1";
|
||||
sensitivity = -0.5;
|
||||
}
|
||||
{
|
||||
name = "zsa-technology-labs-moonlander-mark-i";
|
||||
kb_layout = "us";
|
||||
}
|
||||
{
|
||||
name = "keychron-keychron-k7";
|
||||
kb_layout = "us";
|
||||
}
|
||||
];
|
||||
|
||||
windowrule = [
|
||||
"match:class file_progress, float on"
|
||||
"match:class confirm, float on"
|
||||
"match:class dialog, float on"
|
||||
"match:class download, float on"
|
||||
"match:class notification, float on"
|
||||
"match:class error, float on"
|
||||
"match:class splash, float on"
|
||||
"match:class confirmreset, float on"
|
||||
"match:title Open File, float on"
|
||||
"match:title branchdialog, float on"
|
||||
"match:class pavucontrol-qt, float on"
|
||||
"match:class pavucontrol, float on"
|
||||
"match:class class:^(espanso)$, float on"
|
||||
"match:class wlogout, fullscreen on"
|
||||
"match:title wlogout, float on"
|
||||
"match:title wlogout, fullscreen on"
|
||||
"match:class mpv, float on"
|
||||
"match:class mpv, idle_inhibit focus"
|
||||
"match:class mpv, opacity 1.0 override"
|
||||
"match:title ^(Media viewer)$, float on"
|
||||
"match:title ^(Volume Control)$, float on"
|
||||
"match:title ^(Picture-in-Picture)$, float on"
|
||||
"match:title ^(floating-pomodoro)$, float on"
|
||||
"match:title ^(floating-pomodoro)$, size 250 50"
|
||||
"match:title ^(floating-pomodoro)$, move 12 (monitor_h-150)"
|
||||
"match:title ^(floating-pomodoro)$, pin on"
|
||||
"match:initial_title .*streamlabs.com.*, float on"
|
||||
"match:initial_title .*streamlabs.com.*, pin on"
|
||||
"match:initial_title .*streamlabs.com.*, size 800 400"
|
||||
"match:initial_title .*alert-box.*, move 100%-820 102"
|
||||
"match:initial_title .*chat-box.*, move 100%-820 512"
|
||||
"match:initial_title .*streamlabs.com.*, opacity 0.5 override"
|
||||
"match:initial_title .*streamlabs.com.*, idle_inhibit focus"
|
||||
"match:initial_title .*streamlabs.com.*, no_anim on"
|
||||
"match:initial_title .*streamlabs.com.*, decorate off"
|
||||
"match:initial_title .*streamlabs.com.*, no_shadow on"
|
||||
"match:initial_title .*streamlabs.com.*, no_blur on"
|
||||
"match:class ^vibe-typer$, match:title ^Recording Indicator$, no_blur on"
|
||||
"border_color rgb(ffffff), match:xwayland 1"
|
||||
];
|
||||
|
||||
"$mainMod" = "SUPER";
|
||||
"$terminal" = "ghostty";
|
||||
|
||||
bind = [
|
||||
"$mainMod, return, exec, $terminal nu -c zellij-ps"
|
||||
"$mainMod, t, exec, $terminal -e nu -c 'nitch; exec nu'"
|
||||
"$mainMod SHIFT, t, exec, launch-timer"
|
||||
"$mainMod, n, exec, $terminal -e nvim"
|
||||
"$mainMod, z, exec, uwsm app -- zeditor"
|
||||
"$mainMod, o, exec, hyprctl dispatch setprop activewindow opaque toggle"
|
||||
"$mainMod, r, exec, hyprctl dispatch focuswindow \"initialtitle:.*alert-box.*\" && hyprctl dispatch moveactive exact 4300 102 && hyprctl dispatch focuswindow \"initialtitle:.*chat-box.*\" && hyprctl dispatch moveactive exact 4300 512"
|
||||
"$mainMod, b, exec, uwsm app -- thunar"
|
||||
"$mainMod SHIFT, B, exec, uwsm app -- vivaldi"
|
||||
"$mainMod, Escape, exec, uwsm app -- wlogout -p layer-shell"
|
||||
"$mainMod, Space, togglefloating"
|
||||
"$mainMod, q, killactive"
|
||||
"$mainMod, M, exit"
|
||||
"$mainMod, F, fullscreen"
|
||||
"$mainMod SHIFT, V, togglefloating"
|
||||
"$mainMod, D, exec, uwsm app -- rofi -show drun -run-command \"uwsm app -- {cmd}\""
|
||||
"$mainMod, V, exec, uwsm app -- cliphist list | rofi -dmenu | cliphist decode | wl-copy"
|
||||
"$mainMod, C, exec, bash -c 'FILE=/tmp/screenshot_$(date +%s).png; grim -g \"$(slurp)\" \"$FILE\" && ksnip \"$FILE\"'"
|
||||
"$mainMod SHIFT, S, exec, uwsm app -- rofi -show emoji"
|
||||
"$mainMod, P, exec, uwsm app -- rofi-pass"
|
||||
"$mainMod SHIFT, P, pseudo"
|
||||
"$mainMod, R, exec, stt-ptt start"
|
||||
"$mainMod, S, exec, stt-ptt start"
|
||||
"$mainMod, J, togglesplit"
|
||||
"$mainMod, h, movefocus, l"
|
||||
"$mainMod, l, movefocus, r"
|
||||
"$mainMod, k, movefocus, u"
|
||||
"$mainMod, j, movefocus, d"
|
||||
"$mainMod, 1, workspace, 1"
|
||||
"$mainMod, 2, workspace, 2"
|
||||
"$mainMod, 3, workspace, 3"
|
||||
"$mainMod, 4, workspace, 4"
|
||||
"$mainMod, 5, workspace, 5"
|
||||
"$mainMod, 6, workspace, 6"
|
||||
"$mainMod, 7, workspace, 7"
|
||||
"$mainMod, 8, workspace, 8"
|
||||
"$mainMod, 9, workspace, 9"
|
||||
"$mainMod, 0, workspace, 10"
|
||||
"$mainMod SHIFT, 1, movetoworkspace, 1"
|
||||
"$mainMod SHIFT, 2, movetoworkspace, 2"
|
||||
"$mainMod SHIFT, 3, movetoworkspace, 3"
|
||||
"$mainMod SHIFT, 4, movetoworkspace, 4"
|
||||
"$mainMod SHIFT, 5, movetoworkspace, 5"
|
||||
"$mainMod SHIFT, 6, movetoworkspace, 6"
|
||||
"$mainMod SHIFT, 7, movetoworkspace, 7"
|
||||
"$mainMod SHIFT, 8, movetoworkspace, 8"
|
||||
"$mainMod SHIFT, 9, movetoworkspace, 9"
|
||||
"$mainMod SHIFT, 0, movetoworkspace, 10"
|
||||
"$mainMod, mouse_down, workspace, e+1"
|
||||
"$mainMod, mouse_up, workspace, e-1"
|
||||
];
|
||||
|
||||
bindr = [
|
||||
"$mainMod, R, exec, stt-ptt stop"
|
||||
"$mainMod, S, exec, stt-ptt format-stop"
|
||||
];
|
||||
|
||||
bindm = [
|
||||
"$mainMod, mouse:272, movewindow"
|
||||
"$mainMod, mouse:273, resizewindow"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
services.hypridle = {
|
||||
enable = true;
|
||||
settings = {
|
||||
general = {
|
||||
before_sleep_cmd = "hyprlock";
|
||||
after_sleep_cmd = "hyprctl dispatch dpms on";
|
||||
inhibit_sleep = 3;
|
||||
};
|
||||
listener = [
|
||||
{
|
||||
timeout = 300;
|
||||
on-timeout = "hyprlock";
|
||||
}
|
||||
{
|
||||
timeout = 420;
|
||||
on-timeout = "hyprctl dispatch dpms off";
|
||||
on-resume = "hyprctl dispatch dpms on";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
services.hyprpaper.enable = true;
|
||||
|
||||
programs.hyprlock = {
|
||||
enable = true;
|
||||
settings = {
|
||||
"$font" = "JetBrainsMono Nerd Font";
|
||||
"$base" = "rgb(${config.colorScheme.palette.base00})";
|
||||
"$text" = "rgb(${config.colorScheme.palette.base05})";
|
||||
"$textAlpha" = "${config.colorScheme.palette.base05}";
|
||||
"$accentAlpha" = "${config.colorScheme.palette.base0D}";
|
||||
"$red" = "rgb(${config.colorScheme.palette.base08})";
|
||||
"$yellow" = "rgb(${config.colorScheme.palette.base0A})";
|
||||
|
||||
general = {
|
||||
hide_cursor = true;
|
||||
};
|
||||
|
||||
background = {
|
||||
monitor = "";
|
||||
path = "${config.home.homeDirectory}/.config/hypr/wallpapers/wallhaven-lmmo8r.jpg";
|
||||
blur_passes = 0;
|
||||
color = "rgb(${config.colorScheme.palette.base00})";
|
||||
};
|
||||
|
||||
label = [
|
||||
{
|
||||
monitor = "";
|
||||
text = "$TIME";
|
||||
color = "$text";
|
||||
font_size = 90;
|
||||
font_family = "$font";
|
||||
position = "30, 0";
|
||||
halign = "left";
|
||||
valign = "top";
|
||||
}
|
||||
{
|
||||
monitor = "";
|
||||
text = ''cmd[update:43200000] echo "$(date +"%A, %d %B %Y")"'';
|
||||
color = "$text";
|
||||
font_size = 25;
|
||||
font_family = "$font";
|
||||
position = "30, -150";
|
||||
halign = "left";
|
||||
valign = "top";
|
||||
}
|
||||
];
|
||||
|
||||
input-field = [
|
||||
{
|
||||
monitor = "";
|
||||
size = "300, 60";
|
||||
outline_thickness = 4;
|
||||
dots_size = 0.2;
|
||||
dots_spacing = 0.2;
|
||||
dots_center = true;
|
||||
outer_color = "rgb(${config.colorScheme.palette.base0D})";
|
||||
inner_color = "rgb(${config.colorScheme.palette.base00})";
|
||||
font_color = "rgb(${config.colorScheme.palette.base05})";
|
||||
fade_on_empty = false;
|
||||
placeholder_text = ''<span foreground="##${config.colorScheme.palette.base05}"> Logged in as <span foreground="##${config.colorScheme.palette.base0D}">$USER</span></span>'';
|
||||
hide_input = false;
|
||||
check_color = "rgb(${config.colorScheme.palette.base0D})";
|
||||
fail_color = "rgb(${config.colorScheme.palette.base08})";
|
||||
fail_text = ''<i>$FAIL <b>($ATTEMPTS)</b></i>'';
|
||||
capslock_color = "rgb(${config.colorScheme.palette.base0A})";
|
||||
position = "0, -35";
|
||||
halign = "center";
|
||||
valign = "center";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,207 @@
|
||||
# Rofi application launcher with nix-colors theme, pass integration, and project opener.
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.desktop.wm.rofi;
|
||||
in {
|
||||
options.desktop.wm.rofi.enable = mkEnableOption "enable rofi";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
programs.rofi = {
|
||||
enable = true;
|
||||
package = pkgs.rofi.override {
|
||||
plugins = [
|
||||
pkgs.rofi-calc
|
||||
pkgs.rofi-emoji
|
||||
pkgs.stable.rofi-file-browser
|
||||
];
|
||||
};
|
||||
pass = {
|
||||
enable = true;
|
||||
package = pkgs.rofi-pass-wayland;
|
||||
};
|
||||
terminal = "${pkgs.ghostty}/bin/ghostty";
|
||||
font = "Fira Code";
|
||||
extraConfig = {
|
||||
show-icons = true;
|
||||
disable-history = false;
|
||||
modi = "drun,calc,emoji,filebrowser";
|
||||
kb-primary-paste = "Control+V,Shift+Insert";
|
||||
kb-secondary-paste = "Control+v,Insert";
|
||||
};
|
||||
theme = let
|
||||
inherit (config.colorScheme) palette;
|
||||
in
|
||||
builtins.toString (pkgs.writeText "rofi-universal-theme.rasi" ''
|
||||
* {
|
||||
/* Universal theme colors from nix-colors */
|
||||
background: #${palette.base00};
|
||||
surface: #${palette.base01};
|
||||
overlay: #${palette.base02};
|
||||
muted: #${palette.base03};
|
||||
subtle: #${palette.base04};
|
||||
text: #${palette.base05};
|
||||
bright-text: #${palette.base06};
|
||||
highlight: #${palette.base07};
|
||||
accent1: #${palette.base08};
|
||||
accent2: #${palette.base09};
|
||||
accent3: #${palette.base0A};
|
||||
accent4: #${palette.base0B};
|
||||
accent5: #${palette.base0C};
|
||||
accent6: #${palette.base0D};
|
||||
accent7: #${palette.base0E};
|
||||
accent8: #${palette.base0F};
|
||||
|
||||
/* Global properties */
|
||||
background-color: @background;
|
||||
text-color: @text;
|
||||
font: "Fira Code 12";
|
||||
border: 0;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
spacing: 0;
|
||||
}
|
||||
|
||||
window {
|
||||
background-color: @background;
|
||||
border: 1px;
|
||||
border-color: @accent7;
|
||||
border-radius: 6px;
|
||||
width: 40%;
|
||||
padding: 16px;
|
||||
}
|
||||
|
||||
inputbar {
|
||||
children: [ prompt, entry ];
|
||||
spacing: 12px;
|
||||
padding: 8px;
|
||||
border-radius: 4px;
|
||||
background-color: @surface;
|
||||
}
|
||||
|
||||
prompt {
|
||||
text-color: @accent7;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
entry {
|
||||
placeholder: "Search...";
|
||||
placeholder-color: @subtle;
|
||||
text-color: @text;
|
||||
background-color: transparent;
|
||||
cursor-color: @accent7;
|
||||
}
|
||||
|
||||
message {
|
||||
background-color: @surface;
|
||||
border-radius: 4px;
|
||||
padding: 8px;
|
||||
margin: 8px 0;
|
||||
}
|
||||
|
||||
textbox {
|
||||
text-color: @text;
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
listview {
|
||||
background-color: transparent;
|
||||
margin: 8px 0 0;
|
||||
lines: 10;
|
||||
columns: 1;
|
||||
fixed-height: true;
|
||||
scrollbar: false;
|
||||
}
|
||||
|
||||
element {
|
||||
background-color: transparent;
|
||||
text-color: @text;
|
||||
padding: 8px;
|
||||
border-radius: 4px;
|
||||
spacing: 8px;
|
||||
}
|
||||
|
||||
element normal.normal {
|
||||
background-color: transparent;
|
||||
text-color: @text;
|
||||
}
|
||||
|
||||
element selected.normal {
|
||||
background-color: @accent7;
|
||||
text-color: @background;
|
||||
}
|
||||
|
||||
element alternate.normal {
|
||||
background-color: transparent;
|
||||
text-color: @text;
|
||||
}
|
||||
|
||||
element-icon {
|
||||
background-color: transparent;
|
||||
size: 24px;
|
||||
}
|
||||
|
||||
element-text {
|
||||
background-color: transparent;
|
||||
text-color: inherit;
|
||||
vertical-align: 0.5;
|
||||
}
|
||||
|
||||
mode-switcher {
|
||||
spacing: 0;
|
||||
background-color: @surface;
|
||||
border-radius: 4px;
|
||||
margin: 8px 0 0;
|
||||
}
|
||||
|
||||
button {
|
||||
padding: 8px 16px;
|
||||
background-color: transparent;
|
||||
text-color: @text;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
button selected {
|
||||
background-color: @accent7;
|
||||
text-color: @background;
|
||||
}
|
||||
|
||||
scrollbar {
|
||||
width: 4px;
|
||||
border: 0;
|
||||
handle-color: @accent7;
|
||||
handle-width: 4px;
|
||||
padding: 0;
|
||||
}
|
||||
'');
|
||||
};
|
||||
|
||||
cli.rofi-project-opener = {
|
||||
enable = true;
|
||||
projectDirs = {
|
||||
AI = {
|
||||
path = "~/p/AI";
|
||||
args = "";
|
||||
};
|
||||
CHAT = {
|
||||
path = "~/p/CHAT";
|
||||
args = "--agent chiron";
|
||||
};
|
||||
MISC = {
|
||||
path = "~/p/MISC";
|
||||
args = "--agent chiron-forge";
|
||||
};
|
||||
NIX = {
|
||||
path = "~/p/NIX";
|
||||
args = "";
|
||||
};
|
||||
};
|
||||
terminal = pkgs.ghostty;
|
||||
terminalCommand = "opencode %a";
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
# Wayland extra tooling — screenshot, clipboard, cursor, and display utilities.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.desktop.wm.wayland;
|
||||
in {
|
||||
options.desktop.wm.wayland.enable = mkEnableOption "wayland extra tools and config";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
grim
|
||||
hyprcursor
|
||||
hyprlock
|
||||
hyprpaper
|
||||
qt6.qtwayland
|
||||
slurp
|
||||
waypipe
|
||||
wl-clipboard
|
||||
wf-recorder
|
||||
wl-mirror
|
||||
wlogout
|
||||
wtype
|
||||
ydotool
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
# home/lib/default.nix
|
||||
# Profile loading utilities for home-manager configurations.
|
||||
#
|
||||
# Usage:
|
||||
# let homeLib = import ../lib { inherit lib; };
|
||||
# in {
|
||||
# imports = [
|
||||
# (homeLib.mkHomeConfig { profiles = ["coding" "gaming"]; context = "desktop"; })
|
||||
# ];
|
||||
# }
|
||||
{lib}: let
|
||||
# Infrastructure layer — nixpkgs overlays, nix-colors, m3ta-nixpkgs modules.
|
||||
# Always loaded on every host.
|
||||
commonModule = ../common;
|
||||
|
||||
# Base user environment — shell (nushell, starship), CLI tools, secrets.
|
||||
# Always loaded on every host.
|
||||
baseModule = ../base;
|
||||
|
||||
# Context-specific modules — desktop and server are mutually exclusive.
|
||||
contextModuleMap = {
|
||||
desktop = ../desktop;
|
||||
server = ../server;
|
||||
};
|
||||
|
||||
# Profile modules — freely combinable additions on top of base + context.
|
||||
profileModuleMap = {
|
||||
coding = ../coding;
|
||||
gaming = ../profiles/gaming;
|
||||
media = ../profiles/media;
|
||||
};
|
||||
in {
|
||||
# Generate a home-manager module with imports based on profiles and context.
|
||||
#
|
||||
# Args:
|
||||
# profiles: list of profile names (e.g. ["coding" "gaming" "media"])
|
||||
# context: host context, one of "desktop" | "server" | null
|
||||
#
|
||||
# Returns: a home-manager module attrset with imports and assertions.
|
||||
# Desktop and server contexts are mutually exclusive by design — passing
|
||||
# any value other than "desktop", "server", or null causes an assertion
|
||||
# failure at evaluation time.
|
||||
mkHomeConfig = {
|
||||
profiles ? [],
|
||||
context ? null,
|
||||
}: let
|
||||
contextImport =
|
||||
if context == "desktop"
|
||||
then [contextModuleMap.desktop]
|
||||
else if context == "server"
|
||||
then [contextModuleMap.server]
|
||||
else [];
|
||||
|
||||
# Partition profiles into known and unknown for assertion + safe import.
|
||||
unknownProfiles =
|
||||
builtins.filter
|
||||
(profileName: ! builtins.hasAttr profileName profileModuleMap)
|
||||
profiles;
|
||||
|
||||
# Only import known profiles; the assertion below catches unknowns.
|
||||
activeProfiles =
|
||||
builtins.filter
|
||||
(profileName: builtins.hasAttr profileName profileModuleMap)
|
||||
profiles;
|
||||
|
||||
profileImports = map (profileName: profileModuleMap.${profileName}) activeProfiles;
|
||||
|
||||
contextStr =
|
||||
if context == null
|
||||
then "null"
|
||||
else context;
|
||||
in {
|
||||
imports =
|
||||
[commonModule baseModule]
|
||||
++ contextImport
|
||||
++ profileImports;
|
||||
|
||||
assertions = [
|
||||
{
|
||||
assertion = builtins.elem context ["desktop" "server" null];
|
||||
message =
|
||||
"m3ta home: context must be 'desktop', 'server', or null"
|
||||
+ " (got: '${contextStr}')";
|
||||
}
|
||||
{
|
||||
assertion = unknownProfiles == [];
|
||||
message =
|
||||
"m3ta home: unknown profiles requested:"
|
||||
+ " [ ${builtins.concatStringsSep " " unknownProfiles} ]."
|
||||
+ " Valid profiles are:"
|
||||
+ " [ ${builtins.concatStringsSep " " (builtins.attrNames profileModuleMap)} ]";
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,121 @@
|
||||
# This is a default home.nix generated by the follwing hone-manager command
|
||||
#
|
||||
# home-manager init ./
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
# manage.
|
||||
home.username = lib.mkDefault "your-name";
|
||||
home.homeDirectory = lib.mkDefault "/home/${config.home.username}";
|
||||
|
||||
# This value determines the Home Manager release that your configuration is
|
||||
# compatible with. This helps avoid breakage when a new Home Manager release
|
||||
# introduces backwards incompatible changes.
|
||||
#
|
||||
# You should not change this value, even if you update Home Manager. If you do
|
||||
# want to update the value, then make sure to first check the Home Manager
|
||||
# release notes.
|
||||
home.stateVersion = "26.05"; # Updated to adopt HM 26.05 defaults.
|
||||
|
||||
# The home.packages option allows you to install Nix packages into your
|
||||
# environment.
|
||||
home.packages = with pkgs; [
|
||||
# # Adds the 'hello' command to your environment. It prints a friendly
|
||||
# # "Hello, world!" when run.
|
||||
# pkgs.hello
|
||||
|
||||
# # It is sometimes useful to fine-tune packages, for example, by applying
|
||||
# # overrides. You can do that directly here, just don't forget the
|
||||
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
|
||||
# # fonts?
|
||||
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
|
||||
|
||||
# # You can also create simple shell scripts directly inside your
|
||||
# # configuration. For example, this adds a command 'my-hello' to your
|
||||
# # environment:
|
||||
# (pkgs.writeShellScriptBin "my-hello" ''
|
||||
# echo "Hello, ${config.home.username}!"
|
||||
# '')
|
||||
];
|
||||
|
||||
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
||||
# plain files is through 'home.file'.
|
||||
home.file = {
|
||||
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
|
||||
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
|
||||
# # symlink to the Nix store copy.
|
||||
# ".screenrc".source = dotfiles/screenrc;
|
||||
|
||||
# # You can also set the file content immediately.
|
||||
# ".gradle/gradle.properties".text = ''
|
||||
# org.gradle.console=verbose
|
||||
# org.gradle.daemon.idletimeout=3600000
|
||||
# '';
|
||||
};
|
||||
|
||||
# Home Manager can also manage your environment variables through
|
||||
# 'home.sessionVariables'. If you don't want to manage your shell through Home
|
||||
# Manager then you have to manually source 'hm-session-vars.sh' located at
|
||||
# either
|
||||
#
|
||||
# ~/.nix-profile/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
# or
|
||||
#
|
||||
# ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
# or
|
||||
#
|
||||
# /etc/profiles/per-user/m3tam3re/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
home.sessionVariables = {
|
||||
# EDITOR = "emacs";
|
||||
};
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
signing.format = null;
|
||||
settings = {
|
||||
user = {
|
||||
name = "m3tm3re";
|
||||
email = "p@m3ta.dev";
|
||||
};
|
||||
core.excludesfile = "~/.gitignore_global";
|
||||
init.defaultBranch = "master";
|
||||
alias = {
|
||||
st = "status";
|
||||
logd = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
|
||||
};
|
||||
};
|
||||
};
|
||||
# programs.zellij-ps = {
|
||||
# enable = true;
|
||||
# projectFolders = [
|
||||
# "${config.home.homeDirectory}/p/c"
|
||||
# "${config.home.homeDirectory}/p"
|
||||
# "${config.home.homeDirectory}/.config"
|
||||
# ];
|
||||
# layout = ''
|
||||
# layout {
|
||||
# pane size=1 borderless=true {
|
||||
# plugin location="zellij:tab-bar"
|
||||
# }
|
||||
# pane size="70%" command="nvim"
|
||||
# pane split_direction="vertical" {
|
||||
# pane
|
||||
# pane command="unimatrix"
|
||||
# }
|
||||
# pane size=1 borderless=true {
|
||||
# plugin location="zellij:status-bar"
|
||||
# }
|
||||
# }
|
||||
# '';
|
||||
# };
|
||||
}
|
||||
@@ -0,0 +1,262 @@
|
||||
# This is a default home.nix generated by the follwing hone-manager command
|
||||
#
|
||||
# home-manager init ./
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
# Home Manager needs a bit of information about you and the paths it should
|
||||
# manage.
|
||||
home.username = lib.mkDefault "your-name";
|
||||
home.homeDirectory = lib.mkDefault "/home/${config.home.username}";
|
||||
|
||||
# This value determines the Home Manager release that your configuration is
|
||||
# compatible with. This helps avoid breakage when a new Home Manager release
|
||||
# introduces backwards incompatible changes.
|
||||
#
|
||||
# You should not change this value, even if you update Home Manager. If you do
|
||||
# want to update the value, then make sure to first check the Home Manager
|
||||
# release notes.
|
||||
home.stateVersion = "26.05"; # Updated to adopt HM 26.05 defaults.
|
||||
|
||||
# The home.packages option allows you to install Nix packages into your
|
||||
# environment.
|
||||
home.packages = with pkgs; [
|
||||
libgtop
|
||||
# # Adds the 'hello' command to your environment. It prints a friendly
|
||||
# # "Hello, world!" when run.
|
||||
# pkgs.hello
|
||||
|
||||
# # It is sometimes useful to fine-tune packages, for example, by applying
|
||||
# # overrides. You can do that directly here, just don't forget the
|
||||
# # parentheses. Maybe you want to install Nerd Fonts with a limited number of
|
||||
# # fonts?
|
||||
# (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
|
||||
|
||||
# # You can also create simple shell scripts directly inside your
|
||||
# # configuration. For example, this adds a command 'my-hello' to your
|
||||
# # environment:
|
||||
# (pkgs.writeShellScriptBin "my-hello" ''
|
||||
# echo "Hello, ${config.home.username}!"
|
||||
# '')
|
||||
];
|
||||
|
||||
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
||||
# plain files is through 'home.file'.
|
||||
home.file = {
|
||||
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
|
||||
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
|
||||
# # symlink to the Nix store copy.
|
||||
# ".screenrc".source = dotfiles/screenrc;
|
||||
|
||||
# # You can also set the file content immediately.
|
||||
# ".gradle/gradle.properties".text = ''
|
||||
# org.gradle.console=verbose
|
||||
# org.gradle.daemon.idletimeout=3600000
|
||||
# '';
|
||||
};
|
||||
|
||||
# Home Manager can also manage your environment variables through
|
||||
# 'home.sessionVariables'. If you don't want to manage your shell through Home
|
||||
# Manager then you have to manually source 'hm-session-vars.sh' located at
|
||||
# either
|
||||
#
|
||||
# ~/.nix-profile/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
# or
|
||||
#
|
||||
# ~/.local/state/nix/profiles/profile/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
# or
|
||||
#
|
||||
# /etc/profiles/per-user/m3tam3re/etc/profile.d/hm-session-vars.sh
|
||||
#
|
||||
home.sessionVariables = {
|
||||
# EDITOR = "emacs";
|
||||
};
|
||||
|
||||
# Let Home Manager install and manage itself.
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
services.cliphist = {
|
||||
enable = true;
|
||||
allowImages = true;
|
||||
};
|
||||
|
||||
programs.git = {
|
||||
enable = true;
|
||||
signing.format = null;
|
||||
settings = {
|
||||
user = {
|
||||
name = "m3tm3re";
|
||||
email = "p@m3ta.dev";
|
||||
};
|
||||
core.excludesfile = "~/.gitignore_global";
|
||||
init.defaultBranch = "master";
|
||||
alias = {
|
||||
st = "status";
|
||||
logd = "log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.difftastic.enable = true;
|
||||
|
||||
programs.jujutsu = {
|
||||
enable = true;
|
||||
settings = {
|
||||
user = {
|
||||
email = "m@m3tam3re.com";
|
||||
name = "Sascha Koenig";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
programs.ssh = {
|
||||
enable = true;
|
||||
enableDefaultConfig = false;
|
||||
matchBlocks = {
|
||||
"AZ-CLD-1" = {
|
||||
hostname = "152.53.186.119";
|
||||
user = "sascha.koenig";
|
||||
port = 2022;
|
||||
identityFile = "~/.ssh/sascha.koenig";
|
||||
};
|
||||
"AZ-PRM-1" = {
|
||||
hostname = "192.168.152.76";
|
||||
user = "sascha.koenig";
|
||||
port = 2022;
|
||||
identityFile = "~/.ssh/sascha.koenig";
|
||||
};
|
||||
"github.com" = {
|
||||
hostname = "github.com";
|
||||
user = "m3tam3re";
|
||||
port = 22;
|
||||
identityFile = "~/.ssh/github";
|
||||
};
|
||||
"nikhil" = {
|
||||
hostname = "91.99.176.80";
|
||||
user = "nikhilmaddirala";
|
||||
identityFile = "~/.ssh/m3tam3re";
|
||||
};
|
||||
"code.m3ta.dev" = {
|
||||
hostname = "code.m3ta.dev";
|
||||
user = "m3tam3re";
|
||||
identityFile = "~/.ssh/gitea";
|
||||
};
|
||||
"git.az-gruppe.com" = {
|
||||
hostname = "git.az-gruppe.com";
|
||||
port = 2022;
|
||||
user = "sascha.koenig";
|
||||
identityFile = "~/.ssh/sascha.koenig";
|
||||
};
|
||||
"lkk-nix-1" = {
|
||||
hostname = "89.58.10.189";
|
||||
user = "lkk-admin";
|
||||
identityFile = "~/.ssh/lkk-admin";
|
||||
};
|
||||
"m3-r1" = {
|
||||
hostname = "202.61.226.110";
|
||||
user = "m3tam3re";
|
||||
identityFile = "~/.ssh/m3tam3re";
|
||||
};
|
||||
"lkk-prod-test" = {
|
||||
hostname = "192.168.122.215";
|
||||
user = "root";
|
||||
identityFile = "~/.ssh/m3tam3re";
|
||||
};
|
||||
"lkk-prod-1" = {
|
||||
hostname = "192.168.0.24";
|
||||
user = "root";
|
||||
identityFile = "~/.ssh/m3tam3re";
|
||||
};
|
||||
"lkk-prod-2" = {
|
||||
hostname = "192.168.0.20";
|
||||
user = "root";
|
||||
identityFile = "~/.ssh/m3tam3re";
|
||||
};
|
||||
"m3-deck" = {
|
||||
hostname = "192.168.178.193";
|
||||
user = "m3tam3re";
|
||||
identityFile = "~/.ssh/m3tam3re";
|
||||
};
|
||||
"m3-kratos-vm" = {
|
||||
hostname = "192.168.122.43";
|
||||
user = "m3tam3re";
|
||||
identityFile = "~/.ssh/m3tam3re";
|
||||
};
|
||||
"m3-helios" = {
|
||||
hostname = "192.168.178.210";
|
||||
user = "m3tam3re";
|
||||
identityFile = "~/.ssh/m3tam3re";
|
||||
};
|
||||
"m3-ares" = {
|
||||
hostname = "192.168.1.30";
|
||||
user = "m3tam3re";
|
||||
identityFile = "~/.ssh/m3tam3re";
|
||||
};
|
||||
"m3-atlas" = {
|
||||
hostname = "152.53.85.162";
|
||||
user = "m3tam3re";
|
||||
identityFile = "~/.ssh/m3tam3re";
|
||||
};
|
||||
"m3-hermes" = {
|
||||
hostname = "204.168.229.93";
|
||||
user = "m3tam3re";
|
||||
identityFile = "~/.ssh/m3tam3re";
|
||||
};
|
||||
"m3-zelda" = {
|
||||
hostname = "95.217.189.186";
|
||||
user = "m3tam3re";
|
||||
identityFile = "~/.ssh/m3tam3re";
|
||||
};
|
||||
"m3-skynet" = {
|
||||
hostname = "m3-skynet";
|
||||
user = "admin";
|
||||
identityFile = "~/.ssh/m3tam3re";
|
||||
};
|
||||
"m3-prox-1" = {
|
||||
hostname = "192.168.1.110";
|
||||
user = "root";
|
||||
identityFile = "~/.ssh/m3tam3re";
|
||||
};
|
||||
"shp-old" = {
|
||||
hostname = "95.217.3.250";
|
||||
port = 2222;
|
||||
user = "m3tam3re";
|
||||
identityFile = "~/.ssh/self-host-playbook";
|
||||
};
|
||||
"shp-1" = {
|
||||
hostname = "95.217.189.186";
|
||||
port = 2222;
|
||||
user = "m3tam3re";
|
||||
identityFile = "~/.ssh/self-host-playbook";
|
||||
};
|
||||
};
|
||||
};
|
||||
# programs.zellij-ps = {
|
||||
# enable = true;
|
||||
# projectFolders = [
|
||||
# "${config.home.homeDirectory}/p/c"
|
||||
# "${config.home.homeDirectory}/p"
|
||||
# "${config.home.homeDirectory}/.config"
|
||||
# ];
|
||||
# layout = ''
|
||||
# layout {
|
||||
# pane size=1 borderless=true {
|
||||
# plugin location="zellij:tab-bar"
|
||||
# }
|
||||
# pane size="70%" command="nvim"
|
||||
# pane split_direction="vertical" {
|
||||
# pane
|
||||
# pane command="unimatrix"
|
||||
# }
|
||||
# pane size=1 borderless=true {
|
||||
# plugin location="zellij:status-bar"
|
||||
# }
|
||||
# }
|
||||
# '';
|
||||
# };
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
# m3-aether — cloud VM.
|
||||
# Context: server | Profiles: (none)
|
||||
{lib, ...}: let
|
||||
homeLib = import ../lib {inherit lib;};
|
||||
in {
|
||||
imports = [
|
||||
(homeLib.mkHomeConfig {
|
||||
profiles = [];
|
||||
context = "server";
|
||||
})
|
||||
./home-server.nix
|
||||
];
|
||||
|
||||
# Base CLI tools (new namespace)
|
||||
base = {
|
||||
shell = {
|
||||
fish.enable = true;
|
||||
starship.enable = true;
|
||||
};
|
||||
cliTools = {
|
||||
fzf.enable = true;
|
||||
nitch.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,142 @@
|
||||
# m3-ares — TUXEDO laptop desktop workstation.
|
||||
# Context: desktop | Profiles: coding, gaming, media
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
homeLib = import ../lib {inherit lib;};
|
||||
in
|
||||
with lib; {
|
||||
imports = [
|
||||
(homeLib.mkHomeConfig {
|
||||
profiles = ["coding" "gaming" "media"];
|
||||
context = "desktop";
|
||||
})
|
||||
./home.nix
|
||||
];
|
||||
|
||||
config = mkMerge [
|
||||
{
|
||||
# Base CLI tools (new namespace)
|
||||
base = {
|
||||
shell = {
|
||||
fish.enable = true;
|
||||
nushell.enable = true;
|
||||
starship.enable = true;
|
||||
};
|
||||
cliTools = {
|
||||
fzf.enable = true;
|
||||
nitch.enable = true;
|
||||
television.enable = true;
|
||||
};
|
||||
secrets.enable = true;
|
||||
};
|
||||
|
||||
# Desktop features (new namespace)
|
||||
desktop = {
|
||||
wm = {
|
||||
hyprland.enable = true;
|
||||
rofi.enable = true;
|
||||
wayland.enable = true;
|
||||
};
|
||||
apps = {
|
||||
crypto.enable = true;
|
||||
obsidian.enable = true;
|
||||
office.enable = true;
|
||||
};
|
||||
theme = {
|
||||
fonts.enable = true;
|
||||
wallpapers.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
# Coding environment
|
||||
coding = {
|
||||
editors = {
|
||||
neovim.enable = true;
|
||||
zed.enable = true;
|
||||
};
|
||||
lsp.enable = true;
|
||||
packages.enable = true;
|
||||
languages = {
|
||||
python.enable = true;
|
||||
javascript.enable = true;
|
||||
rustToolchain.enable = true;
|
||||
go.enable = true;
|
||||
typescript.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
# Gaming profile features
|
||||
profiles.gaming = {
|
||||
steam.enable = true;
|
||||
gamescope.enable = true;
|
||||
};
|
||||
|
||||
# Media profile features
|
||||
profiles.media = {
|
||||
obs.enable = true;
|
||||
ffmpeg.enable = true;
|
||||
kdenlive.enable = true;
|
||||
ytDlp.enable = true;
|
||||
};
|
||||
|
||||
xdg = {
|
||||
enable = true;
|
||||
configFile."mimeapps.list".force = true;
|
||||
mimeApps = {
|
||||
enable = true;
|
||||
associations.added = {
|
||||
"application/zip" = ["org.gnome.FileRoller.desktop"];
|
||||
"application/csv" = ["calc.desktop"];
|
||||
"application/pdf" = ["vivaldi-stable.desktop"];
|
||||
"x-scheme-handler/http" = ["vivaldi-stable.desktop"];
|
||||
"x-scheme-handler/https" = ["vivaldi-stable.desktop"];
|
||||
};
|
||||
defaultApplications = {
|
||||
"application/zip" = ["org.gnome.FileRoller.desktop"];
|
||||
"application/csv" = ["calc.desktop"];
|
||||
"application/pdf" = ["vivaldi-stable.desktop"];
|
||||
"application/md" = ["dev.zed.Zed.desktop"];
|
||||
"application/text" = ["dev.zed.Zed.desktop"];
|
||||
"x-scheme-handler/http" = ["vivaldi-stable.desktop"];
|
||||
"x-scheme-handler/https" = ["vivaldi-stable.desktop"];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
# Host-specific Hyprland monitor and workspace layout
|
||||
(mkIf config.desktop.wm.hyprland.enable {
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
settings = {
|
||||
exec-once = ["tuxedo-backlight"];
|
||||
monitor = [
|
||||
"eDP-1,preferred,0x0,1.25"
|
||||
"HDMI-A-1,1920x1080@120,2560x0,1"
|
||||
];
|
||||
workspace = [
|
||||
"1, monitor:eDP-1, default:true"
|
||||
"2, monitor:eDP-1"
|
||||
"3, monitor:eDP-1"
|
||||
"4, monitor:HDMI-A-1,"
|
||||
"5, monitor:HDMI-A-1,border:false,rounding:false"
|
||||
"6, monitor:HDMI-A-1"
|
||||
];
|
||||
windowrule = [
|
||||
"match:class dev.zed.Zed, workspace 1"
|
||||
"match:class Msty, workspace 1"
|
||||
"match:class ^(com.obsproject.Studio)$, workspace 2"
|
||||
"match:class ^(brave-browser)$, workspace 4, opacity 1.0"
|
||||
"match:class ^(vivaldi-stable)$, workspace 4, opacity 1.0"
|
||||
"match:class ^steam_app_\\d+$, fullscreen on"
|
||||
"match:class ^steam_app_\\d+$, workspace 5"
|
||||
"match:class ^steam_app_\\d+$, idle_inhibit focus"
|
||||
];
|
||||
};
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
# m3-atlas — primary server, Traefik hub and container host.
|
||||
# Context: server | Profiles: coding
|
||||
{lib, ...}: let
|
||||
homeLib = import ../lib {inherit lib;};
|
||||
in {
|
||||
imports = [
|
||||
(homeLib.mkHomeConfig {
|
||||
profiles = ["coding"];
|
||||
context = "server";
|
||||
})
|
||||
./home-server.nix
|
||||
];
|
||||
|
||||
# Base CLI tools (new namespace)
|
||||
base = {
|
||||
shell = {
|
||||
nushell.enable = true;
|
||||
starship.enable = true;
|
||||
};
|
||||
cliTools = {
|
||||
fzf.enable = true;
|
||||
nitch.enable = true;
|
||||
zellij.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
# Coding environment
|
||||
coding.editors.neovim.enable = true;
|
||||
}
|
||||
@@ -0,0 +1,127 @@
|
||||
# m3-daedalus — portable laptop (standalone home-manager).
|
||||
# Context: desktop | Profiles: coding, media
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
homeLib = import ../lib {inherit lib;};
|
||||
in
|
||||
with lib; {
|
||||
imports = [
|
||||
(homeLib.mkHomeConfig {
|
||||
profiles = ["coding" "media"];
|
||||
context = "desktop";
|
||||
})
|
||||
./home.nix
|
||||
];
|
||||
|
||||
config = mkMerge [
|
||||
{
|
||||
# Base CLI tools (new namespace)
|
||||
base = {
|
||||
shell = {
|
||||
fish.enable = true;
|
||||
nushell.enable = true;
|
||||
starship.enable = true;
|
||||
};
|
||||
cliTools = {
|
||||
fzf.enable = true;
|
||||
nitch.enable = true;
|
||||
television.enable = true;
|
||||
};
|
||||
secrets.enable = true;
|
||||
};
|
||||
|
||||
# Desktop features (new namespace)
|
||||
desktop = {
|
||||
wm = {
|
||||
hyprland.enable = false;
|
||||
rofi.enable = true;
|
||||
wayland.enable = false;
|
||||
};
|
||||
apps = {
|
||||
obsidian.enable = true;
|
||||
office.enable = false;
|
||||
crypto.enable = false;
|
||||
};
|
||||
theme = {
|
||||
fonts.enable = true;
|
||||
wallpapers.enable = false;
|
||||
};
|
||||
};
|
||||
|
||||
# Coding environment
|
||||
coding = {
|
||||
editors = {
|
||||
neovim.enable = true;
|
||||
zed.enable = true;
|
||||
};
|
||||
lsp.enable = true;
|
||||
};
|
||||
|
||||
# Media profile features
|
||||
profiles.media = {
|
||||
obs.enable = false;
|
||||
ffmpeg.enable = false;
|
||||
kdenlive.enable = false;
|
||||
ytDlp.enable = true;
|
||||
};
|
||||
|
||||
xdg = {
|
||||
enable = true;
|
||||
configFile."mimeapps.list".force = true;
|
||||
mimeApps = {
|
||||
enable = true;
|
||||
associations.added = {
|
||||
"application/zip" = ["org.gnome.FileRoller.desktop"];
|
||||
"application/csv" = ["calc.desktop"];
|
||||
"application/pdf" = ["vivaldi-stable.desktop"];
|
||||
"x-scheme-handler/http" = ["vivaldi-stable.desktop"];
|
||||
"x-scheme-handler/https" = ["vivaldi-stable.desktop"];
|
||||
};
|
||||
defaultApplications = {
|
||||
"application/zip" = ["org.gnome.FileRoller.desktop"];
|
||||
"application/csv" = ["calc.desktop"];
|
||||
"application/pdf" = ["vivaldi-stable.desktop"];
|
||||
"application/md" = ["dev.zed.Zed.desktop"];
|
||||
"application/text" = ["dev.zed.Zed.desktop"];
|
||||
"x-scheme-handler/http" = ["vivaldi-stable.desktop"];
|
||||
"x-scheme-handler/https" = ["vivaldi-stable.desktop"];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
# Host-specific Hyprland layout — only applies when hyprland is enabled
|
||||
(mkIf config.desktop.wm.hyprland.enable {
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
settings = {
|
||||
monitor = [
|
||||
"eDP-1,preferred,0x0,1.25"
|
||||
"HDMI-A-1,preferred,2560x0,1"
|
||||
];
|
||||
workspace = [
|
||||
"1, monitor:eDP-1, default:true"
|
||||
"2, monitor:eDP-1"
|
||||
"3, monitor:eDP-1"
|
||||
"4, monitor:HDMI-A-1"
|
||||
"5, monitor:HDMI-A-1,border:false,rounding:false"
|
||||
"6, monitor:HDMI-A-1"
|
||||
];
|
||||
windowrule = [
|
||||
"match:class dev.zed.Zed, workspace 1"
|
||||
"match:class Msty, workspace 1"
|
||||
"match:class ^(com.obsproject.Studio)$, workspace 2"
|
||||
"match:class ^(brave-browser)$, workspace 4, opacity 1.0"
|
||||
"match:class ^(vivaldi-stable)$, workspace 4, opacity 1.0"
|
||||
"match:class ^steam_app_\\d+$, fullscreen on"
|
||||
"match:class ^steam_app_\\d+$, workspace 5"
|
||||
"match:class ^steam_app_\\d+$, idle_inhibit focus"
|
||||
];
|
||||
};
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
# m3-helios — AdGuard DNS and internal routing server.
|
||||
# Context: server | Profiles: (none)
|
||||
{lib, ...}: let
|
||||
homeLib = import ../lib {inherit lib;};
|
||||
in {
|
||||
imports = [
|
||||
(homeLib.mkHomeConfig {
|
||||
profiles = [];
|
||||
context = "server";
|
||||
})
|
||||
./home-server.nix
|
||||
];
|
||||
|
||||
# Base CLI tools (new namespace)
|
||||
base = {
|
||||
shell = {
|
||||
fish.enable = true;
|
||||
starship.enable = true;
|
||||
};
|
||||
cliTools = {
|
||||
fzf.enable = true;
|
||||
nitch.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
# m3-hermes — secondary server.
|
||||
# Context: server | Profiles: (none)
|
||||
{lib, ...}: let
|
||||
homeLib = import ../lib {inherit lib;};
|
||||
in {
|
||||
imports = [
|
||||
(homeLib.mkHomeConfig {
|
||||
profiles = [];
|
||||
context = "server";
|
||||
})
|
||||
./home-server.nix
|
||||
];
|
||||
|
||||
# Base CLI tools (new namespace)
|
||||
base = {
|
||||
shell = {
|
||||
fish.enable = true;
|
||||
starship.enable = true;
|
||||
};
|
||||
cliTools = {
|
||||
fzf.enable = true;
|
||||
nitch.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,138 @@
|
||||
# m3-kratos — AMD desktop workstation.
|
||||
# Context: desktop | Profiles: coding, gaming, media
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
homeLib = import ../lib {inherit lib;};
|
||||
in
|
||||
with lib; {
|
||||
imports = [
|
||||
(homeLib.mkHomeConfig {
|
||||
profiles = ["coding" "gaming" "media"];
|
||||
context = "desktop";
|
||||
})
|
||||
./home.nix
|
||||
];
|
||||
|
||||
config = mkMerge [
|
||||
{
|
||||
# Base CLI tools (new namespace)
|
||||
base = {
|
||||
shell = {
|
||||
nushell.enable = true;
|
||||
starship.enable = true;
|
||||
};
|
||||
cliTools = {
|
||||
fzf.enable = true;
|
||||
nitch.enable = true;
|
||||
television.enable = true;
|
||||
};
|
||||
secrets.enable = true;
|
||||
};
|
||||
|
||||
# Desktop features (new namespace)
|
||||
desktop = {
|
||||
wm = {
|
||||
hyprland.enable = true;
|
||||
rofi.enable = true;
|
||||
wayland.enable = true;
|
||||
};
|
||||
apps = {
|
||||
crypto.enable = true;
|
||||
obsidian.enable = true;
|
||||
office.enable = true;
|
||||
};
|
||||
theme = {
|
||||
fonts.enable = true;
|
||||
wallpapers.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
# Coding environment
|
||||
coding = {
|
||||
editors = {
|
||||
neovim.enable = true;
|
||||
zed.enable = true;
|
||||
};
|
||||
lsp.enable = true;
|
||||
languages = {
|
||||
python.enable = true;
|
||||
javascript.enable = true;
|
||||
rustToolchain.enable = true;
|
||||
go.enable = true;
|
||||
typescript.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
# Gaming profile features
|
||||
profiles.gaming = {
|
||||
steam.enable = true;
|
||||
gamescope.enable = true;
|
||||
};
|
||||
|
||||
# Media profile features
|
||||
profiles.media = {
|
||||
obs.enable = true;
|
||||
ffmpeg.enable = true;
|
||||
kdenlive.enable = true;
|
||||
ytDlp.enable = true;
|
||||
};
|
||||
|
||||
xdg = {
|
||||
enable = true;
|
||||
configFile."mimeapps.list".force = true;
|
||||
mimeApps = {
|
||||
enable = true;
|
||||
associations.added = {
|
||||
"application/zip" = ["org.gnome.FileRoller.desktop"];
|
||||
"application/csv" = ["calc.desktop"];
|
||||
"application/pdf" = ["vivaldi-stable.desktop"];
|
||||
"x-scheme-handler/http" = ["vivaldi-stable.desktop"];
|
||||
"x-scheme-handler/https" = ["vivaldi-stable.desktop"];
|
||||
};
|
||||
defaultApplications = {
|
||||
"application/zip" = ["org.gnome.FileRoller.desktop"];
|
||||
"application/csv" = ["calc.desktop"];
|
||||
"application/pdf" = ["vivaldi-stable.desktop"];
|
||||
"application/md" = ["dev.zed.Zed.desktop"];
|
||||
"application/text" = ["dev.zed.Zed.desktop"];
|
||||
"x-scheme-handler/http" = ["vivaldi-stable.desktop"];
|
||||
"x-scheme-handler/https" = ["vivaldi-stable.desktop"];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
# Host-specific Hyprland monitor and workspace layout (dual 1440p monitors)
|
||||
(mkIf config.desktop.wm.hyprland.enable {
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
settings = {
|
||||
monitor = [
|
||||
"DP-1,2560x1440@144,0x0,1"
|
||||
"DP-2,2560x1440@144,2560x0,1"
|
||||
];
|
||||
workspace = [
|
||||
"1, monitor:DP-1, default:true"
|
||||
"2, monitor:DP-1"
|
||||
"3, monitor:DP-1"
|
||||
"4, monitor:DP-2"
|
||||
"5, monitor:DP-2"
|
||||
"6, monitor:DP-2"
|
||||
"7, monitor:DP-2"
|
||||
];
|
||||
windowrule = [
|
||||
"match:class dev.zed.Zed, workspace 1"
|
||||
"match:class Msty, workspace 1"
|
||||
"match:class ^(com.obsproject.Studio)$, workspace 2"
|
||||
"match:class ^(brave-browser)$, workspace 4, opacity 1.0"
|
||||
"match:class ^(vivaldi-stable)$, workspace 4, opacity 1.0"
|
||||
"match:class ^steam_app_\\d+$, idle_inhibit focus"
|
||||
];
|
||||
};
|
||||
};
|
||||
})
|
||||
];
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 3.3 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 5.4 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 6.7 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.5 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 4.3 MiB |
@@ -0,0 +1,8 @@
|
||||
# Gaming profile aggregator — Steam platform, Gamescope session, and AMD GPU tools.
|
||||
{...}: {
|
||||
imports = [
|
||||
./steam.nix
|
||||
./gamescope.nix
|
||||
./gpu.nix
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
# Gamescope — Valve's micro-compositor for Steam gaming sessions.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.profiles.gaming.gamescope;
|
||||
in {
|
||||
options.profiles.gaming.gamescope.enable = mkEnableOption "enable Gamescope session";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = [pkgs.gamescope];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
# AMD GPU tools — ROCm runtime, monitoring, and Vulkan utilities for gaming.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.profiles.gaming.gpu;
|
||||
in {
|
||||
options.profiles.gaming.gpu.enable = mkEnableOption "enable AMD GPU tools";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
rocmPackages.rocm-runtime
|
||||
rocmPackages.rocm-smi
|
||||
rocmPackages.rocminfo
|
||||
vulkan-tools
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
# Steam gaming platform with Steam Deck compatibility tools and gaming utilities.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.profiles.gaming.steam;
|
||||
in {
|
||||
options.profiles.gaming.steam.enable = mkEnableOption "enable Steam gaming";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
gamemode
|
||||
goverlay
|
||||
mangohud
|
||||
protonplus
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
# Media profile aggregator — OBS, FFmpeg, yt-dlp, Kdenlive, and HandBrake.
|
||||
{...}: {
|
||||
imports = [
|
||||
./obs.nix
|
||||
./ffmpeg.nix
|
||||
./yt-dlp.nix
|
||||
./kdenlive.nix
|
||||
./handbrake.nix
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
# FFmpeg — full-featured multimedia processing toolchain.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.profiles.media.ffmpeg;
|
||||
in {
|
||||
options.profiles.media.ffmpeg.enable = mkEnableOption "enable FFmpeg tools";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
amf
|
||||
ffmpeg_6-full
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-vaapi
|
||||
pamixer
|
||||
pavucontrol
|
||||
qpwgraph
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
# HandBrake — open-source video transcoder.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.profiles.media.handbrake;
|
||||
in {
|
||||
options.profiles.media.handbrake.enable = mkEnableOption "enable HandBrake transcoder";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
handbrake
|
||||
gimp
|
||||
inkscape
|
||||
libation
|
||||
];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
# Kdenlive — KDE non-linear video editor.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.profiles.media.kdenlive;
|
||||
in {
|
||||
options.profiles.media.kdenlive.enable = mkEnableOption "enable Kdenlive video editor";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = [pkgs.kdePackages.kdenlive];
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
# OBS Studio — open broadcaster software for streaming and recording.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.profiles.media.obs;
|
||||
in {
|
||||
options.profiles.media.obs.enable = mkEnableOption "enable OBS Studio";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
v4l-utils
|
||||
];
|
||||
|
||||
# OBS is managed via NixOS programs.obs-studio at the system level.
|
||||
# Home-manager only installs supporting tools.
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
# yt-dlp and media playback — YouTube downloader with MPV integration.
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.profiles.media.ytDlp;
|
||||
in {
|
||||
options.profiles.media.ytDlp.enable = mkEnableOption "enable yt-dlp and media playback";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = with pkgs; [
|
||||
plexamp
|
||||
unimatrix
|
||||
webcord
|
||||
];
|
||||
|
||||
programs.mpv = {
|
||||
enable = true;
|
||||
bindings = {
|
||||
WHEEL_UP = "seek 10";
|
||||
WHEEL_DOWN = "seek -10";
|
||||
};
|
||||
config = {
|
||||
profile = "gpu-hq";
|
||||
ytdl-format = "bestvideo+bestaudio";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
# Server context home-manager configuration — minimal headless setup.
|
||||
# Loaded on server hosts: m3-atlas, m3-helios, m3-aether.
|
||||
{...}: {
|
||||
# Server hosts use the base and coding modules directly.
|
||||
# No desktop environment or GUI applications.
|
||||
}
|
||||
@@ -0,0 +1,76 @@
|
||||
# COMMON HOST CONFIGURATION
|
||||
|
||||
**Shared base configuration and abstractions for all hosts**
|
||||
|
||||
## OVERVIEW
|
||||
Common imports, overlays, and custom patterns (extraServices, ports) used across 6 hosts.
|
||||
|
||||
## STRUCTURE
|
||||
```
|
||||
common/
|
||||
├── default.nix # Base imports, overlays, nix settings
|
||||
├── ports.nix # Centralized port registry
|
||||
├── extraServices/ # Optional service modules
|
||||
│ ├── default.nix
|
||||
│ ├── flatpak.nix
|
||||
│ ├── ollama.nix
|
||||
│ ├── podman.nix
|
||||
│ └── virtualisation.nix
|
||||
└── users/
|
||||
├── default.nix
|
||||
└── m3tam3re.nix # Primary user definition
|
||||
```
|
||||
|
||||
## WHERE TO LOOK
|
||||
|
||||
| Task | Location | Notes |
|
||||
|------|----------|-------|
|
||||
| Add port definition | ports.nix | Use config.m3ta.ports.get |
|
||||
| Enable optional service | Host config extraServices | Boolean flags |
|
||||
| Modify overlays | default.nix lines 27-36 | 5 overlay sources |
|
||||
| Add new user | users/ | Shared across all hosts |
|
||||
|
||||
## CONVENTIONS
|
||||
|
||||
### Port Registry Pattern
|
||||
```nix
|
||||
# Define in ports.nix
|
||||
definitions = {
|
||||
myservice = 3099;
|
||||
};
|
||||
|
||||
# Access in host config
|
||||
config.m3ta.ports.get "myservice" # Returns 3099
|
||||
```
|
||||
|
||||
### extraServices Abstraction
|
||||
Host configs enable via boolean:
|
||||
```nix
|
||||
extraServices = {
|
||||
podman.enable = true; # Container runtime
|
||||
ollama.enable = true; # LLM inference
|
||||
flatpak.enable = false; # Flatpak apps
|
||||
virtualisation.enable = true; # QEMU/KVM
|
||||
};
|
||||
```
|
||||
|
||||
### Overlay Precedence (bottom overrides top)
|
||||
1. stable-packages (nixpkgs-stable)
|
||||
2. locked-packages (nixpkgs-locked)
|
||||
3. pinned-packages (nixpkgs-45570c2, nixpkgs-9e58ed7)
|
||||
4. master-packages (nixpkgs-master)
|
||||
5. m3ta-nixpkgs (local custom overlay)
|
||||
|
||||
## ANTI-PATTERNS
|
||||
|
||||
- **DON'T** add host-specific logic to common/ - belongs in hosts/<name>/
|
||||
- **DON'T** bypass port registry - hardcoded ports break consistency
|
||||
- **DON'T** modify user shell globally - set per-user if needed
|
||||
|
||||
## NOTES
|
||||
|
||||
- Nix GC runs weekly, keeps 30 days
|
||||
- Trusted users: root, m3tam3re
|
||||
- Default shell: Nushell (set line 77)
|
||||
- Home-manager integrated at common level, not per-host
|
||||
- TODO on line 69: ports should only return actually used ports
|
||||
@@ -0,0 +1,81 @@
|
||||
# Common configuration for all hosts
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
inputs,
|
||||
outputs,
|
||||
system,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
./extraServices
|
||||
./ports.nix
|
||||
./users
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
];
|
||||
|
||||
environment.pathsToLink = ["/share/xdg-desktop-portal" "/share/applications"];
|
||||
|
||||
home-manager = {
|
||||
useUserPackages = true;
|
||||
extraSpecialArgs = {
|
||||
inherit inputs outputs system;
|
||||
videoDrivers = config.services.xserver.videoDrivers or [];
|
||||
};
|
||||
};
|
||||
|
||||
nixpkgs = {
|
||||
# You can add overlays here
|
||||
overlays = [
|
||||
# Add overlays your own flake exports (from overlays and pkgs dir):
|
||||
#outputs.overlays.additions
|
||||
#outputs.overlays.modifications
|
||||
outputs.overlays.stable-packages
|
||||
outputs.overlays.locked-packages
|
||||
outputs.overlays.pinned-packages
|
||||
outputs.overlays.master-packages
|
||||
|
||||
inputs.m3ta-nixpkgs.overlays.default
|
||||
inputs.m3ta-nixpkgs.overlays.modifications
|
||||
(outputs.lib.mkLlmAgentsOverlay system)
|
||||
# You can also add overlays exported from other flakes:
|
||||
# neovim-nightly-overlay.overlays.default
|
||||
|
||||
# Or define it inline, for example:
|
||||
# (final: prev: {
|
||||
# hi = final.hello.overrideAttrs (oldAttrs: {
|
||||
# patches = [ ./change-hello-to-hi.patch ];
|
||||
# });
|
||||
# })
|
||||
];
|
||||
# Configure your nixpkgs instance
|
||||
config = {
|
||||
# Disable if you don't want unfree packages
|
||||
allowUnfree = true;
|
||||
};
|
||||
};
|
||||
|
||||
nix = {
|
||||
settings = {
|
||||
experimental-features = "nix-command flakes";
|
||||
cores = 2;
|
||||
max-jobs = 8;
|
||||
trusted-users = [
|
||||
"root"
|
||||
"m3tam3re"
|
||||
]; # Set users that are allowed to use the flake command
|
||||
};
|
||||
gc = {
|
||||
automatic = true;
|
||||
dates = "weekly";
|
||||
options = "--delete-older-than 30d";
|
||||
};
|
||||
optimise.automatic = true;
|
||||
registry =
|
||||
(lib.mapAttrs (_: flake: {inherit flake;}))
|
||||
((lib.filterAttrs (_: lib.isType "flake")) inputs);
|
||||
nixPath = ["/etc/nix/path"];
|
||||
};
|
||||
users.defaultUserShell = pkgs.nushell;
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
{
|
||||
imports = [
|
||||
./flatpak.nix
|
||||
./podman.nix
|
||||
./ollama.nix
|
||||
./virtualisation.nix
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib; let
|
||||
cfg = config.extraServices.flatpak;
|
||||
in {
|
||||
options.extraServices.flatpak.enable = mkEnableOption "enable flatpak";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
services.flatpak.enable = true;
|
||||
xdg.portal = {
|
||||
# xdg desktop intergration (required for flatpak)
|
||||
enable = true;
|
||||
extraPortals = with pkgs; [
|
||||
xdg-desktop-portal-hyprland
|
||||
];
|
||||
config.common.default = "*";
|
||||
};
|
||||
};
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user