tidied programs/fish.nix

This commit is contained in:
serenity-F 2025-03-08 21:23:04 +10:00
parent 84c11be6f2
commit 794a9f33ed

View file

@ -1,68 +1,43 @@
{ self, inputs, outputs, lib, config, pkgs, ... }: { pkgs, ... }:
{ {
programs = { programs = {
starship = { starship = { enable = true; };
enable = true;
};
fish = { fish = {
enable = true; enable = true;
loginShellInit = '' loginShellInit = "";
'';
interactiveShellInit = '' interactiveShellInit = "";
'';
plugins = [ { plugins = [
{
name = "done"; name = "done";
src = pkgs.fishPlugins.done.src; src = pkgs.fishPlugins.done.src;
} { }
{
name = "puffer"; name = "puffer";
src = pkgs.fishPlugins.puffer.src; src = pkgs.fishPlugins.puffer.src;
} { }
{
name = "autopair"; name = "autopair";
src = pkgs.fishPlugins.autopair.src; src = pkgs.fishPlugins.autopair.src;
} ]; }
];
shellAbbrs = { shellAbbrs = {
b = "bat";
"1" = "prevd"; ## Nonspecific abbreviations
"2" = "prevd 2";
"3" = "prevd 3";
"4" = "prevd 4";
c = "cd";
cg = "cargo";
reload = "exec fish"; reload = "exec fish";
nv = "nvim"; nv = "nvim";
sshfix = "kitty +kitten ssh";
tree = "eza -TR --git-ignore";
up = "topgrade";
sasha = "curl fetch.sashanoraa.gay";
sc = "sudo systemctl"; sc = "sudo systemctl";
scs = "systemctl status"; trc = "tree -c";
scst = "sudo systemctl start";
scsp = "sudo systemctl stop";
scr = "sudo systemctl restart";
jr = "journalctl";
jre = "journalctl -e -u";
jrf = "journalctl -f -u";
nxp = "nix-shell --command fish -p";
nxs = "nix search nixpkgs";
# nxr = {
# expansion = "nix run nixpkgs#%";
# setCursor = true;
# };
# nxsh = {
# expansion = "nix shell nixpkgs#%";
# setCursor = true;
# };
## Git abbreviations
g = "git"; g = "git";
ga = "git add"; ga = "git add";
gaa = "git add --all"; gaa = "git add --all";
@ -70,7 +45,6 @@
gb = "git branch"; gb = "git branch";
gco = "git checkout"; gco = "git checkout";
gc = "git commit"; gc = "git commit";
gca = "git commit --amend";
gcl = "git clone"; gcl = "git clone";
gd = "git diff"; gd = "git diff";
gf = "git fetch"; gf = "git fetch";
@ -78,20 +52,12 @@
gm = "git merge"; gm = "git merge";
gp = "git push"; gp = "git push";
gpl = "git pull"; gpl = "git pull";
gpn = "git push -u origin (current_branch)";
gr = "git remote";
gra = "git remote add";
grao = "git remote add origin";
grb = "git rebase";
grbi = "git rebase -i";
gs = "git status -sb";
gsu = "git submodule";
gro = "git restore";
gsw = "git switch"; gsw = "git switch";
}; };
shellAliases = { shellAliases = {
git-master-to-main = "git branch -m master main && git push origin :master main:main"; git-master-to-main =
"git branch -m master main && git push origin :master main:main";
}; };
functions = { functions = {
@ -125,7 +91,6 @@
end end
''; '';
mommy = '' mommy = ''
set -g prev_status $status set -g prev_status $status