.gitignore

@@ -1,5 +1,8 @@
 entropy/mail/.mbsyncrc
 entropy/mail/.msmtprc
+entropy/mail/neomutt/signature.txt
+entropy/mail/neomutt/notmuch-hook.sh
+entropy/mail/neomutt/whoami.muttrc
 entropy/vpn/credentials.txt
 entropy/vpn/openconnect.txt
 

.gitmodules

@@ -13,6 +13,3 @@
 [submodule "tycho/mail/neomutt/themes"]
 	path = tycho/mail/neomutt/themes
 	url = git@github.com:sheoak/neomutt-powerline-nerdfonts.git
-[submodule "entropy/mail/neomutt/mailsettings"]
-	path = entropy/mail/neomutt/mailsettings
-	url = git@code.dummyco.de:feliix42/mailsettings.git

entropy/.bashrc

@@ -1,4 +0,0 @@
-if command -v fzf-share >/dev/null; then
-  source "$(fzf-share)/key-bindings.bash"
-  source "$(fzf-share)/completion.bash"
-fi

entropy/fish/fish_user_key_bindings.fish

@@ -1,7 +0,0 @@
-function fish_user_key_bindings
-  if command -s fzf-share >/dev/null
-    source (fzf-share)/key-bindings.fish
-  end
-
-  fzf_key_bindings
-end

entropy/initialize.sh

@@ -97,11 +97,8 @@ ln -s $PWD/.urlview ~/.urlview
 ln -s $PWD/.tmux.conf ~/.tmux.conf
 ln -s $PWD/.gitconfig ~/.gitconfig
 ln -s $PWD/git-commit-template.txt ~/.gitcommit_template
-ln -s $PWD/.bashrc ~/.bashrc
 mkdir -p ~/.config/fish/
-ln -s $PWD/fish/config.fish ~/.config/fish/config.fish
-mkdir -p ~/.config/fish/functions
-ln -s $PWD/fish/fish_user_key_bindings.fish ~/.config/fish/functions/fish_user_key_bindings.fish
+ln -s $PWD/config.fish ~/.config/fish/config.fish
 ## i3 things
 ln -s $PWD/i3 ~/.config/i3
 ln -s $PWD/i3status-rust ~/.config/i3status-rust

entropy/mail/neomutt/accounts/tudresden.muttrc

@@ -12,7 +12,7 @@ set record              = =Sent
 # NOTE: disabled for notmuch
 # mailboxes "=Inbox" "=Trash" "=Sent" "=Drafts" 
 
-macro index \CS "<shell-escape>mbsync -a; ~/.config/neomutt/notmuch-hook.sh<enter>"
+macro index \CS "<shell-escape>mbsync tu-dresden<enter>"
 
 set signature           = "~/.config/neomutt/signature.txt"
 

entropy/mail/neomutt/mailsettings

@@ -1 +0,0 @@
-Subproject commit 03d0a78203b5aa87c49ee84274cd90f45b767345

entropy/mail/neomutt/neomuttrc

@@ -11,26 +11,12 @@ set virtual_spoolfile
 ## Notmuch configuration
 set nm_default_uri = "notmuch:///home/felix/.mail"
 virtual-mailboxes "Combined Inbox" "notmuch://?query=tag:inbox"
-virtual-mailboxes "Inbox (Unread)" "notmuch://?query=tag:inbox and tag:unread"
-virtual-mailboxes "EVEREST" "notmuch://?query=tag:everest"
-virtual-mailboxes "Reactors" "notmuch://?query=tag:lingua-franca"
-virtual-mailboxes "Reading Suggestions" "notmuch://?query=tag:reading"
-virtual-mailboxes "Admin" "notmuch://?query=tag:admin"
-virtual-mailboxes "Archive" "notmuch://?query=tag:archive"
 virtual-mailboxes "All Unread Messages" "notmuch://?query=tag:unread"
-virtual-mailboxes "Spam" "notmuch://?query=tag:spam"
+virtual-mailboxes "Archive" "notmuch://?query=tag:archive"
 virtual-mailboxes "Sent" "notmuch://?query=tag:sent"
 
-# modify (notmuch/imap) tags
-bind index . modify-labels
-
-macro index,pager ,a "<modify-labels>+archive -unread -inbox\n" "Archive message"
-macro index,pager ,s "<modify-labels>!spam !inbox\n" "Toggle spam classification"
-macro index,pager ,r "<modify-labels>+reading -inbox\n" "Move to reading suggestions"
-macro index,pager ,e "<modify-labels>+everest -inbox\n" "Move to EVEREST pile"
-
-
-macro index,pager c "<change-vfolder>?" "Change to vfolder overview"
+macro index A "<modify-labels>+archive -unread -inbox\\n" "Archive message"
+macro index c "<change-vfolder>?" "Change to vfolder overview"
 macro index \\\\ "<vfolder-from-query>" "Search mailbox"
 
 # # open a different virtual folder
