Disable emacs daemon

Set custom mu4e modeline icons because it was annoying me

Update keybinds, all workspaces now have a "default" program so to speak
with associated keybind to launch
This commit is contained in:
Evie Litherland-Smith 2023-10-10 16:02:01 +01:00
parent a8c72b6761
commit 46371470ee
5 changed files with 15 additions and 42 deletions

View file

@ -125,7 +125,7 @@
}; };
line_break.disabled = false; line_break.disabled = false;
git_branch = { git_branch = {
symbol = "󰘬"; symbol = "";
only_attached = true; only_attached = true;
ignore_branches = [ "master" "main" ]; ignore_branches = [ "master" "main" ];
}; };

View file

@ -14,13 +14,6 @@ in {
enable = true; enable = true;
package = pkgs.emacs29-pgtk; package = pkgs.emacs29-pgtk;
}; };
services.emacs = {
enable = true;
package = config.programs.emacs.package;
defaultEditor = true;
client.enable = true;
socketActivation.enable = true;
};
home = { home = {
inherit sessionVariables; inherit sessionVariables;
sessionPath = [ "$HOME/.config/emacs/bin" "$HOME/.emacs.d/bin" ]; sessionPath = [ "$HOME/.config/emacs/bin" "$HOME/.emacs.d/bin" ];

View file

@ -15,14 +15,6 @@
doom-font (font-spec :family "FiraCode Nerd Font" :size 16 :weight 'regular) doom-font (font-spec :family "FiraCode Nerd Font" :size 16 :weight 'regular)
doom-theme 'catppuccin doom-theme 'catppuccin
doom-emoji-fallback-font-families '("Noto Color Emoji") doom-emoji-fallback-font-families '("Noto Color Emoji")
doom-symbol-fallback-font-families '("FiraCode Nerd Font"
"FontAwesome"
"Weather Icons"
"Material Icons"
"Material Design Icons"
"Material Symbols Rounded"
"Material Symbols Sharp"
"Material Symbols Outlined")
catppuccin-flavor 'macchiato catppuccin-flavor 'macchiato
display-line-numbers-type 'relative display-line-numbers-type 'relative
org-directory "~/Notes/" org-directory "~/Notes/"
@ -54,7 +46,7 @@
mu4e-sent-messages-behavior 'delete mu4e-sent-messages-behavior 'delete
mu4e-attachment-dir "~/Downloads" mu4e-attachment-dir "~/Downloads"
mu4e-change-filenames-when-moving t mu4e-change-filenames-when-moving t
mu4e-alert-modeline-formatter 'mu4e-alert-default-mode-line-formatter ;; mu4e-alert-modeline-formatter 'mu4e-alert-default-mode-line-formatter
sendmail-program (executable-find "msmtp") sendmail-program (executable-find "msmtp")
send-mail-function #'smtpmail-send-it send-mail-function #'smtpmail-send-it
message-sendmail-f-is-evil t message-sendmail-f-is-evil t
@ -64,6 +56,11 @@
(:maildir "/iCloud/Inbox/" :key ?i) (:maildir "/iCloud/Inbox/" :key ?i)
(:maildir "/UKAEA/Inbox/" :key ?u))) (:maildir "/UKAEA/Inbox/" :key ?u)))
(setq mu4e-modeline-all-read '("R:" . "󰪱 ")
mu4e-modeline-all-clear '("C:" . "󰪱 ")
mu4e-modeline-new-items '("N:" . "󱃚 ")
mu4e-modeline-unread-items '("U:" . "󰛏 "))
;; Add accounts with contexts ;; Add accounts with contexts
(set-email-account! "proton.me" (set-email-account! "proton.me"
'((user-mail-address . "e.litherlandsmith@proton.me") '((user-mail-address . "e.litherlandsmith@proton.me")

View file

@ -114,18 +114,19 @@ in ''
bind = SUPER, X, exec, swaync-client -t bind = SUPER, X, exec, swaync-client -t
# Common program shortcuts # Common program shortcuts
bind = SUPER, E, exec, emacsclient -c
bind = SUPER, Space, exec, pkill anyrun || anyrun bind = SUPER, Space, exec, pkill anyrun || anyrun
bind = SUPER, Return, exec, alacritty bind = SUPER, Return, exec, alacritty
bind = SUPER SHIFT, Return, exec, [float] alacritty bind = SUPER SHIFT, Return, exec, [float] alacritty
bind = SUPER ALT, T, exec, [workspace 1] alacritty bind = SUPER ALT, T, exec, [workspace 1] alacritty
bind = SUPER ALT, D, exec, [workspace 2] emacs
bind = SUPER ALT, W, exec, [workspace 3] firefox bind = SUPER ALT, W, exec, [workspace 3] firefox
bind = SUPER ALT, A, exec, [workspace 4] alacritty -e khal interactive bind = SUPER ALT, A, exec, [workspace 4] alacritty -e khal interactive
bind = SUPER ALT, F, exec, [workspace 5] alacritty -e mc bind = SUPER ALT, F, exec, [workspace 5] alacritty -e mc
bind = SUPER ALT, S, exec, [workspace 6] alacritty -e ncspot bind = SUPER ALT, S, exec, [workspace 6] alacritty -e ncspot
bind = SUPER ALT, C, exec, [workspace 7] ferdium bind = SUPER ALT, C, exec, [workspace 7] ferdium
bind = SUPER ALT, R, exec, [workspace 8] remmina bind = SUPER ALT, R, exec, [workspace 8] remmina
bind = SUPER ALT, G, exec, [workspace 9] steam
# Misc useful binds # Misc useful binds
bind=,Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)" bind=,Print,exec,${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp)"
@ -205,6 +206,7 @@ in ''
bind = SUPER, D, moveworkspacetomonitor, 2 current bind = SUPER, D, moveworkspacetomonitor, 2 current
bind = SUPER, D, workspace, 2 bind = SUPER, D, workspace, 2
bind = SUPER SHIFT, D, movetoworkspace, 2 bind = SUPER SHIFT, D, movetoworkspace, 2
windowrule = workspace 2,(emacs)
# 3: [b]rowser # 3: [b]rowser
bind = SUPER, W, moveworkspacetomonitor, 3 current bind = SUPER, W, moveworkspacetomonitor, 3 current

View file

@ -47,14 +47,7 @@
}; };
}; };
homeManagerIntegration.followSystem = true; homeManagerIntegration.followSystem = true;
targets = { targets.chromium.enable = true;
chromium.enable = true;
# console.enable = true;
# grub = {
# enable = true;
# useImage = true;
# };
};
}; };
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs; [
@ -64,27 +57,15 @@
(nerdfonts.override { fonts = [ "FiraCode" ]; }) (nerdfonts.override { fonts = [ "FiraCode" ]; })
dejavu_fonts dejavu_fonts
noto-fonts-emoji noto-fonts-emoji
font-awesome
material-symbols
material-design-icons
weather-icons
vscode-extensions.file-icons.file-icons
emacs-all-the-icons-fonts emacs-all-the-icons-fonts
]; ];
fontconfig = { fontconfig = {
enable = true; enable = true;
defaultFonts = let defaultFonts = rec {
icons = [ sansSerif = [ "Fira Sans" "DejaVu Sans" ];
"FontAwesome"
"Material Icons"
"Material Design Icons"
"Weather Icons"
];
in rec {
sansSerif = [ "Fira Sans" "DejaVu Sans" ] ++ icons;
serif = sansSerif; serif = sansSerif;
monospace = [ "Fira Mono" "DejaVu Sans Mono" ] ++ icons; monospace = [ "Fira Mono" "DejaVu Sans Mono" ];
emoji = [ "Noto Color Emoji" ] ++ icons; emoji = [ "Noto Color Emoji" ];
}; };
}; };
}; };