fix formatting

This commit is contained in:
Harivansh Rathi 2026-03-30 14:44:41 -04:00
parent 5747c7a6fd
commit 458778c860
5 changed files with 80 additions and 65 deletions

View file

@ -3,9 +3,11 @@
lib, lib,
pkgs, pkgs,
... ...
}: let }:
customScripts = import ../scripts {inherit config lib pkgs;}; let
in { customScripts = import ../scripts { inherit config lib pkgs; };
in
{
home.packages = builtins.attrValues customScripts.nettyPackages; home.packages = builtins.attrValues customScripts.nettyPackages;
programs.zsh.initContent = lib.mkAfter '' programs.zsh.initContent = lib.mkAfter ''

View file

@ -1,4 +1,5 @@
{...}: { { ... }:
{
imports = [ imports = [
./common.nix ./common.nix
./netty-worktree.nix ./netty-worktree.nix

View file

@ -3,14 +3,16 @@
lib, lib,
pkgs, pkgs,
... ...
}: let }:
customScripts = import ../scripts {inherit config lib pkgs;}; let
in { customScripts = import ../scripts { inherit config lib pkgs; };
in
{
home.packages = home.packages =
builtins.attrValues customScripts.commonPackages builtins.attrValues customScripts.commonPackages
++ lib.optionals pkgs.stdenv.isDarwin (builtins.attrValues customScripts.darwinPackages); ++ lib.optionals pkgs.stdenv.isDarwin (builtins.attrValues customScripts.darwinPackages);
home.activation.initializeThemeState = lib.hm.dag.entryAfter ["writeBoundary"] '' home.activation.initializeThemeState = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
mkdir -p "${customScripts.theme.paths.stateDir}" "${customScripts.theme.paths.fzfDir}" "${customScripts.theme.paths.ghosttyDir}" "${customScripts.theme.paths.tmuxDir}" mkdir -p "${customScripts.theme.paths.stateDir}" "${customScripts.theme.paths.fzfDir}" "${customScripts.theme.paths.ghosttyDir}" "${customScripts.theme.paths.tmuxDir}"
if [[ -f "${customScripts.theme.paths.stateFile}" ]]; then if [[ -f "${customScripts.theme.paths.stateFile}" ]]; then

View file

@ -3,14 +3,15 @@
lib, lib,
pkgs, pkgs,
... ...
}: { }:
{
home.file.".oh-my-zsh/custom/themes/agnoster.zsh-theme".source = ../config/agnoster.zsh-theme; home.file.".oh-my-zsh/custom/themes/agnoster.zsh-theme".source = ../config/agnoster.zsh-theme;
home.activation.ensureOhMyZshCache = lib.hm.dag.entryAfter ["writeBoundary"] '' home.activation.ensureOhMyZshCache = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
mkdir -p "${config.xdg.cacheHome}/oh-my-zsh" mkdir -p "${config.xdg.cacheHome}/oh-my-zsh"
''; '';
home.packages = [pkgs.oh-my-zsh]; home.packages = [ pkgs.oh-my-zsh ];
programs.zsh = { programs.zsh = {
enable = true; enable = true;
@ -21,8 +22,7 @@
autosuggestion.enable = true; autosuggestion.enable = true;
syntaxHighlighting.enable = true; syntaxHighlighting.enable = true;
shellAliases = shellAliases = {
{
co = "codex --dangerously-bypass-approvals-and-sandbox"; co = "codex --dangerously-bypass-approvals-and-sandbox";
ca = "cursor-agent"; ca = "cursor-agent";
cc = "claude"; cc = "claude";
@ -42,8 +42,7 @@
tailscale = "/Applications/Tailscale.app/Contents/MacOS/Tailscale"; tailscale = "/Applications/Tailscale.app/Contents/MacOS/Tailscale";
}; };
envExtra = envExtra = ''
''
if [[ -f "$HOME/.cargo/env" ]]; then if [[ -f "$HOME/.cargo/env" ]]; then
. "$HOME/.cargo/env" . "$HOME/.cargo/env"
fi fi
@ -87,9 +86,7 @@
export BUN_INSTALL="$HOME/.bun" export BUN_INSTALL="$HOME/.bun"
export PNPM_HOME="${ export PNPM_HOME="${
if pkgs.stdenv.isDarwin if pkgs.stdenv.isDarwin then "$HOME/Library/pnpm" else "${config.xdg.dataHome}/pnpm"
then "$HOME/Library/pnpm"
else "${config.xdg.dataHome}/pnpm"
}" }"
bindkey -v bindkey -v
typeset -U path PATH typeset -U path PATH

View file

@ -2,19 +2,21 @@
config, config,
lib, lib,
pkgs, pkgs,
}: let }:
theme = import ../lib/theme.nix {inherit config;}; let
theme = import ../lib/theme.nix { inherit config; };
tmuxConfigs = { tmuxConfigs = {
dark = pkgs.writeText "tmux-theme-dark.conf" (theme.renderTmux "dark"); dark = pkgs.writeText "tmux-theme-dark.conf" (theme.renderTmux "dark");
light = pkgs.writeText "tmux-theme-light.conf" (theme.renderTmux "light"); light = pkgs.writeText "tmux-theme-light.conf" (theme.renderTmux "light");
}; };
mkScript = { mkScript =
{
file, file,
name, name,
runtimeInputs ? [], runtimeInputs ? [ ],
replacements ? {}, replacements ? { },
}: }:
pkgs.writeShellApplication { pkgs.writeShellApplication {
inherit name runtimeInputs; inherit name runtimeInputs;
@ -27,7 +29,7 @@
ga = mkScript { ga = mkScript {
name = "ga"; name = "ga";
file = ./ga.sh; file = ./ga.sh;
runtimeInputs = with pkgs; [git]; runtimeInputs = with pkgs; [ git ];
}; };
ghpr = mkScript { ghpr = mkScript {
@ -71,7 +73,7 @@
ni = mkScript { ni = mkScript {
name = "ni"; name = "ni";
file = ./ni.sh; file = ./ni.sh;
runtimeInputs = with pkgs; [nix]; runtimeInputs = with pkgs; [ nix ];
}; };
theme = mkScript { theme = mkScript {
@ -115,7 +117,11 @@
wt = mkScript { wt = mkScript {
name = "wt"; name = "wt";
file = ./wt.sh; file = ./wt.sh;
runtimeInputs = with pkgs; [coreutils git gnused]; runtimeInputs = with pkgs; [
coreutils
git
gnused
];
}; };
wt-create = mkScript { wt-create = mkScript {
@ -123,8 +129,15 @@
file = ./wt-create.sh; file = ./wt-create.sh;
}; };
}; };
in { in
inherit commonPackages darwinPackages nettyPackages theme tmuxConfigs; {
inherit
commonPackages
darwinPackages
nettyPackages
theme
tmuxConfigs
;
packages = commonPackages; packages = commonPackages;
} }