From c62c8e46f3b03d3b96729dfa2b13b8a0ca641255 Mon Sep 17 00:00:00 2001 From: Till Date: Mon, 23 Mar 2026 14:31:58 +0100 Subject: [PATCH 1/2] getting there --- home/desktop-full.nix | 2 +- .../neomutt}/bindings.neomuttrc | 0 .../neomutt/colors.neomuttrc} | 44 +------------------ home/dotfiles/neomutt/config.neomuttrc | 43 ++++++++++++++++++ home/modules/{mail/default.nix => mail.nix} | 6 +-- home/modules/nvim/default.nix | 7 +++ 6 files changed, 55 insertions(+), 47 deletions(-) rename home/{modules/mail => dotfiles/neomutt}/bindings.neomuttrc (100%) rename home/{modules/mail/config.neomuttrc => dotfiles/neomutt/colors.neomuttrc} (56%) create mode 100644 home/dotfiles/neomutt/config.neomuttrc rename home/modules/{mail/default.nix => mail.nix} (96%) diff --git a/home/desktop-full.nix b/home/desktop-full.nix index dfdf6bb..0ee5bda 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 + ./modules/mail.nix ./modules/office-gui.nix ./modules/office-cli.nix ./modules/aichat.nix diff --git a/home/modules/mail/bindings.neomuttrc b/home/dotfiles/neomutt/bindings.neomuttrc similarity index 100% rename from home/modules/mail/bindings.neomuttrc rename to home/dotfiles/neomutt/bindings.neomuttrc diff --git a/home/modules/mail/config.neomuttrc b/home/dotfiles/neomutt/colors.neomuttrc similarity index 56% rename from home/modules/mail/config.neomuttrc rename to home/dotfiles/neomutt/colors.neomuttrc index 392c634..363f28f 100644 --- a/home/modules/mail/config.neomuttrc +++ b/home/dotfiles/neomutt/colors.neomuttrc @@ -1,48 +1,6 @@ -# 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 indicator white brightblack +color indicator default brightblack color index_flags brightmagenta default '.*' color index_date cyan default color index brightgreen default '~N' diff --git a/home/dotfiles/neomutt/config.neomuttrc b/home/dotfiles/neomutt/config.neomuttrc new file mode 100644 index 0000000..f7408be --- /dev/null +++ b/home/dotfiles/neomutt/config.neomuttrc @@ -0,0 +1,43 @@ +# 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/modules/mail/default.nix b/home/modules/mail.nix similarity index 96% rename from home/modules/mail/default.nix rename to home/modules/mail.nix index 3f73a72..6a5d423 100644 --- a/home/modules/mail/default.nix +++ b/home/modules/mail.nix @@ -259,11 +259,11 @@ in { key = "l"; map = [ "index" "pager" ]; action = "unset signature"; } ]; - extraConfig = builtins.readFile ./config.neomuttrc; + extraConfig = builtins.readFile ../dotfiles/neomutt/config.neomuttrc; }; - xdg.configFile."neomutt/bindings.neomuttrc".source = ./bindings.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"; programs.neovim.plugins = with pkgs.vimPlugins; [ { plugin = vim-pathogen; diff --git a/home/modules/nvim/default.nix b/home/modules/nvim/default.nix index cdb8211..9dbeba5 100644 --- a/home/modules/nvim/default.nix +++ b/home/modules/nvim/default.nix @@ -135,6 +135,13 @@ ''; } + { + plugin = catppuccin-nvim; + config = '' + colorscheme catppuccin-nvim + ''; + } + # { # plugin = papercolor-theme; # config = '' From d8032cc35d232ac0a275bb1c97d41f84ceefe83f Mon Sep 17 00:00:00 2001 From: Till Date: Mon, 23 Mar 2026 14:32:09 +0100 Subject: [PATCH 2/2] system stuff even --- home/dotfiles/neomutt/colors.neomuttrc | 6 ++++-- home/modules/mail.nix | 9 ++++++--- system/desktop/niri.nix | 9 ++++----- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/home/dotfiles/neomutt/colors.neomuttrc b/home/dotfiles/neomutt/colors.neomuttrc index 363f28f..afb98b1 100644 --- a/home/dotfiles/neomutt/colors.neomuttrc +++ b/home/dotfiles/neomutt/colors.neomuttrc @@ -1,9 +1,11 @@ # Colors -color indicator default brightblack +color status $my_primary_color default +color index $my_primary_color default '~N' + +# color indicator default foreground 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.nix index 6a5d423..ae349b3 100644 --- a/home/modules/mail.nix +++ b/home/modules/mail.nix @@ -12,6 +12,7 @@ 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: { @@ -84,11 +85,11 @@ in ''; }; neomutt = { - extraConfig = makeConfig name + '' - color status blue default + extraConfig = '' + set my_primary_color=blue alternates ^tstraube@(em|rz)?.uni-frankfurt.de$ set smime_is_default - ''; + '' + makeConfig name; }; }; @@ -105,6 +106,7 @@ 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 ''; @@ -126,6 +128,7 @@ in neomutt = { extraConfig = makeConfig name + '' color status red default + set my_primary_color=red ''; }; passwordCommand = "pass ksh/systemli"; diff --git a/system/desktop/niri.nix b/system/desktop/niri.nix index 025a474..f2e6623 100644 --- a/system/desktop/niri.nix +++ b/system/desktop/niri.nix @@ -2,12 +2,11 @@ { 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.firefox.preferences = { + # "widget.gtk.libadwaita-colors.enabled" = false; + # }; }