mirror of
https://github.com/AquaMorph/dotfiles.git
synced 2026-03-02 07:19:59 +00:00
Compare commits
29 Commits
9f5802f51a
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 02c86e53e9 | |||
| 719ccb83a2 | |||
| 09f26252f3 | |||
| d19c28941d | |||
| c887881732 | |||
| 6cb9cc1489 | |||
| 5a219ab7df | |||
| 09bb4a172d | |||
| 81fd52a8f7 | |||
| 7f684f98f1 | |||
| f5f8cda9f6 | |||
| 542f97f865 | |||
| 757b6a4b13 | |||
| 8612259d65 | |||
| 69dee58e8b | |||
| 2ebcd74c56 | |||
| 67f43a8916 | |||
| fb976708d5 | |||
| 6d94e57f6b | |||
| 55f99a40d7 | |||
| e0be3d5684 | |||
| 07e96633cc | |||
| c9c93f30fb | |||
| bf34de3dc6 | |||
| d624a55769 | |||
| 3081b00255 | |||
| 3e712774d7 | |||
| e151c2e7c3 | |||
| 9ec8007f55 |
@@ -96,6 +96,7 @@ python3 -m py_compile ./home/bin/homeassistant.py
|
|||||||
- Redirect stderr appropriately: `2>/dev/null` or `2>&1`
|
- Redirect stderr appropriately: `2>/dev/null` or `2>&1`
|
||||||
|
|
||||||
### Configuration Files
|
### Configuration Files
|
||||||
|
- Before generating a commit, always consult `agents/COMMITS.md` for the required style.
|
||||||
|
|
||||||
#### chezmoi Templates
|
#### chezmoi Templates
|
||||||
- Dotfiles use chezmoi's templating system
|
- Dotfiles use chezmoi's templating system
|
||||||
@@ -110,13 +111,16 @@ python3 -m py_compile ./home/bin/homeassistant.py
|
|||||||
## Repository Patterns
|
## Repository Patterns
|
||||||
|
|
||||||
### Commit Message Format
|
### Commit Message Format
|
||||||
Follow conventional commits style:
|
Follow conventional commits style (all lowercase).
|
||||||
- `feat(scope): description` - New feature
|
- `feat(scope): description` - New feature
|
||||||
- `fix(scope): description` - Bug fix
|
- `fix(scope): description` - Bug fix
|
||||||
- `refactor(scope): description` - Code refactoring
|
- `refactor(scope): description` - Code refactoring
|
||||||
- `docs(scope): description` - Documentation changes
|
- `docs(scope): description` - Documentation changes
|
||||||
- Example: `feat(zsh): update dotfiles` or `fix(scripts): use correct pass entry`
|
- Example: `feat(zsh): update dotfiles` or `fix(scripts): use correct pass entry`
|
||||||
|
|
||||||
|
#### Pushing Remotes
|
||||||
|
- **Do not push git repositories to remote unless explicitly instructed.**
|
||||||
|
|
||||||
### File Organization
|
### File Organization
|
||||||
- Shell scripts: `home/bin/executable_<name>.sh`
|
- Shell scripts: `home/bin/executable_<name>.sh`
|
||||||
- Python scripts: `home/bin/<name>.py`
|
- Python scripts: `home/bin/<name>.py`
|
||||||
|
|||||||
8
agents/COMMITS.md
Normal file
8
agents/COMMITS.md
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
Commits
|
||||||
|
## Commit Message Format
|
||||||
|
Follow conventional commits style (all lowercase).
|
||||||
|
- `feat(scope): description` - New feature
|
||||||
|
- `fix(scope): description` - Bug fix
|
||||||
|
- `refactor(scope): description` - Code refactoring
|
||||||
|
- `docs(scope): description` - Documentation changes
|
||||||
|
- Example: `feat(zsh): update dotfiles` or `fix(scripts): use correct pass entry`
|
||||||
1
home/.chezmoitemplates/models/big-brain
Normal file
1
home/.chezmoitemplates/models/big-brain
Normal file
@@ -0,0 +1 @@
|
|||||||
|
AquaAI/glm-4.7-flash
|
||||||
1
home/.chezmoitemplates/prompts/agent-name
Normal file
1
home/.chezmoitemplates/prompts/agent-name
Normal file
@@ -0,0 +1 @@
|
|||||||
|
AquaAI
|
||||||
7
home/.chezmoitemplates/prompts/better-conversations
Normal file
7
home/.chezmoitemplates/prompts/better-conversations
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
Be as concise as possible.
|
||||||
|
Be extremely accurate.
|
||||||
|
Recommend things I would not realize I would benefit from.
|
||||||
|
Call out my misconceptions and tell me when I am wrong.
|
||||||
|
For personal matters {{ template "prompts/agent-name" . }} is encouraging but brutally honest.
|
||||||
|
Never sycophantic.
|
||||||
|
Do not use em dashes. If an em dash would normally appear, use a comma for continuing thoughts or a period if it should be a separate sentence.
|
||||||
1
home/.chezmoitemplates/prompts/name
Normal file
1
home/.chezmoitemplates/prompts/name
Normal file
@@ -0,0 +1 @@
|
|||||||
|
You are an AI assistant named {{ template "prompts/agent-name" . }}.
|
||||||
@@ -2,6 +2,14 @@
|
|||||||
|
|
||||||
# This script is a catch all program updater.
|
# This script is a catch all program updater.
|
||||||
|
|
||||||
|
# Chezmoi Updater
|
||||||
|
function chezmoiUpdate {
|
||||||
|
if command -v chezmoi &> /dev/null; then
|
||||||
|
echo Updating chezmoi dotfiles...
|
||||||
|
chezmoi update
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# DNF Updater
|
# DNF Updater
|
||||||
function dnfUpdate {
|
function dnfUpdate {
|
||||||
if command -v dnf &> /dev/null; then
|
if command -v dnf &> /dev/null; then
|
||||||
@@ -33,6 +41,15 @@ function appimageUpdate {
|
|||||||
am update
|
am update
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Pass Repository Updater
|
||||||
|
function passUpdate {
|
||||||
|
if [ -d "$HOME/.password-store/.git" ] && [ -d "$HOME/.password-store" ]; then
|
||||||
|
echo Updating pass repository...
|
||||||
|
cd "$HOME/.password-store"
|
||||||
|
git pull
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
# Checks if a program is installed and if it is runs an updater script
|
# Checks if a program is installed and if it is runs an updater script
|
||||||
function updateProgram {
|
function updateProgram {
|
||||||
if command -v $1 &> /dev/null; then
|
if command -v $1 &> /dev/null; then
|
||||||
@@ -55,6 +72,8 @@ function manualUpdate {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
chezmoiUpdate
|
||||||
|
echo ''
|
||||||
dnfUpdate
|
dnfUpdate
|
||||||
aptUpdate
|
aptUpdate
|
||||||
echo ''
|
echo ''
|
||||||
@@ -63,4 +82,6 @@ echo ''
|
|||||||
appimageUpdate
|
appimageUpdate
|
||||||
echo ''
|
echo ''
|
||||||
manualUpdate
|
manualUpdate
|
||||||
|
echo ''
|
||||||
|
passUpdate
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ $mainMod = SUPER
|
|||||||
# Keybindings
|
# Keybindings
|
||||||
bind = $mainMod, return, exec, $terminal
|
bind = $mainMod, return, exec, $terminal
|
||||||
bind = $mainMod, Q, killactive,
|
bind = $mainMod, Q, killactive,
|
||||||
bind = $mainMod, C, exit,
|
|
||||||
bind = $mainMod, E, exec, $fileManager
|
bind = $mainMod, E, exec, $fileManager
|
||||||
bind = $mainMod, V, togglefloating,
|
bind = $mainMod, V, togglefloating,
|
||||||
bind = $mainMod, D, exec, $menu
|
bind = $mainMod, D, exec, $menu
|
||||||
|
|||||||
@@ -2,3 +2,4 @@
|
|||||||
$terminal = alacritty
|
$terminal = alacritty
|
||||||
$fileManager = dolphin
|
$fileManager = dolphin
|
||||||
$menu = rofi -show combi
|
$menu = rofi -show combi
|
||||||
|
$browser = brave-browser
|
||||||
@@ -1,2 +1,3 @@
|
|||||||
exec-once = [workspace 1 silent] brave-browser
|
exec-once = [workspace 1 silent] $browser
|
||||||
exec-once = [workspace 2 silent] $terminal
|
exec-once = [workspace 2 silent] $terminal
|
||||||
|
exec-once = [workspace 10 silent] flatpak run org.signal.Signal
|
||||||
31
home/dot_config/opencode/agents/commit.md.tmpl
Normal file
31
home/dot_config/opencode/agents/commit.md.tmpl
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
---
|
||||||
|
description: Commit currently staged code in git
|
||||||
|
mode: all
|
||||||
|
model: {{ template "models/big-brain" . }}
|
||||||
|
temperature: 0.1
|
||||||
|
tools:
|
||||||
|
write: false
|
||||||
|
edit: false
|
||||||
|
bash: true
|
||||||
|
---
|
||||||
|
|
||||||
|
{{ template "prompts/name" . }}
|
||||||
|
|
||||||
|
{{ template "prompts/agent-name" . }} is a senior software engineer committing code to a large and professional project.
|
||||||
|
|
||||||
|
Focus on:
|
||||||
|
- Writing a clear and simple commit message.
|
||||||
|
- Describe what the changes do at a high level.
|
||||||
|
- Always mention only the changes, never any file names.
|
||||||
|
- Follow the project formatting for commits.
|
||||||
|
- Only commit files that are currently staged in git.
|
||||||
|
- Only use the word add if strictly necessary.
|
||||||
|
|
||||||
|
Never:
|
||||||
|
- Never mention specific files or what files changed.
|
||||||
|
- Never add files to the staging.
|
||||||
|
|
||||||
|
Use the following command to look at the changes:
|
||||||
|
```sh
|
||||||
|
git diff --cached
|
||||||
|
```
|
||||||
29
home/dot_config/opencode/agents/review.md.tmpl
Normal file
29
home/dot_config/opencode/agents/review.md.tmpl
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
---
|
||||||
|
description: Review code changes
|
||||||
|
mode: all
|
||||||
|
model: AquaAI/gpt-oss:20b
|
||||||
|
temperature: 0.1
|
||||||
|
tools:
|
||||||
|
write: false
|
||||||
|
edit: false
|
||||||
|
bash: true
|
||||||
|
---
|
||||||
|
|
||||||
|
{{ template "prompts/name" . }}
|
||||||
|
|
||||||
|
{{ template "prompts/agent-name" . }} is a senior software engineer performing a code review for a colleague.
|
||||||
|
|
||||||
|
{{ template "prompts/better-conversations" . }}
|
||||||
|
|
||||||
|
Show code snipets when helpful.
|
||||||
|
{{ template "prompts/agent-name" . }}'s reports should have the following format:
|
||||||
|
```
|
||||||
|
# Typos
|
||||||
|
List of all typos you find.
|
||||||
|
# Formatting and Readability Issues
|
||||||
|
List of all formatting and readability issues you find.
|
||||||
|
# Security Issues
|
||||||
|
List of all security issues you find.
|
||||||
|
# Other
|
||||||
|
List of all other issues you find.
|
||||||
|
```
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
"$schema": "https://opencode.ai/config.json",
|
"$schema": "https://opencode.ai/config.json",
|
||||||
"share": "disabled",
|
"share": "disabled",
|
||||||
"provider": {
|
"provider": {
|
||||||
"ollama": {
|
"AquaAI": {
|
||||||
"npm": "@ai-sdk/openai-compatible",
|
"npm": "@ai-sdk/openai-compatible",
|
||||||
"name": "AquaAI",
|
"name": "AquaAI",
|
||||||
"options": {
|
"options": {
|
||||||
@@ -13,8 +13,20 @@
|
|||||||
"gpt-oss:20b": {
|
"gpt-oss:20b": {
|
||||||
"name": "GPT OSS 20b"
|
"name": "GPT OSS 20b"
|
||||||
},
|
},
|
||||||
"hf.co/unsloth/Qwen3-4B-Instruct-2507-GGUF:Q3_K_M": {
|
"gpt-oss:120b": {
|
||||||
|
"name": "GPT OSS 120b"
|
||||||
|
},
|
||||||
|
"hf.co/unsloth/Qwen3-4B-Instruct-2507-GGUF:Q3_K_M": {
|
||||||
"name": "Qwen3 4b"
|
"name": "Qwen3 4b"
|
||||||
|
},
|
||||||
|
"glm-4.7-flash": {
|
||||||
|
"name": "GLM 4.7 Flash"
|
||||||
|
},
|
||||||
|
"qwen3-coder-next": {
|
||||||
|
"name": "Qwen3 Coder Next"
|
||||||
|
},
|
||||||
|
"hf.co/unsloth/GLM-4.7-Flash-GGUF:Q4_K_M": {
|
||||||
|
"name": "Test"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
computer={{ .chezmoi.hostname }}
|
computer={{ .chezmoi.hostname }}
|
||||||
activation_bytes={{ pass "self-host/token/audible-activation-bytes" }}
|
activation_bytes={{ pass "self-host/token/audible-activation-bytes" }}
|
||||||
AQUAAI_KEY={{ pass "self-host/token/aquaai" }}
|
AQUAAI_KEY={{ pass "self-host/token/aquaai" }}
|
||||||
|
TodoistToken={{ pass "self-host/token/todoist" }}
|
||||||
@@ -84,8 +84,8 @@
|
|||||||
"critical": 15
|
"critical": 15
|
||||||
},
|
},
|
||||||
"format": "{icon} {capacity}%",
|
"format": "{icon} {capacity}%",
|
||||||
"format-charging": "{capacity}% ",
|
"format-charging": " {capacity}%",
|
||||||
"format-plugged": "{capacity}% ",
|
"format-plugged": " {capacity}%",
|
||||||
"format-alt": "{icon} {time}",
|
"format-alt": "{icon} {time}",
|
||||||
"format-good": "", // An empty format will hide the module
|
"format-good": "", // An empty format will hide the module
|
||||||
"format-full": "",
|
"format-full": "",
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
name = Christian Colglazier
|
name = Christian Colglazier
|
||||||
email = christian@cacolglazier.com
|
email = christian@cacolglazier.com
|
||||||
[core]
|
[core]
|
||||||
editor = emacs
|
editor = emacs -nw
|
||||||
excludesFile = ~/.gitignore
|
excludesFile = ~/.gitignore
|
||||||
[rerere]
|
[rerere]
|
||||||
enabled = true
|
enabled = true
|
||||||
|
|||||||
@@ -42,9 +42,15 @@ alias u='sh ~/bin/update.sh'
|
|||||||
alias h='cd ~/git/cacolglazier.com/ && hugo server'
|
alias h='cd ~/git/cacolglazier.com/ && hugo server'
|
||||||
|
|
||||||
# OpenCode
|
# OpenCode
|
||||||
alias o='opencode'
|
export PATH="$HOME/.opencode/bin:$PATH"
|
||||||
|
OPENCODE='opencode'
|
||||||
|
alias o="${OPENCODE}"
|
||||||
|
alias oc="${OPENCODE} --agent commit run 'Create a commit.'"
|
||||||
|
alias ocr="${OPENCODE} --agent review --prompt 'Code review staged changes.'"
|
||||||
|
alias or="${OPENCODE} --continue"
|
||||||
|
|
||||||
# Git
|
# Git
|
||||||
|
gr() { git rebase -i HEAD~$1; }
|
||||||
alias c='git commit -m'
|
alias c='git commit -m'
|
||||||
alias a='git add'
|
alias a='git add'
|
||||||
alias ga='git add -A'
|
alias ga='git add -A'
|
||||||
|
|||||||
Reference in New Issue
Block a user