From cbe5a55937005c6b9f44266cafcdaaae63a60295 Mon Sep 17 00:00:00 2001 From: m3tm3re Date: Sat, 9 May 2026 09:18:23 +0200 Subject: [PATCH] fix: git default branch, cargo path nushell --- profiles/base/shell/nushell.nix | 50 ++++++++++++++++--------------- profiles/sets/coding/core/git.nix | 2 +- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/profiles/base/shell/nushell.nix b/profiles/base/shell/nushell.nix index fccb7f0..152c122 100644 --- a/profiles/base/shell/nushell.nix +++ b/profiles/base/shell/nushell.nix @@ -14,31 +14,33 @@ in { programs.nushell = { enable = true; envFile.text = '' - $env.config.show_banner = false - $env.NIX_PATH = "nixpkgs=channel:nixos-unstable" - $env.NIX_LOG = "iunfo" - $env.WEBKIT_DISABLE_COMPOSITING_MODE = "1" - $env.TERMINAL = "ghostty" - $env.EDITOR = "nvim" - $env.VISUAL = "zeditor" - $env.FZF_DEFAULT_COMMAND = "fd --type f --exclude .git --follow --hidden" - $env.FZF_DEFAULT_OPTS = "--preview='bat --color=always -n {}' --bind 'ctrl-/:toggle-preview' --header 'Press CTRL-Y to copy command into clipboard' --bind 'ctrl-y:execute-silent(echo -n {2..} | wl-copy)+abort' --color bg:#282a36,bg+:#44475a,fg:#f8f8f2,fg+:#f8f8f2,header:#6272a4,hl:#bd93f9,hl+:#bd93f9,info:#ffb86c,marker:#ff79c6,pointer:#ff79c6,prompt:#50fa7b,spinner:#ffb86c" - $env.XDG_DATA_HOME = $"($env.HOME)/.local/share" - $env.SSH_AUTH_SOCK = "/run/user/1000/gnupg/S.gpg-agent.ssh" - $env.PATH = ($env.PATH | split row (char esep) | append $"($env.HOME)/.cache/.bun/bin" | append $"($env.HOME)/.npm-global/bin" | uniq) - $env.NPM_CONFIG_PREFIX = $"($env.HOME)/.npm-global" - $env.FLAKE = $"($env.HOME)/p/NIX/nixos-config" + $env.config.show_banner = false + $env.NIX_PATH = "nixpkgs=channel:nixos-unstable" + $env.NIX_LOG = "iunfo" + $env.WEBKIT_DISABLE_COMPOSITING_MODE = "1" + $env.TERMINAL = "ghostty" + $env.EDITOR = "nvim" + $env.VISUAL = "zeditor" + $env.FZF_DEFAULT_COMMAND = "fd --type f --exclude .git --follow --hidden" + $env.FZF_DEFAULT_OPTS = "--preview='bat --color=always -n {}' --bind 'ctrl-/:toggle-preview' --header 'Press CTRL-Y to copy command into clipboard' --bind 'ctrl-y:execute-silent(echo -n {2..} | wl-copy)+abort' --color bg:#282a36,bg+:#44475a,fg:#f8f8f2,fg+:#f8f8f2,header:#6272a4,hl:#bd93f9,hl+:#bd93f9,info:#ffb86c,marker:#ff79c6,pointer:#ff79c6,prompt:#50fa7b,spinner:#ffb86c" + $env.XDG_DATA_HOME = $"($env.HOME)/.local/share" + $env.SSH_AUTH_SOCK = "/run/user/1000/gnupg/S.gpg-agent.ssh" + $env.PATH = ($env.PATH | split row (char esep) | append $"($env.HOME)/.cargo/bin" | append $"($env.HOME)/.cache/.bun/bin" + | append $"($env.HOME)/.npm-global/bin" | uniq) + $env.CARGO_HOME = $"($env.HOME)/.cargo" + $env.NPM_CONFIG_PREFIX = $"($env.HOME)/.npm-global" + $env.FLAKE = $"($env.HOME)/p/NIX/nixos-config" - # Load kestractl-env from agenix - if ("/run/agenix/kestractl-env" | path exists) { - open /run/agenix/kestractl-env - | lines - | where {($in | str trim | str length) > 0} - | parse "{key}={value}" - | update value {str trim -c '"'} - | transpose -r -d - | load-env - } + # Load kestractl-env from agenix + if ("/run/agenix/kestractl-env" | path exists) { + open /run/agenix/kestractl-env + | lines + | where {($in | str trim | str length) > 0} + | parse "{key}={value}" + | update value {str trim -c '"'} + | transpose -r -d + | load-env + } ''; configFile.text = '' diff --git a/profiles/sets/coding/core/git.nix b/profiles/sets/coding/core/git.nix index 33a92a2..59cbb0b 100644 --- a/profiles/sets/coding/core/git.nix +++ b/profiles/sets/coding/core/git.nix @@ -15,7 +15,7 @@ with lib; { email = lib.mkDefault "p@m3ta.dev"; }; core.excludesfile = "~/.gitignore_global"; - init.defaultBranch = "main"; + init.defaultBranch = "master"; # --- Diff-Config --- # Use difftastic as default external diff tool