From 958423bd478cffe8f866ca337ceac4188aa76c0e Mon Sep 17 00:00:00 2001 From: Tomuus Date: Fri, 23 Jan 2026 18:45:10 +0100 Subject: Moved shell config to match shell name --- common/fish.nix | 28 ++++++++++++++++++++++++++++ common/hm.nix | 2 +- common/zsh.nix | 29 ----------------------------- 3 files changed, 29 insertions(+), 30 deletions(-) create mode 100644 common/fish.nix delete mode 100644 common/zsh.nix diff --git a/common/fish.nix b/common/fish.nix new file mode 100644 index 0000000..af2ca6f --- /dev/null +++ b/common/fish.nix @@ -0,0 +1,28 @@ +#Zsh configuration (imported in ./hm.nix) + +{ ... }: + +{ + programs.fish = { + enable = true; + shellAliases = { + ll = "ls -l"; + gs = "git status"; + nxrs = "sudo nixos-rebuild switch --flake ."; + nivm = "nvim"; + nimv = "nvim"; #wonder why these 2 exits + neofetch = "fastfetch"; + ga = "git add"; + gc = "git commit"; + gr = "git restore"; + ndw = "sudo nmcli device wifi"; #Nah terminal is all you need for wifi and bt + gti = "git"; #Typo final boss + }; + shellInit = '' + shuf -n 1 ~/.tips | cowsay + oh-my-posh init fish -c ~/.config/omp/catppuccin_mocha.json | source + ''; + }; + + home.file.".tips".source = ./tips; +} diff --git a/common/hm.nix b/common/hm.nix index f0c5379..fc044c6 100644 --- a/common/hm.nix +++ b/common/hm.nix @@ -5,7 +5,7 @@ { imports = [ - ./zsh.nix + ./fish.nix ]; home.username = userName; diff --git a/common/zsh.nix b/common/zsh.nix deleted file mode 100644 index 5021ce1..0000000 --- a/common/zsh.nix +++ /dev/null @@ -1,29 +0,0 @@ -#zsh.nix -#Zsh configuration - -{ ... }: - -{ - programs.fish = { - enable = true; - shellAliases = { - ll = "ls -l"; - gs = "git status"; - nxrs = "sudo nixos-rebuild switch --flake ."; - nivm = "nvim"; - nimv = "nvim"; #wonder why these 2 exits - neofetch = "fastfetch"; - ga = "git add"; - gc = "git commit"; - gr = "git restore"; - ndw = "sudo nmcli device wifi"; #Nah terminal is all you need for wifi and bt - gti = "git"; #Typo final boss - }; - shellInit = '' - shuf -n 1 ~/.tips | cowsay - oh-my-posh init fish -c ~/.config/omp/catppuccin_mocha.json | source - ''; - }; - - home.file.".tips".source = ./tips; -} -- cgit v1.3