@@ -43,6 +29,8 @@ bind index,pager + entire-thread
 bind index < vfolder-window-backward
 bind index > vfolder-window-forward
 
+bind index , modify-labels
+bind index . modify-tags
 
 
 
@@ -113,9 +101,9 @@ set attach_keyword = "\\<(anhängen|angehängt|anhang|anhänge|hängt an|anhäng
 
 ## Sidebar
 source ~/.config/neomutt/sidebar.muttrc
-bind index,pager \CL sidebar-open
-bind index,pager \CJ sidebar-next
-bind index,pager \CK sidebar-prev
+bind index,pager \CO sidebar-open
+bind index,pager \CN sidebar-next
+bind index,pager \CP sidebar-prev
 bind index,pager B sidebar-toggle-visible
 
 

entropy/mail/neomutt/notmuch-hook.sh

@@ -1 +0,0 @@
-mailsettings/notmuch-hook.sh

entropy/mail/neomutt/sidebar.muttrc

@@ -1,6 +1,5 @@
-# vim: syntax=muttrc textwidth=100
 set sidebar_visible = no
-set sidebar_width = 35
+set sidebar_width = 20
 set sidebar_short_path = yes
 set sidebar_delim_chars = '/.'
 set sidebar_folder_indent
@@ -9,10 +8,8 @@ set sidebar_indent_string = '  '
 set sidebar_next_new_wrap = yes
 set sidebar_on_right = no
 #set sidebar_divider_char = '  '
-set sidebar_format = '%D%?F? ⌈%F⌋?%* %?N?%N/? %?S?%S?'
-set sidebar_sort_method = 'unsorted'
-#set sidebar_format = '%B %?N?(%N)?%* %S'
-#set sidebar_sort_method = 'path'
+set sidebar_format = '%B %?N?(%N)?%* %S'
+set sidebar_sort_method = 'path'
 set mail_check_stats = yes
 
 color sidebar_indicator     brightcolor02      default

entropy/mail/neomutt/signature.txt

@@ -1 +0,0 @@
-mailsettings/signature.txt

entropy/mail/neomutt/whoami.muttrc

@@ -1 +0,0 @@
-mailsettings/whoami.muttrc

entropy/nixos/configuration.nix

@@ -175,7 +175,6 @@ in
     bat
     lsd
     ripgrep
-    fzf
     #sshfs
     ncdu
     tldr
@@ -203,7 +202,6 @@ in
     msmtp
     neomutt urlview
     notmuch
-    aspell # spell checking in mail
     ## Rust
     rustup
     cargo-flamegraph

entropy/nixos/flake.lock

@@ -23,11 +23,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1680070330,
-        "narHash": "sha256-aoT2YZCd9LEtiEULFLIF0ykKydgE72X8gw/k9/pRS5I=",
+        "lastModified": 1679224149,
+        "narHash": "sha256-TSY37Zv0icF/aijR3/KWGLVBlnKKHlG9QTj7vHbF/UU=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "a6aa8174fa61e55bd7e62d35464d3092aefe0421",
+        "rev": "a4bc66709604ab78abc575b60baa6d23ae027a59",
         "type": "github"
       },
       "original": {
@@ -39,11 +39,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1679966490,
-        "narHash": "sha256-k0jV+y1jawE6w4ZvKgXDNg4+O9NNtcaWwzw8gufv0b4=",
+        "lastModified": 1679318992,
+        "narHash": "sha256-uoj5Oy6hruIHuxzfQZtcalObe5kPrX9v+ClUMFEOzmE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5b7cd5c39befee629be284970415b6eb3b0ff000",
+        "rev": "e2c97799da5f5cd87adfa5017fba971771e123ef",
         "type": "github"
       },
       "original": {

entropy/nvim/init.vim

@@ -48,7 +48,7 @@ Plug 'preservim/nerdtree'
 Plug 'jasonccox/vim-wayland-clipboard'
 
 " Plugin outside ~/.vim/plugged with post-update hook
-Plug 'junegunn/fzf' ", { 'do': { -> fzf#install() } }
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
 
 " ale language server client

entropy/sway/config

@@ -263,7 +263,7 @@ for_window [title="zoom"] floating enable
 bindsym $mod+c exec grimshot --notify save area 
 
 # quick access to mail
-bindsym $mod+m exec 'alacritty -e neomutt -f "notmuch://?query=tag:unread and tag:inbox"'
+bindsym $mod+m exec 'alacritty -e neomutt -f "notmuch://?query=tag:unread"'
 
 bindsym $mod+x exec 'swaylock --screenshots --effect-blur 5x5 --effect-greyscale --fade-in 0.5'
 

entropy/waybar/config

@@ -77,7 +77,7 @@
         "format": " {}",
         "max-length": 10,
         "interval": 60,
-        "exec": "notmuch count tag:unread and tag:inbox",
+        "exec": "notmuch count tag:unread",
         "exec-if": "[ $(notmuch count tag:unread) != 0 ]",
         "on-click": "alacritty -e neomutt -f 'notmuch://?query=tag:unread'"
     }