mostly dotfiles

home/desktop-full/mail.nix

@@ -85,12 +85,12 @@ in
           '';
         };
         neomutt = {
-          extraConfig = ''
+          extraConfig = makeConfig name + ''
             color status blue default
             color index blue default '~N'
             alternates ^tstraube@(em|rz)?.uni-frankfurt.de$
             set smime_is_default
-          '' + makeConfig name;
+          '';
         };
       };
 
@@ -271,6 +271,7 @@ in
   programs.neovim.plugins = with pkgs.vimPlugins; [
     {
       plugin = vim-pathogen; 
+      type = "viml";
       config = "execute pathogen#infect()";
     }
   ];

home/minimal/nvim/default.nix

@@ -69,6 +69,7 @@
 
       {
         plugin = goyo-vim;
+        type = "viml";
         config = ''
           nnoremap <silent> yog :Goyo<CR>
           nnoremap <silent> [og :Goyo 80<return>
@@ -77,6 +78,7 @@
      }
       {
         plugin = limelight-vim;
+        type = "viml";
         config = ''
           set termguicolors
           let g:limelight_conceal_ctermfg = 'darkgray'
@@ -97,6 +99,7 @@
 
       {
         plugin = nvim-colorizer-lua;
+        type = "viml";
         config = "lua require 'colorizer'.setup()";
       }
 
@@ -135,20 +138,22 @@
         '';
       }
 
-      {
-        plugin = catppuccin-nvim;
-        config = ''
-          colorscheme catppuccin-nvim
-        '';
-      }
-
       # {
-      #   plugin = papercolor-theme;
+      #   plugin = catppuccin-nvim;
+      #   type = "viml";
       #   config = ''
-      #     colorscheme PaperColor
+      #     colorscheme catppuccin-nvim
       #   '';
       # }
 
+      {
+        plugin = papercolor-theme;
+        type = "viml";
+        config = ''
+          colorscheme PaperColor
+        '';
+      }
+
       quarto-nvim
       typescript-vim
 
@@ -164,6 +169,7 @@
 
       {
         plugin = vim-astro;
+        type = "viml";
         config = ''
           let g:astro_typescript = 'enable'
         '';
@@ -173,30 +179,29 @@
 
       {
         plugin = vim-easy-align;
+        type = "viml";
         config = ''
           xmap ga <Plug>(EasyAlign)
           nmap ga <Plug>(EasyAlign)
         '';
       }
 
-      {
-        plugin = vim-fish;
-      }
-
+      vim-fish
       vim-nix
 
-      {
-        plugin = vim-pandoc;
-        config = ''
-          let g:pandoc#modules#disabled = ["completion", "command", "menu"]
-        '';
-      }
+      # {
+      #   plugin = vim-pandoc;
+      #   config = ''
+      #     let g:pandoc#modules#disabled = ["completion", "command", "menu"]
+      #   '';
+      # }
 
       vim-pandoc-syntax
       vim-repeat
 
       {
         plugin = vim-slime;
+        type = "viml";
         config = ''
           let g:slime_target = "tmux"
           let g:slime_default_config = {"socket_name": get(split($TMUX, ","), 0), "target_pane": ":.2"}
@@ -215,6 +220,7 @@
 
       {
         plugin = vim-unimpaired;
+        type = "viml";
         config = ''
           nnoremap =p <Nop>
           nnoremap =P <Nop>
@@ -224,6 +230,7 @@
 
       {
         plugin = vimwiki;
+        type = "viml";
         config = ''
           let g:vimwiki_list = [ { 'path': '~/notes/', 'syntax': 'markdown', 'ext': '.md' } ]
           nnoremap <Leader>wt <Nop>

home/minimal/tmux.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 
 {
   programs.tmux = {
@@ -7,55 +7,10 @@
     mouse = true;
     newSession = true;
     shell = "${pkgs.fish}/bin/fish";
-    extraConfig = ''
-      # Key bindings
-      bind C-l next-window
-      bind C-h previous-window
-      bind C-b last-window
-      bind n new-window
-      bind C-n new-window -c '#{pane_current_path}'
-      bind v split-window -h
-      bind C-v split-window -hc '#{pane_current_path}'
-      bind s split-window -v
-      bind C-s split-window -vc '#{pane_current_path}'
-      bind h select-pane -L
-      bind j select-pane -D
-      bind k select-pane -U
-      bind l select-pane -R
-      bind -r H resize-pane -L 5
-      bind -r J resize-pane -D 5
-      bind -r K resize-pane -U 5
-      bind -r L resize-pane -R 5
-      bind c command-prompt -I "#{b:pane_current_path}" "rename-window '%%'"
-      bind C-c command-prompt -I "#{b:pane_current_path}" "rename-window '%%'"
+  };
 
-      # Layouts
-      bind f new-window -c '#{pane_current_path}' vifm
-      bind R source ${ pkgs.writeText "tmux-rloft" ''
-        split-window -c '#{pane_current_path}' -h R -q --no-save --no-restore;
-        select-pane -l
-      ''}
-
-      # Unbind
-      unbind p
-      unbind '"'
-      unbind %
-
-      # Eye candy
-      set-option -g status-right ""
-      set-option -g status-left ""
-      set-option -g status-justify "centre"
-      set-option -g status-style fg=magenta
-      set-option -g pane-border-style fg=brightwhite
-      set-option -g pane-active-border-style fg=magenta
-      set-option -g window-status-current-style bg=brightwhite
-
-      # Some more specifics
-      set-option -g focus-events on
-      set -g base-index 1
-      setw -g pane-base-index 1
-      set -g default-terminal "tmux-256color"
-      set -as terminal-features ",xterm-256color:RGB"
-    '';
+  xdg.configFile."tmux" = {
+    source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/dotfiles/tmux";
+    recursive = true;
   };
 }