From 9186f2cc28492fde9674d3f2bae5d7621e2154b4 Mon Sep 17 00:00:00 2001 From: biscuit Date: Wed, 21 May 2025 10:56:53 -0500 Subject: [PATCH] organized shellAliases --- info.nix | 9 ++++++++- pkgs/fish/biscuit.nix | 10 +++------- pkgs/zsh/biscuit.nix | 9 ++------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/info.nix b/info.nix index b1dad22..1ca97e4 100644 --- a/info.nix +++ b/info.nix @@ -6,6 +6,13 @@ # VPN vpnEnable = true; - # Unfree Softwares + # Unfree Softwares allowUnfree = true; + + shellAliases = { + ll = "ls -l"; + upd = "sudo nixos-rebuild switch --flake ~/Nixos/#biscuit"; + hupd = "home-manager switch --flake ~/Nixos/#biscuit"; + agu = "pkill gjs & ags run ~/Nixos/pkgs/ags/biscuit/app.ts &"; + }; } diff --git a/pkgs/fish/biscuit.nix b/pkgs/fish/biscuit.nix index 4301af2..b6feffc 100644 --- a/pkgs/fish/biscuit.nix +++ b/pkgs/fish/biscuit.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{pkgs, shellAliases, ...}: { programs.zoxide.enable = true; programs.fish = { enable = true; @@ -8,12 +8,8 @@ zoxide init fish | source ''; - shellAliases = { - ll = "ls -l"; - upd = "sudo nixos-rebuild switch --flake ~/Nixos/#biscuit"; - hupd = "home-manager switch --flake ~/Nixos/#biscuit"; - agu = "pkill gjs & ags run ~/Nixos/pkgs/ags/biscuit/app.ts &"; - }; + shellAliases = shellAliases; + plugins = with pkgs.fishPlugins; [ ]; }; diff --git a/pkgs/zsh/biscuit.nix b/pkgs/zsh/biscuit.nix index 295873b..a4f1d5b 100644 --- a/pkgs/zsh/biscuit.nix +++ b/pkgs/zsh/biscuit.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: { +{pkgs, shellAliases,...}: { home.packages = with pkgs; [ zoxide oh-my-posh @@ -28,12 +28,7 @@ ]; enableCompletion = true; syntaxHighlighting.enable = true; - shellAliases = { - ll = "ls -l"; - upd = "sudo nixos-rebuild switch --flake ~/Nixos/#biscuit"; - hupd = "home-manager switch --flake ~/Nixos/#biscuit"; - agu = "pkill gjs & ags run ~/Nixos/pkgs/ags/biscuit/app.ts &"; - }; + shellAliases = shellAliases; history.size = 10000; oh-my-zsh = { plugins = [];