mirror of
https://github.com/harivansh-afk/nix.git
synced 2026-04-15 07:04:47 +00:00
fix formatting
This commit is contained in:
parent
5747c7a6fd
commit
458778c860
5 changed files with 80 additions and 65 deletions
|
|
@ -3,9 +3,11 @@
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
customScripts = import ../scripts { inherit config lib pkgs; };
|
customScripts = import ../scripts { inherit config lib pkgs; };
|
||||||
in {
|
in
|
||||||
|
{
|
||||||
home.packages = builtins.attrValues customScripts.nettyPackages;
|
home.packages = builtins.attrValues customScripts.nettyPackages;
|
||||||
|
|
||||||
programs.zsh.initContent = lib.mkAfter ''
|
programs.zsh.initContent = lib.mkAfter ''
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
{...}: {
|
{ ... }:
|
||||||
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./common.nix
|
./common.nix
|
||||||
./netty-worktree.nix
|
./netty-worktree.nix
|
||||||
|
|
|
||||||
|
|
@ -3,9 +3,11 @@
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
customScripts = import ../scripts { inherit config lib pkgs; };
|
customScripts = import ../scripts { inherit config lib pkgs; };
|
||||||
in {
|
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);
|
||||||
|
|
|
||||||
13
home/zsh.nix
13
home/zsh.nix
|
|
@ -3,7 +3,8 @@
|
||||||
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" ] ''
|
||||||
|
|
@ -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
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,8 @@
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
}: let
|
}:
|
||||||
|
let
|
||||||
theme = import ../lib/theme.nix { inherit config; };
|
theme = import ../lib/theme.nix { inherit config; };
|
||||||
|
|
||||||
tmuxConfigs = {
|
tmuxConfigs = {
|
||||||
|
|
@ -10,7 +11,8 @@
|
||||||
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 ? [ ],
|
||||||
|
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue