diff --git a/home/fish.nix b/home/fish.nix new file mode 100644 index 0000000..d73f448 --- /dev/null +++ b/home/fish.nix @@ -0,0 +1,59 @@ +{pkgs, ...}: { + programs.fish = { + enable = true; + plugins = [ + { + name = "colored-man-pages"; + src = pkgs.fetchFromGitHub { + owner = "PatrickF1"; + repo = "colored_man_pages.fish"; + rev = "f885c2507128b70d6c41b043070a8f399988bc7a"; + hash = "sha256-ii9gdBPlC1/P1N9xJzqomrkyDqIdTg+iCg0mwNVq2EU="; + }; + } + ]; + shellAliases = { + "vi" = "nvim"; + "vim" = "nvim"; + "t" = "tmux"; + "tl" = "tmux list-sessions"; + "ta" = "tmux new-session -A -s"; + "se" = "sudoedit"; + "s" = "sudo"; + "nrs" = "sudo nixos-rebuild switch --flake ."; + "nrt" = "sudo nixos-rebuild test --flake ."; + "hrs" = "home-manager switch --flake ."; + "g" = "git"; + "ga" = "git add"; + "gaa" = "git add --all"; + "gb" = "git branch"; + "gc" = "git commit --verbose"; + "gcmsg" = "git commit --message"; + "gd" = "git diff"; + "gdca" = "git diff --cached"; + "gds" = "git diff --staged"; + "gl" = "git log --stat"; + "glg" = "git log --graph"; + "glga" = "git log --graph --decorate --all"; + "glo" = "git log --oneline --decorate"; + "gp" = "git push"; + "gr" = "git remote"; + "gra" = "git remote add"; + "grv" = "git remote --verbose"; + "gs" = "git status --short"; + "gss" = "git status"; + }; + }; + + programs.fzf = { + enableFishIntegration = true; + }; + + programs.zoxide = { + enableFishIntegration = true; + }; + + programs.eza = { + enableFishIntegration = true; + }; +} diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index 0056a40..02f8838 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -6,6 +6,7 @@ imports = [ ./common.nix ../foot.nix + ../fish.nix ]; home = { username = "yt"; diff --git a/hosts/common.nix b/hosts/common.nix index bbd1718..e370dda 100644 --- a/hosts/common.nix +++ b/hosts/common.nix @@ -20,4 +20,13 @@ }; time.timeZone = "America/Toronto"; networking.firewall.logRefusedConnections = false; + + # this is true by default and mutually exclusive with + # programs.nix-index + programs.command-not-found.enable = false; + programs.nix-index = { + enable = true; + enableZshIntegration = true; + }; + } diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 61b162b..0639e6a 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -281,14 +281,6 @@ programs.nix-ld.enable = true; programs.evolution.enable = true; - # this is true by default and mutually exclusive with - # programs.nix-index - programs.command-not-found.enable = false; - programs.nix-index = { - enable = true; - enableZshIntegration = true; - }; - xdg.portal = { enable = true; wlr.enable = true;