phundrak/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(emacs): remove vterm

Browse Source
This commit is contained in:
Lucien Cartier-Tilet 2025-05-25 22:41:23 +02:00
parent 56cd6332ae
commit 275cd01243
Signed by: phundrak
SSH Key Fingerprint: SHA256:CE0HPsbW3L2YiJETx1zYZ2muMptaAqTN2g3498KrMkc
6 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
users/modules/emacs.nix
View File

@ -7,7 +7,6 @@
with lib; let with lib; let
emacsDefaultPackage = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages ( emacsDefaultPackage = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (
epkgs: [ epkgs: [
epkgs.vterm
epkgs.mu4e epkgs.mu4e
epkgs.pdf-tools epkgs.pdf-tools
] ]

2
users/modules/hyprland.nix
View File

@ -121,7 +121,7 @@ in {
$down = t $down = t
$menu = ${pkgs.wofi}/bin/wofi --show drun $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 = SUPER, Space, submap, leader
bind = , Print, submap, screenshot bind = , Print, submap, screenshot

17
users/modules/shell/bash.nix
View File

@ -7,8 +7,8 @@ with lib; let
cfg = config.modules.bash; cfg = config.modules.bash;
in { in {
options.modules.bash = { options.modules.bash = {
enable = lib.mkEnableOption "enables bash"; enable = mkEnableOption "Enables bash";
aliases = lib.mkOption { aliases = mkOption {
type = types.attrsOf types.str; type = types.attrsOf types.str;
default = {}; default = {};
example = { example = {
@ -16,16 +16,23 @@ in {
lns = "ln -si"; lns = "ln -si";
}; };
}; };
bashrcExtra = lib.mkOption { eatIntegration = mkEnableOption "Enable Emacs Eat integration";
bashrcExtra = mkOption {
type = types.lines; type = types.lines;
default = ""; default = "";
}; };
}; };
config = lib.mkIf cfg.enable { config = mkIf cfg.enable {
programs.bash = { programs.bash = {
enable = true; 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; shellAliases = cfg.aliases;
shellOptions = [ shellOptions = [
"histappend" "histappend"

3
users/modules/shell/default.nix
View File

@ -72,7 +72,7 @@ in {
]; ];
options.modules.shell = { options.modules.shell = {
tmux.enable = mkEnableOption "Enables tmux"; eatIntegration = mkEnableOption "Enable Emacs Eat integration in Bash or Zsh";
enableBash = mkOption { enableBash = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;
@ -92,6 +92,7 @@ in {
enable = mkEnableOption "Enables the starship prompt."; enable = mkEnableOption "Enables the starship prompt.";
jjIntegration = mkEnableOption "Enables Jujutsu integration in starship."; jjIntegration = mkEnableOption "Enables Jujutsu integration in starship.";
}; };
tmux.enable = mkEnableOption "Enables tmux";
zoxide = { zoxide = {
enable = mkOption { enable = mkOption {
type = types.bool; type = types.bool;

2
users/modules/shell/zsh.nix
View File

@ -17,6 +17,7 @@ in {
lns = "ln -si"; lns = "ln -si";
}; };
}; };
eatIntegration = mkEnableOption "Enable Emacs Eat integration";
zshrcExtra = lib.mkOption { zshrcExtra = lib.mkOption {
type = types.lines; type = types.lines;
default = ""; default = "";
@ -53,6 +54,7 @@ in {
zstyle ':completion:*' menu no zstyle ':completion:*' menu no
zstyle ':fzf-tab:complete:cd:*' fzf-preview '${pkgs.eza}/bin/eza $realpath' 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 cfg.zshrcExtra
]; ];
oh-my-zsh = { oh-my-zsh = {

6
users/phundrak/home.nix
View File

@ -24,7 +24,6 @@
config = let config = let
emacsPkg = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages ( emacsPkg = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (
epkgs: [ epkgs: [
epkgs.vterm
epkgs.mu4e epkgs.mu4e
epkgs.pdf-tools epkgs.pdf-tools
] ]
@ -49,7 +48,10 @@
}; };
modules = { modules = {
shell.starship.jjIntegration = true; shell = {
eatIntegration = true;
starship.jjIntegration = true;
};
bat.extras = true; bat.extras = true;
packages.emacsPackage = emacsPkg; packages.emacsPackage = emacsPkg;
mopidy.enable = true; mopidy.enable = true;