thegeneralist01/config
1
Fork 0
mirror of https://github.com/thegeneralist01/config.git synced 2026-05-30 08:37:01 +02:00
Code Issues Activity

Compare commits

base: thegeneralist01:0505ec375b045e17cdc5f9c744303b01a82d593a
Branches Tags
thegeneralist01:master
..
compare: thegeneralist01:65ad4a6d6bd14bfbafe2091d6b3471cc788577b4
Branches Tags
thegeneralist01:master

No commits in common. "0505ec375b045e17cdc5f9c744303b01a82d593a" and "65ad4a6d6bd14bfbafe2091d6b3471cc788577b4" have entirely different histories.
0505ec375b ... 65ad4a6d6b

2 changed files with 39 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/common/shell/0_nushell.nu
View file

@ -219,10 +219,6 @@ do --env {
if ($env.IN_NIX_SHELL? | is-not-empty) { if ($env.IN_NIX_SHELL? | is-not-empty) {
$suffix ++= [ $"(ansi light_blue_bold)nix" ] $suffix ++= [ $"(ansi light_blue_bold)nix" ]
} }
# .VENV
if ($env.VIRTUAL_ENV? | is-not-empty) {
$suffix ++= [ $"(ansi light_green_bold)($env.VIRTUAL_ENV_PROMPT)" ]
}
$suffix | each { $'(ansi light_yellow_bold)•(ansi reset) ($in)(ansi reset)' } | str join " " $suffix | each { $'(ansi light_yellow_bold)•(ansi reset) ($in)(ansi reset)' } | str join " "
} }
@ -230,7 +226,6 @@ do --env {
([ $prefix, $body, $suffix ] | str join " ") + (char newline) ([ $prefix, $body, $suffix ] | str join " ") + (char newline)
} }
$env.VIRTUAL_ENV_DISABLE_PROMPT = true
$env.PROMPT_INDICATOR = $"(ansi light_yellow_bold)┃(ansi reset) " $env.PROMPT_INDICATOR = $"(ansi light_yellow_bold)┃(ansi reset) "
$env.PROMPT_INDICATOR_VI_NORMAL = $env.PROMPT_INDICATOR $env.PROMPT_INDICATOR_VI_NORMAL = $env.PROMPT_INDICATOR
$env.PROMPT_INDICATOR_VI_INSERT = $env.PROMPT_INDICATOR $env.PROMPT_INDICATOR_VI_INSERT = $env.PROMPT_INDICATOR

85
modules/common/shell/zoxide.nix
View file

@ -1,54 +1,47 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }: let
let
inherit (lib) getExe; inherit (lib) getExe;
zoxide = getExe pkgs.zoxide; zoxide = getExe pkgs.zoxide;
in in {
{ home-manager.sharedModules = [{
home-manager.sharedModules = [ programs.zoxide = {
{ enable = true;
programs.zoxide = { options = [ "--cmd cd" ];
enable = true; enableNushellIntegration = false;
options = [ "--cmd cd" ]; };
enableNushellIntegration = false;
};
programs.nushell.extraConfig = # nu programs.nushell.extraConfig = /* nu */ ''
'' # Zoxide integration with full path
# Zoxide integration with full path $env.config = ($env.config? | default {})
$env.config = ($env.config? | default {}) $env.config.hooks = ($env.config.hooks? | default {})
$env.config.hooks = ($env.config.hooks? | default {}) $env.config.hooks.env_change = ($env.config.hooks.env_change? | default {})
$env.config.hooks.env_change = ($env.config.hooks.env_change? | default {}) $env.config.hooks.env_change.PWD = ($env.config.hooks.env_change.PWD? | default [])
$env.config.hooks.env_change.PWD = ($env.config.hooks.env_change.PWD? | default [])
let __zoxide_hooked = ($env.config.hooks.env_change.PWD | any { try { get __zoxide_hook } catch { false } }) let __zoxide_hooked = ($env.config.hooks.env_change.PWD | any { try { get __zoxide_hook } catch { false } })
if not $__zoxide_hooked { if not $__zoxide_hooked {
$env.config.hooks.env_change.PWD = ($env.config.hooks.env_change.PWD | append { $env.config.hooks.env_change.PWD = ($env.config.hooks.env_change.PWD | append {
__zoxide_hook: true, __zoxide_hook: true,
code: {|_, dir| ${zoxide} add -- $dir} code: {|_, dir| ${zoxide} add -- $dir}
}) })
} }
def --env __zoxide_z [...rest: string] { def --env __zoxide_z [...rest: string] {
let path = if ($rest | length) == 0 { let path = if ($rest | length) == 0 {
$env.HOME $env.HOME
} else if ($rest | length) == 1 and ($rest.0 == "-") { } else if ($rest | length) == 1 and ($rest.0 == "-") {
$env.OLDPWD $env.OLDPWD
} else if ($rest | length) == 1 and (($rest.0 | path expand) | path exists) { } else {
$rest.0 ${zoxide} query --exclude (pwd) -- ...$rest | str trim -r -c (char newline)
} else { }
${zoxide} query --exclude (pwd) -- ...$rest | str trim -r -c (char newline) cd $path
} }
cd $path
}
def --env __zoxide_zi [...rest: string] { def --env __zoxide_zi [...rest: string] {
let path = ${zoxide} query --interactive -- ...$rest | str trim -r -c (char newline) let path = ${zoxide} query --interactive -- ...$rest | str trim -r -c (char newline)
cd $path cd $path
} }
alias cd = __zoxide_z alias cd = __zoxide_z
alias cdi = __zoxide_zi alias cdi = __zoxide_zi
''; '';
} }];
];
} }