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

feat(git): add helpful configs

Browse source
This commit is contained in:
Ryan Cao 2024-04-06 16:16:32 +08:00
parent 3ea99dd18a
commit 2eb3764b31
Signed by: ryanccn
SSH key fingerprint: SHA256:NtP/BlVhoQq4xU6BEcZeT8nIPvHntkJ3lIc2yB+F09E
10 changed files with 94 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

2
home/apps/ghostty.conf
View file

@ -8,12 +8,12 @@ adjust-cell-height = 50%
adjust-underline-position = 5
command = /run/current-system/sw/bin/fish -l
shell-integration = fish
shell-integration-features = cursor, sudo
macos-titlebar-tabs = true
macos-option-as-alt = true
window-step-resize = true
window-padding-x = 15
window-padding-y = 15

18
home/apps/vscode.nix
View file

@ -17,7 +17,7 @@
"denoland.vscode-deno"
"dprint.dprint"
"dotjoshjohnson.xml"
"eamodio.gitlens"
# "eamodio.gitlens"
"editorconfig.editorconfig"
# "enkia.tokyo-night"
"esbenp.prettier-vscode"
@ -46,6 +46,7 @@
"unifiedjs.vscode-mdx"
"usernamehw.errorlens"
"vue.volar"
"waderyan.gitblame"
"xaver.clang-format"
"yoavbls.pretty-ts-errors"
];
@ -54,8 +55,8 @@ in {
enable = true;
package = pkgs.stdenv.mkDerivation {
pname = "vscode";
version = "1.86.2";
src = pkgs.emptyDirectory;
version = "1.87.2";
dontUnpack = true;
installPhase = ''
mkdir -p $out
'';
@ -74,7 +75,7 @@ in {
"catppuccin.boldKeywords" = false;
"catppuccin.italicKeywords" = true;
"catppuccin.accentColor" = "sky";
"catppuccin.accentColor" = "sapphire";
"catppuccin.workbenchMode" = "flat";
"catppuccin.customUIColors" = {
"all" = {
@ -95,6 +96,9 @@ in {
"diffEditor.ignoreTrimWhitespace" = false;
"gitlens.showWelcomeOnInstall" = false;
"gitblame.inlineMessageEnabled" = true;
"gitblame.inlineMessageFormat" = "\${author.name} · \${time.ago} · \${commit.summary,120}";
"editor.fontFamily" = "\"Ryan Mono\", \"Symbols Nerd Font\", \"Apple Color Emoji\", monospace";
"editor.fontLigatures" = true;
# "editor.fontLigatures" = "'calt', 'ss01'";
@ -146,9 +150,9 @@ in {
"vscord.status.state.text.editing" = "Working on {file_name}{file_extension}";
"vscord.status.buttons.button1.enabled" = false;
"gitlens.defaultTimeFormat" = "HH=mm";
"gitlens.defaultDateShortFormat" = "YYYY/MM/DD";
"gitlens.defaultDateFormat" = null;
# "gitlens.defaultTimeFormat" = "HH=mm";
# "gitlens.defaultDateShortFormat" = "YYYY/MM/DD";
# "gitlens.defaultDateFormat" = null;
"[python]"."editor.tabSize" = 4;
"[python]"."editor.defaultFormatter" = "charliermarsh.ruff";

2
home/fonts.nix
View file

@ -4,10 +4,8 @@
public-sans
ibm-plex
monaspace
ryan-mono-bin
ryan-term-bin
commit-mono
(nerdfonts.override {
fonts = [
"CascadiaCode"

1
home/programs/eza.nix
View file

@ -1,7 +1,6 @@
_: {
programs.eza = {
enable = true;
enableAliases = true;
icons = true;
extraOptions = ["--all"];
};

9
home/programs/git.nix
View file

@ -1,7 +1,6 @@
_: {
programs.git = {
enable = true;
difftastic.enable = true;
ignores = [
@ -20,6 +19,14 @@ _: {
gpg.format = "ssh";
"gpg \"ssh\"".program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign";
log.date = "iso";
merge.conflictstyle = "zdiff3";
diff.algorithm = "histogram";
transfer.fsckobjects = true;
fetch.fsckobjects = true;
receive.fsckObjects = true;
push.autoSetupRemote = true;
};
};

4
home/programs/zsh.nix
View file

@ -7,11 +7,11 @@
in {
programs.zsh = {
enable = true;
enableAutosuggestions = true;
enableCompletion = true;
dotDir = ".config/zsh";
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
enableCompletion = true;
envExtra = builtins.readFile ./zsh/envExtra.zsh;
# initExtraBeforeCompInit = builtins.readFile ./zsh/initExtraBeforeCompInit.zsh;