From 04ebeccf3a9785b7f2be6596225eb01ea05c2f13 Mon Sep 17 00:00:00 2001 From: Till Date: Tue, 11 Nov 2025 17:18:26 +0100 Subject: [PATCH] diesdas --- home/mail/bindings.neomuttrc | 2 +- home/nvim/lsp.vim | 7 +++---- home/r.nix | 2 +- system/web-server/default.nix | 5 ++++- .../web-server/kein-schlussstrich-hessen.org | 18 ++++++++++++++++++ system/web-server/ksh-map.nix | 11 +++-------- 6 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 system/web-server/kein-schlussstrich-hessen.org diff --git a/home/mail/bindings.neomuttrc b/home/mail/bindings.neomuttrc index d6a80db..92a2f00 100644 --- a/home/mail/bindings.neomuttrc +++ b/home/mail/bindings.neomuttrc @@ -61,7 +61,7 @@ macro index,pager gi "~/.local/share/mail/ktiu/Inboxall\n" "Show all messages (undo limit)" -# macro index,pager go "mbsync -c ~/.config/mbsync/mbsyncrc $my_mbsync_acct && notmuch new" \ +# macro index,pager go "mbsync -c ~/.config/mbsync/mbsyncrc $my_mbsync_acct && notmuch new &" \ # "Run mbsync to sync mail for this account" macro index,pager go "mbsync $my_mbsync_acct && notmuch new" \ diff --git a/home/nvim/lsp.vim b/home/nvim/lsp.vim index e1e0f4f..948dcb0 100644 --- a/home/nvim/lsp.vim +++ b/home/nvim/lsp.vim @@ -26,11 +26,10 @@ lua <'] = cmp.mapping.scroll_docs(4), }, sources = cmp.config.sources({ - { name = 'nvim_lsp' }, - -- { name = 'ultisnips' }, - { name = 'emoji' }, + { name = 'nvim_lsp' }, + { name = 'emoji' }, }, { - { name = 'buffer' }, + { name = 'buffer', option = { keyword_pattern = [[\k\+]]}}, }) }) diff --git a/home/r.nix b/home/r.nix index b3a636c..3a1f6ba 100644 --- a/home/r.nix +++ b/home/r.nix @@ -29,7 +29,7 @@ src = builtins.fetchGit { url = "ssh://git@arielle.ktiu.net/home/git/goethR/"; ref = "main"; - rev = "f84139455723907258c98384dca9cc58ddfff0ed"; + rev = "e3dbfd319f01adfa4a1a1a8abc274014e6498aae"; }; propagatedBuildInputs = []; nativeBuildInputs = []; diff --git a/system/web-server/default.nix b/system/web-server/default.nix index 41456f3..889f87b 100644 --- a/system/web-server/default.nix +++ b/system/web-server/default.nix @@ -22,7 +22,10 @@ }; }; "${config.networking.fqdn}-80" = { - serverAliases = [ "*.ktiu.net" "*.t9e.me" ]; + serverAliases = [ + "*.ktiu.net" + "*.t9e.me" + ]; locations."/.well-known/acme-challenge" = { root = "/var/lib/acme/.challenges"; }; diff --git a/system/web-server/kein-schlussstrich-hessen.org b/system/web-server/kein-schlussstrich-hessen.org new file mode 100644 index 0000000..892afb8 --- /dev/null +++ b/system/web-server/kein-schlussstrich-hessen.org @@ -0,0 +1,18 @@ +{ config, pkgs, ... }: + +{ + services.nginx.virtualHosts."kein-schlussstrich-hessen.org" = { + forceSSL = true; + enableACME = true; + root = "/var/www/kein-schlussstrich-hessen.org/dist"; + }; + + services.nginx.virtualHosts."kein-schlussstrich-hessen.de" = { + serverAliases = [ + "www.kein-schlussstrich-hessen.de" + "www.kein-schlussstrich-hessen.org" + ] + globalRedirect = "kein-schlussstrich-hessen.org"; + enableACME = true; + }; +} diff --git a/system/web-server/ksh-map.nix b/system/web-server/ksh-map.nix index 51414cb..acbdef0 100644 --- a/system/web-server/ksh-map.nix +++ b/system/web-server/ksh-map.nix @@ -1,15 +1,10 @@ { config, pkgs, ... }: { - security.acme.certs."${config.networking.domain}".extraDomainNames = [ "kshmap.ktiu.net" ]; - - services.nginx.virtualHosts."kshmap.ktiu.net" = { - - # forceSSL = true; - # enableACME = true; - + services.nginx.virtualHosts."karte.kein-schlussstrich-hessen.org" = { + forceSSL = true; + enableACME = true; onlySSL = true; - useACMEHost = config.networking.domain; root = "/var/www/ksh-map/dist"; }; }