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

home/dotfiles/neomutt/config.neomuttrc

@@ -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

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 indicator white brightblack
-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)"

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 = ''
+          extraConfig = makeConfig name + ''
-            set my_primary_color=blue
+            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 = "<enter-command>unset signature<enter><list-reply>"; }
     ];
 
-    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 = ./bindings.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; 

home/modules/nvim/default.nix

@@ -135,13 +135,6 @@
         '';
       }
 
-      {
-        plugin = catppuccin-nvim;
-        config = ''
-          colorscheme catppuccin-nvim
-        '';
-      }
-
       # {
       #   plugin = papercolor-theme;
       #   config = ''

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 = {
+  programs.dms-shell.enable = true;
-  #   "widget.gtk.libadwaita-colors.enabled" = false;
+
-  # };
+  services.gnome.gnome-keyring.enable = lib.mkForce false;
+
+  programs.firefox.preferences = {
+    "widget.gtk.libadwaita-colors.enabled" = false;
+  };
 }