diff --git a/hm-imports/nvim/config/lua/plugin/lsp.lua b/hm-imports/nvim/config/lua/plugin/lsp.lua index 761e627f..cab36e6c 100644 --- a/hm-imports/nvim/config/lua/plugin/lsp.lua +++ b/hm-imports/nvim/config/lua/plugin/lsp.lua @@ -1,4 +1,5 @@ local lspconfig = require 'lspconfig' +local util = require 'lspconfig.util' local capabilities = require('cmp_nvim_lsp').default_capabilities() -- lsp keymaps local lsp_attach_keymappings = { @@ -26,6 +27,10 @@ local on_lsp_attach = function(_, bufnr) for key, cmd in pairs(lsp_attach_keymappings) do buf_nnoremap_lua(bufnr, key, cmd) end end +vim.g.markdown_fenced_languages = { + "ts=typescript" +} +lspconfig.denols.setup { capabilities = capabilities, on_attach = on_lsp_attach, root_dir = util.root_pattern("deno.json", "deno.jsonc") } lspconfig.gopls.setup { capabilities = capabilities, on_attach = on_lsp_attach } lspconfig.pyright.setup { capabilities = capabilities, on_attach = on_lsp_attach } lspconfig.nil_ls.setup { capabilities = capabilities, on_attach = on_lsp_attach } -- nix diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix index ef9c582e..984a4bb3 100644 --- a/hosts/picard/default.nix +++ b/hosts/picard/default.nix @@ -52,7 +52,7 @@ enableACME = true; forceSSL = true; locations."/".proxyPass = "http://[::1]${config.services.xynoblog.listen}"; - locations."/gyakapyukawfyuokfgwtyutf.js".proxyPass = "http://127.0.0.1:${toString config.services.plausible.server.port}/js/plausible.js"; + locations."/gyakapyukawfyuokfgwtyutf.js".proxyPass = "http://127.0.0.1:${toString config.services.plausible.server.port}/js/plausible.outbound-links.js"; locations."/api/event".proxyPass = "http://127.0.0.1:${toString config.services.plausible.server.port}"; }; services.lolpizza2.enable = true; diff --git a/hosts/picard/plausible.nix b/hosts/picard/plausible.nix index d87c5765..2edf4543 100644 --- a/hosts/picard/plausible.nix +++ b/hosts/picard/plausible.nix @@ -4,6 +4,8 @@ in { ragon.agenix.secrets."plausibleAdminPw" = { }; ragon.agenix.secrets."plausibleReleaseCookie" = { }; ragon.agenix.secrets."plausibleSecretKeybase" = { }; + ragon.agenix.secrets."plausibleGoogleClientId" = { }; + ragon.agenix.secrets."plausibleGoogleClientSecret" = { }; ragon.agenix.secrets."smtpPassword" = { }; services.nginx.virtualHosts.${domain} = { forceSSL = true; @@ -11,6 +13,10 @@ in { locations."/".proxyPass = "http://127.0.0.1:${toString config.services.plausible.server.port}"; }; + systemd.services.plausible.serviceConfig.LoadCredential = [ + "GOOGLE_CLIENT_ID:${config.age.secrets.plausibleGoogleClientId.path}" + "GOOGLE_CLIENT_SECRET:${config.age.secrets.plausibleGoogleClientSecret.path}" + ]; services.plausible = { enable = true; releaseCookiePath = config.age.secrets.plausibleSecretKeybase.path; diff --git a/secrets/plausibleGoogleClientId.age b/secrets/plausibleGoogleClientId.age new file mode 100644 index 00000000..7ab74b6b Binary files /dev/null and b/secrets/plausibleGoogleClientId.age differ diff --git a/secrets/plausibleGoogleClientSecret.age b/secrets/plausibleGoogleClientSecret.age new file mode 100644 index 00000000..3ecdc908 --- /dev/null +++ b/secrets/plausibleGoogleClientSecret.age @@ -0,0 +1,17 @@ +age-encryption.org/v1 +-> ssh-ed25519 WceKOQ 7kiO44F83uEy4fAuW72b9Q7S5tOtwEfkzRBctQecHgw +3ln1Ygj6jNJIYHdph3jnOFyKfBJ2GgOXkRnkNQK2mg0 +-> ssh-ed25519 ugHWWw EKWqhkVKs2bMLxuqyVS37Ze081K75Ccf/1LaspGSwiE +5cpWDtEB8M/iDLy+et4qMavTLH/apJezJBeLjxtX6KU +-> ssh-ed25519 UU9RSA Jsgue+2fonBIQDhNiUS7ErHMSLEQKwVTEK1k6RY2uyM +C1R14hzTQCtmAE75WAhQeAPxjViXRSYnMEkq1Yg+MXE +-> ssh-ed25519 RJI3BA xKalpyxOrK3zw4GhBnK04oX/S+60VNIPre0d9ZI0DWU +EWCd3HPQ/P2P4QYV5/pW9yiE60nwbKtPUbN6WpZlzns +-> ssh-ed25519 XnvJKw qyvvbgaOqEWLgwUqiAzaYntG1CaqkyJtz6vgdizzQxk +GFeLp6YzXptFauHJN/+O9SryvnsmLm+WCA/5kUoyeFo +-> ssh-ed25519 7NL5Ng BjN17bwe+tZKPUsGABPpEXVmsMiwxrQNK0sNy/XtkRA +5pK3dBXnAFZkKDBKH17QAan0CBLkn7iFUqi5XOAucXA +-> 2*<^-grease \_Ov4 l?~S ^lZ3a +3bmM+FGiMlF4GL952n9DfRuPHaBbbsCitkTPD0syFQ +--- 2+4yhONiZ2GKKjJx7bIuW30ms3LtIQpZcYYnm8/1tIM +OAœ¶Ç Ç8 |_ÃÚÕ»ÔV g,@uGޤHç—rå0[ XR@JÈêŠÌðဆ™÷TÂøÿ}ü™ƒóĪ@ \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 2a9b54fe..c06187c5 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -19,6 +19,8 @@ in "ds9SyncoidHealthCheckUrl.age".publicKeys = pubkeys.ragon.host "ds9"; "gatebridgeHostKeys.age".publicKeys = pubkeys.ragon.host "ds9"; "plausibleAdminPw.age".publicKeys = pubkeys.ragon.host "picard"; + "plausibleGoogleClientId.age".publicKeys = pubkeys.ragon.host "picard"; + "plausibleGoogleClientSecret.age".publicKeys = pubkeys.ragon.host "picard"; "plausibleReleaseCookie.age".publicKeys = pubkeys.ragon.host "picard"; "plausibleSecretKeybase.age".publicKeys = pubkeys.ragon.host "picard"; "hedgedocSecret.age".publicKeys = pubkeys.ragon.host "picard";