diff options
| -rw-r--r-- | flake.nix | 4 | ||||
| -rw-r--r-- | home/environ.nix | 2 | ||||
| -rw-r--r-- | home/gpg.nix | 2 | ||||
| -rw-r--r-- | home/graphics.nix | 2 | ||||
| -rw-r--r-- | home/mail/default.nix | 72 |
5 files changed, 46 insertions, 36 deletions
@@ -1,10 +1,10 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; unstable.url = "github:nixos/nixpkgs"; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/environ.nix b/home/environ.nix index f03c841..60d618a 100644 --- a/home/environ.nix +++ b/home/environ.nix @@ -43,7 +43,7 @@ in programs = { zsh = { enable = true; - enableAutosuggestions = true; + autosuggestion.enable = true; syntaxHighlighting.enable = true; initExtra = import ./zshrc.nix pkgs; }; diff --git a/home/gpg.nix b/home/gpg.nix index ad5fe27..9117c1f 100644 --- a/home/gpg.nix +++ b/home/gpg.nix @@ -21,7 +21,7 @@ with lib; { maxCacheTtl = 3600 * 6; maxCacheTtlSsh = 3600 * 6; - pinentryFlavor = "gtk2"; + pinentryPackage = pkgs.pinentry-gtk2; }; }; } diff --git a/home/graphics.nix b/home/graphics.nix index 724f9d4..cf60475 100644 --- a/home/graphics.nix +++ b/home/graphics.nix @@ -27,7 +27,7 @@ with lib; { qt = { enable = true; - platformTheme = "gtk"; + platformTheme.name = "gtk"; }; }; } diff --git a/home/mail/default.nix b/home/mail/default.nix index 10828c7..d75b1a8 100644 --- a/home/mail/default.nix +++ b/home/mail/default.nix @@ -30,6 +30,15 @@ with lib; { msmtp.enable = true; neomutt.enable = true; + imap = { + host = "badhost"; + + tls = { + enable = false; + useStartTls = false; + }; + }; + smtp = { host = "smtp.34project.org"; @@ -63,37 +72,38 @@ with lib; { }; }; - home = mkMerge [ - ({ - file.".mailcap".text = '' - text/html; ${pkgs.luakit}/bin/luakit '%s' &; test=test -n "$DISPLAY"; needsterminal; - text/html; ${pkgs.lynx}/bin/lynx -dump %s; nametemplate=%s.html; copiousoutput; - ''; - }) - - # .dovecot.sieve tiene que ser un symlink tal que el readlink -f de su - # dirname (no del symlink en sí) sea la misma cadena que el readlink -f - # de ~/sieve. Dovecot verifica eso y tira "Invalid/unknown path to - # storage" si este check frágil falla. Ni siquiera - # mkOutOfStoreSymlink funciona. Ver código fuente de Dovecot: - # pigeonhole/src/lib-sieve/storage/file/sieve-file-storage-active.c - ( - let - sieve = pkgs.runCommandNoCCLocal "sieve" { src = ./sieve; } '' - cp -r $src $out - chmod -R u+w $out - find $out -name '*.sieve' -exec ${pkgs.dovecot_pigeonhole}/bin/sievec -c /dev/null {} \; - ''; - in - mkIf config.local.mail.sieve.enable { - file."sieve".source = sieve; - - activation.sieve = hm.dag.entryBetween [ "linkGeneration" ] [ "writeBoundary" ] '' - $DRY_RUN_CMD ln -Tsf ${sieve}/mail.sieve .dovecot.sieve - $DRY_RUN_CMD ln -Tsf ${sieve}/mail.svbin .dovecot.svbin + home = mkMerge + [ + ({ + file.".mailcap".text = '' + text/html; ${pkgs.luakit}/bin/luakit '%s' &; test=test -n "$DISPLAY"; needsterminal; + text/html; ${pkgs.lynx}/bin/lynx -dump %s; nametemplate=%s.html; copiousoutput; ''; - } - ) - ]; + }) + + # .dovecot.sieve tiene que ser un symlink tal que el readlink -f de su + # dirname (no del symlink en sí) sea la misma cadena que el readlink -f + # de ~/sieve. Dovecot verifica eso y tira "Invalid/unknown path to + # storage" si este check frágil falla. Ni siquiera + # mkOutOfStoreSymlink funciona. Ver código fuente de Dovecot: + # pigeonhole/src/lib-sieve/storage/file/sieve-file-storage-active.c + ( + let + sieve = pkgs.runCommandNoCCLocal "sieve" { src = ./sieve; } '' + cp -r $src $out + chmod -R u+w $out + find $out -name '*.sieve' -exec ${pkgs.dovecot_pigeonhole}/bin/sievec -c /dev/null {} \; + ''; + in + mkIf config.local.mail.sieve.enable { + file."sieve".source = sieve; + + activation.sieve = hm.dag.entryBetween [ "linkGeneration" ] [ "writeBoundary" ] '' + $DRY_RUN_CMD ln -Tsf ${sieve}/mail.sieve .dovecot.sieve + $DRY_RUN_CMD ln -Tsf ${sieve}/mail.svbin .dovecot.svbin + ''; + } + ) + ]; }; } |