ryanccn/flake
1
0
Fork 0
mirror of https://github.com/ryanccn/flake.git synced 2025-12-06 08:10:43 +01:00
Code Activity

chore: update, remove zsh configs

Browse source
This commit is contained in:
Ryan Cao 2025-06-15 09:20:22 +08:00
parent e495878b0e
commit 79bc61a28e
Signed by: ryanccn
GPG key ID: F605AB4AF937D5D0
13 changed files with 58 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

24
users/ryan/apps/vscode.nix
View file

@ -6,10 +6,18 @@
pkgs,
lib,
config,
# self,
...
}:
let
flavorName =
{
"latte" = "Latte";
"frappe" = "Frappé";
"macchiato" = "Macchiato";
"mocha" = "Mocha";
}
.${config.catppuccin.flavor};
extensions = [
"astro-build.astro-vscode"
"bierner.lit-html"
@ -78,8 +86,8 @@ in
profiles.default.userSettings = builtins.foldl' lib.recursiveUpdate { } [
{
"workbench.colorTheme" = "Catppuccin Frappé";
"workbench.iconTheme" = "catppuccin-frappe";
"workbench.colorTheme" = "Catppuccin ${flavorName}";
"workbench.iconTheme" = "catppuccin-${config.catppuccin.flavor}";
"workbench.sideBar.location" = "left";
"workbench.activityBar.location" = "top";
@ -128,10 +136,16 @@ in
"terminal.integrated.fontSize" = 14;
"terminal.integrated.lineHeight" = 1.5;
"terminal.integrated.cursorBlinking" = true;
"terminal.integrated.defaultProfile.osx" = "fish";
"terminal.integrated.inheritEnv" = false;
"terminal.integrated.enablePersistentSessions" = false;
"terminal.integrated.shellIntegration.enabled" = false;
"terminal.integrated.defaultProfile.osx" = "fish";
"terminal.integrated.profiles.osx" = {
"fish" = {
"path" = "/run/current-system/sw/bin/fish";
"args" = [ "-l" ];
};
};
"editor.defaultFormatter" = "esbenp.prettier-vscode";
@ -187,7 +201,7 @@ in
"nix.serverSettings" = {
"nil" = {
formatting.command = [ (lib.getExe pkgs.nixfmt-rfc-style) ];
# nixpkgs.expr = "import (builtins.getFlake \"${self}\").inputs.nixpkgs { }";
nix.flake.autoArchive = false;
};
};
}

2
users/ryan/catppuccin.nix
View file

@ -4,7 +4,7 @@
{
catppuccin = {
flavor = "frappe";
flavor = "macchiato";
accent = "sapphire";
bat.enable = true;

4
users/ryan/programs/fish/configs/01_tooling.fish
View file

@ -2,8 +2,8 @@
#
# SPDX-License-Identifier: Apache-2.0
set -x SSH_AUTH_SOCK "$HOME/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
set -x LS_COLORS "$(vivid generate catppuccin-frappe)"
set -gx SSH_AUTH_SOCK "$HOME/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
set -gx LS_COLORS "$(vivid generate catppuccin-macchiato)"
/opt/homebrew/bin/brew shellenv | source

36
users/ryan/programs/zsh.nix
View file

@ -2,43 +2,9 @@
#
# SPDX-License-Identifier: Apache-2.0
{
config,
inputs,
lib,
...
}:
let
shellAliases = builtins.mapAttrs (lib.const (builtins.getAttr "command")) (import ./aliases.nix);
in
{
_: {
programs.zsh = {
enable = true;
dotDir = ".config/zsh";
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
enableCompletion = true;
envExtra = builtins.readFile ./zsh/envExtra.zsh;
initContent = builtins.readFile ./zsh/initExtra.zsh;
inherit shellAliases;
localVariables = {
vivid_theme = "catppuccin-${config.catppuccin.flavor}";
};
plugins = [
{
name = "ohmyzsh-macos";
file = "plugins/macos/macos.plugin.zsh";
src = inputs.ohmyzsh;
}
{
name = "vivid-zsh";
src = inputs.vivid-zsh;
}
];
};
}

27
users/ryan/programs/zsh/envExtra.zsh
View file

@ -1,27 +0,0 @@
# SPDX-FileCopyrightText: 2025 Ryan Cao <hello@ryanccn.dev>
#
# SPDX-License-Identifier: Apache-2.0
# 1Password SSH
export SSH_AUTH_SOCK="$HOME/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"
# Homebrew
eval "$(/opt/homebrew/bin/brew shellenv)"
# fnm shell env
eval "$(fnm env --use-on-cd)"
# cargo
export PATH="$CARGO_HOME/bin:$PATH"
# go
export PATH="$GOPATH/bin:$PATH"
# deno
export PATH="$HOME/.deno/bin:$PATH"
# pnpm
export PNPM_HOME="${HOME}/Library/pnpm"
export PATH="$PNPM_HOME:$PATH"
# local bin
export PATH="$HOME/.local/bin:$PATH"

30
users/ryan/programs/zsh/initExtra.zsh
View file

@ -1,30 +0,0 @@
# SPDX-FileCopyrightText: 2025 Ryan Cao <hello@ryanccn.dev>
#
# SPDX-License-Identifier: Apache-2.0
# zsh options
setopt interactivecomments
unsetopt menu_complete
unsetopt flowcontrol
setopt auto_menu
setopt complete_in_word
setopt always_to_end
export HISTFILE="$XDG_STATE_HOME"/zsh/history
compinit -d "$XDG_CACHE_HOME"/zsh/zcompdump-"$ZSH_VERSION"
# configure completion styles
zstyle ':completion:*' menu select
zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
zstyle ':completion:*' group-name \'\'
function take() {
mkdir "$1"
cd "$1" || return 1
}
# nix-your-shell
eval "$(nix-your-shell zsh)"
# Ghostty
[[ "$TERM_PROGRAM" == "ghostty" ]] && source "/Applications/Ghostty.app/Contents/Resources/ghostty/shell-integration/zsh/ghostty-integration"