diff --git a/home/config/nil/desktop.nix b/home/config/nil/desktop.nix index beda777..73782bb 100644 --- a/home/config/nil/desktop.nix +++ b/home/config/nil/desktop.nix @@ -4,11 +4,11 @@ let brightnessctl = lib.getExe pkgs.brightnessctl; dbus-update = pkgs.dbus + /bin/dbus-update-activation-environment; - fish = lib.getExe osConfig.programs.fish.package; fuzzel = lib.getExe config.programs.fuzzel.package; kitty = lib.getExe config.programs.kitty.package; loginctl = osConfig.systemd.package + /bin/loginctl; niri = lib.getExe config.programs.niri.package; + nushell = lib.getExe config.programs.nushell.package; playerctl = config.services.playerctld.package + /bin/playerctl; swaylock = lib.getExe config.programs.swaylock.package; systemctl = osConfig.systemd.package + /bin/systemctl; @@ -143,7 +143,7 @@ in lib.mkIf (osConfig.hardware.graphics.enable or false) { binds = with config.lib.niri.actions; { # Application spawning "Mod+Return".action = spawn [ kitty ]; - "Mod+Shift+Return".action = spawn [ kitty "--app-id" "private" fish "--private" ]; + "Mod+Shift+Return".action = spawn [ kitty "--app-id" "private" nushell "--no-history" ]; "Mod+E".action = spawn [ fuzzel ]; # Window & column focus diff --git a/home/config/nil/home.nix b/home/config/nil/home.nix index 6cc1c2c..8253129 100644 --- a/home/config/nil/home.nix +++ b/home/config/nil/home.nix @@ -138,41 +138,6 @@ in { programs.fd.enable = true; - programs.fish = { - enable = true; - functions = { - fish_prompt = '' - set -l user_colour 'green' - if fish_is_root_user - set user_colour 'red' - end - - echo -n -s (set_color $user_colour --bold) $USER@ (prompt_hostname) \ - (set_color blue --bold) ' ' (prompt_pwd) ' › ' (set_color normal) - ''; - - fish_right_prompt = '' - set -l st $status - - if test $st -ne 0 - set_color red --bold - printf "%s " (sysexit $st) - set_color normal - end - ''; - - fish_title = "prompt_pwd"; - - sysexit = builtins.readFile ./sysexit.fish; - }; - - interactiveShellInit = '' - if type -q tabs - tabs -4 - end - ''; - }; - programs.git = let key = "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAICczPHRwY9MAwDGlcB0QgMOJjcpLJhVU3covrW9RBS62AAAABHNzaDo="; in { diff --git a/home/config/nil/sysexit.fish b/home/config/nil/sysexit.fish deleted file mode 100644 index 03f94ac..0000000 --- a/home/config/nil/sysexit.fish +++ /dev/null @@ -1,104 +0,0 @@ -if status is-interactive - function sysexit - switch $argv[1] - case 0 - echo OK - case 64 - echo USAGE - case 65 - echo DATAERR - case 66 - echo NOINPUT - case 67 - echo NOUSER - case 68 - echo NOHOST - case 69 - echo UNAVAILABLE - case 70 - echo SOFTWARE - case 71 - echo OSERR - case 72 - echo OSFILE - case 73 - echo CANTCREAT - case 74 - echo IOERR - case 75 - echo TEMPFAIL - case 76 - echo PROTOCOL - case 77 - echo NOPERM - case 78 - echo CONFIG - case 127 - echo NOTFOUND - case 129 - echo SIGHUP - case 130 - echo SIGINT - case 131 - echo SIGQUIT - case 132 - echo SIGILL - case 133 - echo SIGTRAP - case 134 - echo SIGABRT - case 135 - echo SIGBUS - case 136 - echo SIGFPE - case 137 - echo SIGKILL - case 138 - echo SIGUSR1 - case 139 - echo SIGSEGV - case 140 - echo SIGUSR2 - case 141 - echo SIGPIPE - case 142 - echo SIGALRM - case 143 - echo SIGTERM - case 144 - echo SIGSTKFLT - case 145 - echo SIGCHLD - case 146 - echo SIGCONT - case 147 - echo SIGSTOP - case 148 - echo SIGTSTP - case 149 - echo SIGTTIN - case 150 - echo SIGTTOU - case 151 - echo SIGURG - case 152 - echo SIGXCPU - case 153 - echo SIGXFSZ - case 154 - echo SIGVTALRM - case 155 - echo SIGPROF - case 156 - echo SIGWINCH - case 157 - echo SIGIO - case 158 - echo SIGPWR - case 159 - echo SIGSYS - case '*' - echo $argv[1] - end - end -end