M => +0 -2
@@ 6,8 6,6 @@
enable = true;
settings = {
main = {
shell = "elvish";
font = "FiraCode Nerd Font Mono:size=12";
pad = "10x10";
M modules/shell.nix => modules/shell.nix +0 -41
@@ 5,8 5,6 @@ Opinionated shell environment.
flake.modules.nixos.shell = {pkgs, ...}: {
environment.systemPackages = with pkgs; [
btop
- carapace
- elvish
fd
ripgrep
silicon
@@ 21,40 19,6 @@ Opinionated shell environment.
};
flake.modules.homeManager.shell = {...}: {
- home.file = {
- ".config/elvish/lib/direnv.elv" = {
- executable = true;
- text = ''
- ## Hook for direnv as of direnv 2.34.0
- set @edit:before-readline = $@edit:before-readline {
- try {
- var m = [("direnv" export elvish | from-json)]
- if (> (count $m) 0) {
- set m = (all $m)
- keys $m | each { |k|
- if $m[$k] {
- set-env $k $m[$k]
- } else {
- unset-env $k
- }
- }
- }
- } catch e {
- echo $e
- }
- }
- '';
- };
- ".config/elvish/rc.elv" = {
- executable = true;
- text = ''
- #!/usr/bin/env elvish
- use direnv
- eval (starship init elvish)
- eval (carapace _carapace|slurp)
- '';
- };
- };
programs.bash = {
enable = true;
bashrcExtra = ''
@@ 67,11 31,6 @@ Opinionated shell environment.
settings = {
add_newline = false;
scan_timeout = 10;
- shell = {
- disabled = false;
- bash_indicator = "bsh";
- elvish_indicator = "elv";
- };
};
};
};