Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
.zshenv.local
git/.config/git/config.local

# Herdr runtime state (written into the symlinked config dir; only config.toml is tracked)
herdr/.config/herdr/*.log
herdr/.config/herdr/session.json
herdr/.config/herdr/*.sock

# Nix
result
result-*
Expand Down
43 changes: 43 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@
inputs.nixpkgs.follows = "nixpkgs";
};

# Herdr - terminal agent multiplexer (https://herdr.dev)
herdr = {
url = "github:ogulcancelik/herdr";
inputs.nixpkgs.follows = "nixpkgs";
};

# Home Manager - for user-level configuration
home-manager = {
url = "github:nix-community/home-manager/release-26.05";
Expand Down
2 changes: 2 additions & 0 deletions git/.config/git/.gitignore_global
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@
.DS_Store

.tool-versions

**/.claude/settings.local.json
6 changes: 6 additions & 0 deletions herdr/.config/herdr/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Herdr configuration (https://herdr.dev/docs/configuration)
# First launch runs an onboarding flow that writes settings into this file.
# Reload without restarting: herdr server reload-config

[ui]
agent_panel_sort = "spaces"
16 changes: 15 additions & 1 deletion home/modules/terminal.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
{ config, ... }:
{
config,
pkgs,
inputs,
...
}:

{
# Zellij terminal multiplexer
Expand All @@ -7,6 +12,15 @@
# Settings managed via existing config file
};

# Herdr terminal agent multiplexer (https://herdr.dev)
home.packages = [
inputs.herdr.packages.${pkgs.stdenv.hostPlatform.system}.default
];

# Symlink herdr config so herdr's own writes (onboarding, settings) land in the repo
xdg.configFile."herdr".source =
config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dotfiles/herdr/.config/herdr";

# Symlink existing zellij config
xdg.configFile."zellij".source =
config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/dotfiles/zellij/.config/zellij";
Expand Down
2 changes: 0 additions & 2 deletions zsh/.zshrc
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ function y() {
rm -f -- "$tmp"
}

eval "$(zellij setup --generate-auto-start zsh)"

# Run fastfetch when on every interactive terminal and NOT ssh into a machine
# if [[ $- == *i* ]] && [[ -z "$SSH_CONNECTION" ]]; then
# fastfetch
Expand Down