diff --git a/home/desktop-full.nix b/home/desktop-full.nix index 0ee5bda..dfdf6bb 100644 --- a/home/desktop-full.nix +++ b/home/desktop-full.nix @@ -7,7 +7,7 @@ ./modules/messaging.nix ./modules/r.nix ./modules/tex.nix - ./modules/mail.nix + ./modules/mail ./modules/office-gui.nix ./modules/office-cli.nix ./modules/aichat.nix diff --git a/home/dotfiles/neomutt/config.neomuttrc b/home/dotfiles/neomutt/config.neomuttrc deleted file mode 100644 index f7408be..0000000 --- a/home/dotfiles/neomutt/config.neomuttrc +++ /dev/null @@ -1,43 +0,0 @@ -# External - -set my_download_folder = ~/tmp - -# Status bar - -set status_chars = "✔↻٪A" -unset help - -# Index - -set index_format = "%-25.25F %<[y?%<[7d?%<[d?%[ %H:%M]&%[%a %H:%M]>&%[%d.%m. %Hh]>&%[%d.%m.%Y]> %Z %?X?▼ &?%s" -set strict_threads -set send_charset = "utf-8:iso-8859-1:us-ascii" -set charset = "utf-8" - -# Pager view - -set pager_index_lines = 10 -set pager_context = 3 -set pager_stop -set smart_wrap -set menu_scroll -set tilde -unset markers -ignore * -unignore from: to: cc: bcc: date: subject: -unhdr_order * -hdr_order from: to: cc: bcc: date: subject: -alternative_order text/plain text/enriched text/html -auto_view text/html - -# Attachments - -set rfc2047_parameters -set attach_save_dir = $my_download_folder - -# Alias - -set alias_file = ~/.local/share/neomutt/aliases.neomuttrc -source $alias_file - -source colors.neomuttrc diff --git a/home/dotfiles/neomutt/bindings.neomuttrc b/home/modules/mail/bindings.neomuttrc similarity index 100% rename from home/dotfiles/neomutt/bindings.neomuttrc rename to home/modules/mail/bindings.neomuttrc diff --git a/home/dotfiles/neomutt/colors.neomuttrc b/home/modules/mail/config.neomuttrc similarity index 54% rename from home/dotfiles/neomutt/colors.neomuttrc rename to home/modules/mail/config.neomuttrc index afb98b1..392c634 100644 --- a/home/dotfiles/neomutt/colors.neomuttrc +++ b/home/modules/mail/config.neomuttrc @@ -1,11 +1,51 @@ +# Alias + +set alias_file = ~/.local/share/neomutt/aliases.neomuttrc +source $alias_file + +# External + +set my_download_folder = ~/tmp + +# Status bar + +set status_chars = "✔↻٪A" +unset help + +# Index + +set index_format = "%-25.25F %<[y?%<[7d?%<[d?%[ %H:%M]&%[%a %H:%M]>&%[%d.%m. %Hh]>&%[%d.%m.%Y]> %Z %?X?▼ &?%s" +set strict_threads +set send_charset = "utf-8:iso-8859-1:us-ascii" +set charset = "utf-8" + +# Pager view + +set pager_index_lines = 10 +set pager_context = 3 +set pager_stop +set smart_wrap +set menu_scroll +set tilde +unset markers +ignore * +unignore from: to: cc: bcc: date: subject: +unhdr_order * +hdr_order from: to: cc: bcc: date: subject: +alternative_order text/plain text/enriched text/html +auto_view text/html + +# Attachments + +set rfc2047_parameters +set attach_save_dir = $my_download_folder + # Colors -color status $my_primary_color default -color index $my_primary_color default '~N' - -# color indicator default foreground +color indicator white brightblack color index_flags brightmagenta default '.*' color index_date cyan default +color index brightgreen default '~N' color header brightblack default ".*" color header brightgreen default "^(Subject)" color header yellow default "^(From|To|CC|BCC)" diff --git a/home/modules/mail.nix b/home/modules/mail/default.nix similarity index 95% rename from home/modules/mail.nix rename to home/modules/mail/default.nix index ae349b3..3f73a72 100644 --- a/home/modules/mail.nix +++ b/home/modules/mail/default.nix @@ -12,7 +12,6 @@ let set nm_record_tags = "+sent -inbox -unread +${ accountName }"; set my_signature = ${ pkgs.writeText "signature.txt" config.accounts.email.accounts.${accountName}.signature.text } set status_format = "— [ %r ] $my_account %f (%lB) %>— %m messages%?n? [ %n new ]?%?d? [ %d to delete ]?%?t? [ %t tagged ]? —" - source colors.neomuttrc ''; makeAccount = accountName: { @@ -85,11 +84,11 @@ in ''; }; neomutt = { - extraConfig = '' - set my_primary_color=blue + extraConfig = makeConfig name + '' + color status blue default alternates ^tstraube@(em|rz)?.uni-frankfurt.de$ set smime_is_default - '' + makeConfig name; + ''; }; }; @@ -106,7 +105,6 @@ in neomutt = { extraConfig = makeConfig name + '' color status green default - set my_primary_color=green alternates @t9e.me$ @ktiu.net$ ^(tillkowski|till.straube)@gmail.com$ set reverse_name ''; @@ -128,7 +126,6 @@ in neomutt = { extraConfig = makeConfig name + '' color status red default - set my_primary_color=red ''; }; passwordCommand = "pass ksh/systemli"; @@ -262,11 +259,11 @@ in { key = "l"; map = [ "index" "pager" ]; action = "unset signature"; } ]; - extraConfig = builtins.readFile ../dotfiles/neomutt/config.neomuttrc; + extraConfig = builtins.readFile ./config.neomuttrc; }; - xdg.configFile."neomutt/colors.neomuttrc".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/home/dotfiles/neomutt/colors.neomuttrc"; - xdg.configFile."neomutt/bindings.neomuttrc".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/home/dotfiles/neomutt/bindings.neomuttrc"; + xdg.configFile."neomutt/bindings.neomuttrc".source = ./bindings.neomuttrc; + programs.neovim.plugins = with pkgs.vimPlugins; [ { plugin = vim-pathogen; diff --git a/home/modules/nvim/default.nix b/home/modules/nvim/default.nix index 9dbeba5..cdb8211 100644 --- a/home/modules/nvim/default.nix +++ b/home/modules/nvim/default.nix @@ -135,13 +135,6 @@ ''; } - { - plugin = catppuccin-nvim; - config = '' - colorscheme catppuccin-nvim - ''; - } - # { # plugin = papercolor-theme; # config = '' diff --git a/system/desktop/niri.nix b/system/desktop/niri.nix index f2e6623..025a474 100644 --- a/system/desktop/niri.nix +++ b/system/desktop/niri.nix @@ -2,11 +2,12 @@ { programs.niri.enable = true; - programs.dms-shell.enable = true; - services.gnome.gnome-keyring.enable = lib.mkForce false; - programs.nm-applet.enable = false; - # programs.firefox.preferences = { - # "widget.gtk.libadwaita-colors.enabled" = false; - # }; + programs.dms-shell.enable = true; + + services.gnome.gnome-keyring.enable = lib.mkForce false; + + programs.firefox.preferences = { + "widget.gtk.libadwaita-colors.enabled" = false; + }; }