home/desktop-full.nix

@@ -1,15 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./desktop-slim.nix
-
-    ./modules/messaging.nix
-    ./modules/r.nix
-    ./modules/tex.nix
-    ./modules/mail
-    ./modules/office-gui.nix
-    ./modules/office-cli.nix
-    ./modules/aichat.nix
-  ];
-}

home/fonts.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 
 {
   home.packages = with pkgs; [

home/mail/default.nix

@@ -5,7 +5,8 @@ let
   makeConfig = accountName:
     ''
       unset reverse_name
-      unset smime_is_default
+      unset crypt_auto_pgp
+      unset crypt_auto_smime
       set my_account='${ accountName }'
       macro index,pager / "<vfolder-from-query>tag:${ accountName } "
       unalternates *
@@ -87,7 +88,7 @@ in
           extraConfig = makeConfig name + ''
             color status blue default
             alternates ^tstraube@(em|rz)?.uni-frankfurt.de$
-            set smime_is_default
+            set crypt_auto_smime
           '';
         };
       };
@@ -107,6 +108,7 @@ in
             color status green default
             alternates @t9e.me$ @ktiu.net$ ^(tillkowski|till.straube)@gmail.com$
             set reverse_name
+            set crypt_auto_pgp
           '';
         };
         msmtp.extraConfig.port = "587";
@@ -126,6 +128,7 @@ in
         neomutt = {
           extraConfig = makeConfig name + ''
             color status red default
+            set crypt_auto_pgp
           '';
         };
         passwordCommand = "pass ksh/systemli";
@@ -173,7 +176,7 @@ in
     settings = {
       abort_noattach = "ask-yes";
       abort_noattach_regex = "\"(attach|enclosed|anbei|anhängen|angehängt|anhang|anhänge|hängt an)\"";
-      auto_edit = "no";
+      auto_edit = "yes";
       beep = "no";
       confirm_append = "no";
       crypt_auto_sign = "yes";
@@ -217,7 +220,7 @@ in
       { key = "k"; map = [ "pager" ]; action = "previous-entry"; }
       { key = "j"; map = [ "pager" ]; action = "next-entry"; }
       { key = "<return>"; map = [ "index" ]; action = "display-message"; }
-      { key = "<space>"; map = [ "index" ]; action = "entire-thread"; }
+      { key = "<space>"; map = "index"; action = "entire-thread"; }
       { key = "gf"; map = [ "index" "pager" ]; action = "change-folder"; }
       { key = "<Tab>"; map = [ "editor" ]; action = "complete-query"; }
       { key = "P"; map = [ "compose" ]; action = "pgp-menu"; }

home/messaging.nix

@@ -3,7 +3,7 @@
 {
   home.packages = with pkgs; [
     signal-desktop
-    # telegram-desktop
+    telegram-desktop
     simplex-chat-desktop
   ];
 }

home/modules/git.nix

@@ -1,12 +0,0 @@
-{...}:
-
-{
-  programs.git = { 
-    enable = true;
-    settings = {
-      pull.rebase = true;
-      extraConfig.init.defaultBranch = "main";
-    };
-    lfs.enable = true;
-  };
-}

home/npm.conf

@@ -0,0 +1 @@
+prefix = ${HOME}/.npm-packages

home/nvim/default.nix

@@ -5,7 +5,6 @@
     astro-language-server
     marksman
     nil
-    tree-sitter
     typescript-language-server
     vim-language-server
   ];
@@ -108,7 +107,6 @@
           vim.lsp.enable('marksman')
           vim.lsp.enable('nil_ls')
           vim.lsp.enable('r_language_server')
-          vim.lsp.enable('rust-analyzer')
           vim.lsp.enable('texlab')
           vim.lsp.enable('ts_ls')
           vim.lsp.enable('vimls')

home/profiles/desktop-full.nix

@@ -0,0 +1,15 @@
+{ ... }:
+
+{
+  imports = [
+    ./desktop-slim.nix
+
+    ../messaging.nix
+    ../r.nix
+    ../tex.nix
+    ../mail
+    ../office-gui.nix
+    ../office-cli.nix
+    ../aichat.nix
+  ];
+}

home/profiles/desktop-slim.nix

@@ -4,13 +4,14 @@
   imports = [
     ./minimal.nix
 
-    ./modules/devel.nix
+    ../devel.nix
-    ./modules/firefox.nix
+    ../firefox.nix
-    ./modules/fonts.nix
+    ../fonts.nix
-    ./modules/media.nix
+    # ../foot.nix
-    ./modules/user-dirs.nix
+    ../media.nix
-    ./modules/gpg.nix
+    ../user-dirs.nix
-    ./modules/password-store.nix
+    ../gpg.nix
+    ../password-store.nix
   ];
 
   home.packages = with pkgs; [

home/profiles/minimal.nix

@@ -5,14 +5,6 @@
 
   home.homeDirectory = "/home/${config.home.username}";
 
-  imports = [
-    ./modules/fish.nix
-    ./modules/vifm.nix
-    ./modules/nvim
-    ./modules/tmux.nix
-    ./modules/git.nix
-  ];
-
   home.packages = with pkgs; [
     dust
     eza
@@ -39,14 +31,30 @@
     ymd = "date +'%Y-%m-%d'";
   };
 
+  imports = [
+    ../fish.nix
+    ../vifm.nix
+    ../nvim
+    ../tmux.nix
+  ];
+
   programs.nix-index = {
     enable = true;
     enableFishIntegration = true;
   };
 
+  programs.git = { 
+    enable = true;
+    settings = {
+      pull.rebase = true;
+      extraConfig.init.defaultBranch = "main";
+    };
+    lfs.enable = true;
+  };
+
   programs.bottom = { 
     enable = true;
-    # settings.styles.theme = "default-light";
+    settings.styles.theme = "default-light";
   };
 
   home.stateVersion = "22.11";

home/profiles/on-server.nix

@@ -0,0 +1,8 @@
+{ ... }:
+
+{
+  imports = [
+    ./minimal.nix
+    ./devel.nix
+  ];
+}