fix: tramp crashing emacs

This commit is contained in:
Swarsel 2024-10-04 10:40:41 +02:00
parent d17bf0a5f3
commit eff1e42c58
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
11 changed files with 354 additions and 47 deletions

View file

@ -47,7 +47,7 @@
};
services.emacs = {
enable = true;
enable = false;
# socketActivation.enable = false;
# startWithUserSession = "graphical";
};

View file

@ -17,7 +17,7 @@ in
leon = { path = "/run/user/1000/secrets/leon"; };
swarselmail = { path = "/run/user/1000/secrets/swarselmail"; };
github_notif = { path = "/run/user/1000/secrets/github_notif"; };
caldav = { path = "${config.home.homeDirectory}/.emacs.d/.caldav"; };
# caldav = { path = "${config.home.homeDirectory}/.emacs.d/.caldav"; };
};
};
}

View file

@ -35,6 +35,7 @@
# ./yubikey-touch-detector.nix
./safeeyes.nix
./lid.nix
./emacs.nix
];
nix =

View file

@ -0,0 +1,8 @@
_:
{
services.emacs = {
enable = true;
};
}

View file

@ -25,6 +25,12 @@ in
wireguardpriv = { };
wireguardpub = { };
wireguardendpoint = { };
stashuser = { };
stashpass = { };
githubforgeuser = { };
githubforgepass = { };
gitlabforgeuser = { };
gitlabforgepass = { };
};
templates = {
"network-manager.env".content = ''
@ -40,6 +46,14 @@ in
WIREGUARDPUB=${config.sops.placeholder.wireguardpub}
WIREGUARDENDPOINT=${config.sops.placeholder.wireguardendpoint}
'';
".authinfo" = {
path = "${config.users.users.swarsel.home}/.emacs.d/.authinfo";
content = ''
machine stash.swarsel.win:443 port https login ${config.sops.placeholder.stashuser} password ${config.sops.placeholder.stashpass}
machine gitlab.com/api/v4 login ${config.sops.placeholder.githubforgeuser} password glpat-72Wpzs2uuz--LfNHZFzW ${config.sops.placeholder.githubforgepass}
machine api.github.com login ${config.sops.placeholder.gitlabforgeuser} password ${config.sops.placeholder.gitlabforgepass}
'';
};
};
};
}

View file

@ -0,0 +1,53 @@
{ pkgs, lib, config, ... }:
{
config = lib.mkIf config.swarselsystems.server.nextcloud {
sops.secrets.nextcloudadminpass = { owner = "nextcloud"; };
services.nextcloud = {
enable = true;
hostName = "stash.swarsel.win";
home = "/Vault/apps/nextcloud";
datadir = "/Vault/data/nextcloud";
https: true;
configureRedis = true;
maxUploadSize = "4G";
extraApps = {
inherit (pkgs.nextcloud30Packages.apps) mail calendar contact cospend phonetrack polls tasks;
};
config = {
adminuser = "admin";
adminpassFile = config.sops.secrets.nextcloudadminpass.path;
};
};
services.nginx = {
virtualHosts = {
"stash.swarsel.win" = {
enableACME = true;
forceSSL = true;
acmeRoot = null;
locations = {
"/" = {
proxyPass = "https://192.168.1.5";
extraConfig = ''
client_max_body_size 0;
'';
};
# "/push/" = {
# proxyPass = "http://192.168.2.5:7867";
# };
"/.well-known/carddav" = {
return = "301 $scheme://$host/remote.php/dav";
};
"/.well-known/caldav" = {
return = "301 $scheme://$host/remote.php/dav";
};
};
};
};
};
};
}