From fa8c2126f81a5057df336fa4488614a203f47a5b Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sun, 22 Sep 2024 11:47:34 +0100 Subject: [PATCH] Move shellAliases definition from scripts -> shell --- system/home/scripts/default.nix | 18 ++++++------------ system/home/shell/default.nix | 16 +++++++++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/system/home/scripts/default.nix b/system/home/scripts/default.nix index c13782e8..84778911 100644 --- a/system/home/scripts/default.nix +++ b/system/home/scripts/default.nix @@ -1,15 +1,9 @@ { pkgs, ... }: { - home = { - packages = [ - (pkgs.writeShellScriptBin "esync" (builtins.readFile ./shell/esync.sh)) - (pkgs.writeShellScriptBin "gsync" (builtins.readFile ./shell/gsync.sh)) - (pkgs.writeShellScriptBin "rsync-local-config" (builtins.readFile ./shell/rsync-local-config.sh)) - (pkgs.writeShellScriptBin "xdg-query-program" (builtins.readFile ./shell/xdg-query-program.sh)) - ]; - shellAliases = { - protonup = "sudo wg-quick up protonvpn && sudo wg"; - protondown = "sudo wg-quick down protonvpn"; - }; - }; + home.packages = [ + (pkgs.writeShellScriptBin "esync" (builtins.readFile ./shell/esync.sh)) + (pkgs.writeShellScriptBin "gsync" (builtins.readFile ./shell/gsync.sh)) + (pkgs.writeShellScriptBin "rsync-local-config" (builtins.readFile ./shell/rsync-local-config.sh)) + (pkgs.writeShellScriptBin "xdg-query-program" (builtins.readFile ./shell/xdg-query-program.sh)) + ]; } diff --git a/system/home/shell/default.nix b/system/home/shell/default.nix index 344c4bfe..c24f09fb 100644 --- a/system/home/shell/default.nix +++ b/system/home/shell/default.nix @@ -10,11 +10,17 @@ ./ssh.nix ./starship.nix ]; - home.packages = with pkgs; [ - rclone - git-sync - du-dust - ]; + home = { + packages = with pkgs; [ + rclone + git-sync + du-dust + ]; + shellAliases = { + protonup = "sudo wg-quick up protonvpn && sudo wg"; + protondown = "sudo wg-quick down protonvpn"; + }; + }; programs = { bash.enable = true; carapace.enable = true;