From 71b81c3b98859e1b3a7fc3d47260ca0616396198 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sun, 3 Nov 2024 15:29:32 +0100 Subject: [PATCH] shell: cleanup --- modules/user/shell/config.fish | 2 +- modules/user/shell/default.nix | 6 +----- modules/user/shell/fishinit.nix | 2 +- modules/user/shell/packages.nix | 2 +- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/modules/user/shell/config.fish b/modules/user/shell/config.fish index c81fefa..37afd25 100644 --- a/modules/user/shell/config.fish +++ b/modules/user/shell/config.fish @@ -1 +1 @@ -set fish_greeting "" +set fish_greeting diff --git a/modules/user/shell/default.nix b/modules/user/shell/default.nix index fcd9021..56b92c3 100644 --- a/modules/user/shell/default.nix +++ b/modules/user/shell/default.nix @@ -1,9 +1,5 @@ # This shell setup was inspired by sioodmy. Check out his setup! -{ - inputs, - pkgs, - ... -}: let +{pkgs, ...}: let toml = pkgs.formats.toml {}; starship-config = import ./starship.nix; aliases = import ./aliases.nix {inherit pkgs;}; diff --git a/modules/user/shell/fishinit.nix b/modules/user/shell/fishinit.nix index caaee8b..d7d5fa3 100644 --- a/modules/user/shell/fishinit.nix +++ b/modules/user/shell/fishinit.nix @@ -8,7 +8,7 @@ pkgs.writeText "config.fish" '' ${pkgs.atuin}/bin/atuin init fish | source ${pkgs.zoxide}/bin/zoxide init fish | source ${pkgs.starship}/bin/starship init fish | source - + ${pkgs.direnv}/bin/direnv hook fish | source source ${./config.fish} diff --git a/modules/user/shell/packages.nix b/modules/user/shell/packages.nix index 238b02c..196ec3d 100644 --- a/modules/user/shell/packages.nix +++ b/modules/user/shell/packages.nix @@ -13,6 +13,7 @@ pkgs: (with pkgs; [ serpl diff-so-fancy tig + direnv sesh mprocs @@ -23,7 +24,6 @@ pkgs: (with pkgs; [ # mult glow - gdb # dua-cli dust kondo