diff --git a/home/features/cli/fish.nix b/home/features/cli/fish.nix index fceaee6..ba60550 100644 --- a/home/features/cli/fish.nix +++ b/home/features/cli/fish.nix @@ -17,7 +17,7 @@ in { set -x WEBKIT_DISABLE_COMPOSITING_MODE 1 set -x TERMINAL kitty set -x EDITOR nvim - set -x VISUAL zed + set -x VISUAL zeditor set -x XDG_DATA_HOME $HOME/.local/share set -x FZF_CTRL_R_OPTS " --preview='bat --color=always -n {}' diff --git a/home/features/cli/nushell.nix b/home/features/cli/nushell.nix index 40ac022..918486c 100644 --- a/home/features/cli/nushell.nix +++ b/home/features/cli/nushell.nix @@ -19,7 +19,7 @@ in { $env.WEBKIT_DISABLE_COMPOSITING_MODE = "1" $env.TERMINAL = "kitty" $env.EDITOR = "nvim" - $env.VISUAL = "zed" + $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-/:toggle-preview' --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" diff --git a/home/sascha.koenig/home.nix b/home/sascha.koenig/home.nix index 8b41ec2..9fe314f 100644 --- a/home/sascha.koenig/home.nix +++ b/home/sascha.koenig/home.nix @@ -54,6 +54,7 @@ extraConfig = { core.excludesfile = "~/.gitignore_global"; init.defaultBranch = "master"; + pull.rebase = false; }; }; diff --git a/secrets/librechat-env.age b/secrets/librechat-env.age index ffe84b7..078f15e 100644 Binary files a/secrets/librechat-env.age and b/secrets/librechat-env.age differ