feat(emacs): remove vterm
This commit is contained in:
parent
56cd6332ae
commit
275cd01243
@ -7,7 +7,6 @@
|
||||
with lib; let
|
||||
emacsDefaultPackage = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (
|
||||
epkgs: [
|
||||
epkgs.vterm
|
||||
epkgs.mu4e
|
||||
epkgs.pdf-tools
|
||||
]
|
||||
|
@ -121,7 +121,7 @@ in {
|
||||
$down = t
|
||||
$menu = ${pkgs.wofi}/bin/wofi --show drun
|
||||
|
||||
bind = SUPER, Return, exec, kitty
|
||||
bind = SUPER, Return, exec, ${pkgs.kitty}/bin/kitty ${pkgs.tmux}/bin/tmux
|
||||
bind = SUPER, Space, submap, leader
|
||||
bind = , Print, submap, screenshot
|
||||
|
||||
|
@ -7,8 +7,8 @@ with lib; let
|
||||
cfg = config.modules.bash;
|
||||
in {
|
||||
options.modules.bash = {
|
||||
enable = lib.mkEnableOption "enables bash";
|
||||
aliases = lib.mkOption {
|
||||
enable = mkEnableOption "Enables bash";
|
||||
aliases = mkOption {
|
||||
type = types.attrsOf types.str;
|
||||
default = {};
|
||||
example = {
|
||||
@ -16,16 +16,23 @@ in {
|
||||
lns = "ln -si";
|
||||
};
|
||||
};
|
||||
bashrcExtra = lib.mkOption {
|
||||
eatIntegration = mkEnableOption "Enable Emacs Eat integration";
|
||||
bashrcExtra = mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
};
|
||||
};
|
||||
|
||||
config = lib.mkIf cfg.enable {
|
||||
config = mkIf cfg.enable {
|
||||
programs.bash = {
|
||||
enable = true;
|
||||
inherit (cfg) bashrcExtra;
|
||||
# inherit (cfg) bashrcExtra;
|
||||
bashrcExtra =
|
||||
concatLines
|
||||
[
|
||||
(strings.optionalString cfg.eatIntegration ''[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/bash"'')
|
||||
cfg.bashrcExtra
|
||||
];
|
||||
shellAliases = cfg.aliases;
|
||||
shellOptions = [
|
||||
"histappend"
|
||||
|
@ -72,7 +72,7 @@ in {
|
||||
];
|
||||
|
||||
options.modules.shell = {
|
||||
tmux.enable = mkEnableOption "Enables tmux";
|
||||
eatIntegration = mkEnableOption "Enable Emacs Eat integration in Bash or Zsh";
|
||||
enableBash = mkOption {
|
||||
type = types.bool;
|
||||
default = true;
|
||||
@ -92,6 +92,7 @@ in {
|
||||
enable = mkEnableOption "Enables the starship prompt.";
|
||||
jjIntegration = mkEnableOption "Enables Jujutsu integration in starship.";
|
||||
};
|
||||
tmux.enable = mkEnableOption "Enables tmux";
|
||||
zoxide = {
|
||||
enable = mkOption {
|
||||
type = types.bool;
|
||||
|
@ -17,6 +17,7 @@ in {
|
||||
lns = "ln -si";
|
||||
};
|
||||
};
|
||||
eatIntegration = mkEnableOption "Enable Emacs Eat integration";
|
||||
zshrcExtra = lib.mkOption {
|
||||
type = types.lines;
|
||||
default = "";
|
||||
@ -53,6 +54,7 @@ in {
|
||||
zstyle ':completion:*' menu no
|
||||
zstyle ':fzf-tab:complete:cd:*' fzf-preview '${pkgs.eza}/bin/eza $realpath'
|
||||
''
|
||||
(strings.optionalString cfg.eatIntegration ''[ -n "$EAT_SHELL_INTEGRATION_DIR" ] && source "$EAT_SHELL_INTEGRATION_DIR/zsh"'')
|
||||
cfg.zshrcExtra
|
||||
];
|
||||
oh-my-zsh = {
|
||||
|
@ -24,7 +24,6 @@
|
||||
config = let
|
||||
emacsPkg = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (
|
||||
epkgs: [
|
||||
epkgs.vterm
|
||||
epkgs.mu4e
|
||||
epkgs.pdf-tools
|
||||
]
|
||||
@ -49,7 +48,10 @@
|
||||
};
|
||||
|
||||
modules = {
|
||||
shell.starship.jjIntegration = true;
|
||||
shell = {
|
||||
eatIntegration = true;
|
||||
starship.jjIntegration = true;
|
||||
};
|
||||
bat.extras = true;
|
||||
packages.emacsPackage = emacsPkg;
|
||||
mopidy.enable = true;
|
||||
|
Loading…
x
Reference in New Issue
Block a user