diff --git a/flake.nix b/flake.nix index 0c0a54b..702542b 100644 --- a/flake.nix +++ b/flake.nix @@ -102,7 +102,6 @@ { # age.secrets.oauth_proxy_client_credentials.file = ./secrets/oauth_proxy_client_credentials.age; age.secrets.spotify_password = { file = ./secrets/spotify_password.age; owner = "bertof"; }; - age.secrets.garage_rpc_secret = { file = ./secrets/garage_rpc_secret.age; owner = "garage"; }; } ./nixos_modules/bertof_user.nix @@ -222,6 +221,7 @@ { home-manager.users.bertof = import ./baldur/hm.nix; } ./nixos_modules/garage.nix + ./nixos_modules/nextcloud.nix ]; }; }; diff --git a/hm_modules/helix.nix b/hm_modules/helix.nix index 0e73fe3..da72e0c 100644 --- a/hm_modules/helix.nix +++ b/hm_modules/helix.nix @@ -21,6 +21,7 @@ theme = "ayu_mirage"; editor = { lsp.display-messages = true; + lsp.display-inlay-hints = true; scrolloff = 5; soft-wrap.enable = true; true-color = true; diff --git a/nixos_modules/garage.nix b/nixos_modules/garage.nix index 13327fd..2cbdf69 100644 --- a/nixos_modules/garage.nix +++ b/nixos_modules/garage.nix @@ -1,6 +1,7 @@ { pkgs, config, lib, ... }: { users.groups.garage = { }; users.users.garage = { isSystemUser = true; group = "garage"; }; + age.secrets.garage_rpc_secret = { file = ../secrets/garage_rpc_secret.age; owner = "garage"; }; networking.firewall.interfaces."ztmjfdwjkp".allowedTCPPorts = [ 3901 diff --git a/nixos_modules/nextcloud.nix b/nixos_modules/nextcloud.nix index 025dbe5..0db11b6 100644 --- a/nixos_modules/nextcloud.nix +++ b/nixos_modules/nextcloud.nix @@ -1,13 +1,27 @@ -{ config, ... }: { +{ pkgs, config, ... }: { + + age.secrets = { + nextcloud_admin_secret = { file = ../secrets/nextcloud_admin_secret.age; owner = "nextcloud"; }; + nextcloud_bucket_secret = { file = ../secrets/nextcloud_bucket_secret.age; owner = "nextcloud"; }; + }; + + services.nginx.virtualHosts.${config.services.nextcloud.hostName} = { + enableACME = true; + forceSSL = true; + }; + services.nextcloud = { enable = true; - hostName = "freya.local"; + package = pkgs.unstable_pkgs.nextcloud26; + + hostName = "my-nextcloud.bertof.net"; + maxUploadSize = "32G"; config.adminpassFile = config.age.secrets.nextcloud_admin_secret.path; config.objectstore.s3 = { enable = true; - bucket = "nextcloud-bucket"; + bucket = "nextcloud"; autocreate = false; - key = "GK42a6b774429bfc254f4a5d36"; + key = "GK622e38479552cbbbba48fd04"; secretFile = config.age.secrets.nextcloud_bucket_secret.path; hostname = "localhost"; port = 3900; diff --git a/secrets/garage_rpc_secret.age b/secrets/garage_rpc_secret.age index 39bacfd..be511ff 100644 --- a/secrets/garage_rpc_secret.age +++ b/secrets/garage_rpc_secret.age @@ -1,25 +1,25 @@ age-encryption.org/v1 --> ssh-ed25519 lC44xg nIpxUyy08MuFJ9cc/XeqAEMblNelJQbkAWVdL8c++FM -/yPhZvJzqLyWHD/dVrpy/qciYpVP/DA5DIEP5eNSSsc --> ssh-ed25519 2L7QNA WpL8lmto07hSXOpZ44htAIIUxFHwOIs8XaZXt56Jlko -C2xSQ1S3h3Om02BhXQDtJwveG1mLAoHPgiFMsILO2eI --> ssh-ed25519 sNAOqA exocgvIDQZUjlq9guDryMjVJjkMdy/SbmDZQBJ20oTc -w+dEIv6Z9he0WWYJY9PdXFNivn6VtH0l6/Kpbyex84o --> ssh-ed25519 13iwjQ ON58UJSTkJTsuotpTIp1/Q8reyRutHWSrEupYomLpBw -OKrm8MTNISXd01ACeUj1OMcbAWzneLFpHm7Ms8tzjPA --> ssh-ed25519 7MB20A hmw7MJSSbSHwckx9Tk/9x+SsyHNvBPamu1f6LsVmUyQ -qcgCkK1uc5HaYHfTOxRRW773PpEW3c/gvEu094ng9YE --> ssh-ed25519 IvyYug SJ8Z0/kjxdNjC/InqU8wmhqintT7DdXqVhHmc1ovFyo -VRD3zDh6AMwtVA24yYC1KEUgPZ7baXpFBswK7DqlFdk --> ssh-ed25519 v7O/FA Isf2m+rRPd7/7OkpzYiSTdDZ7Bz+V5wWyAtkqZhHoGw -oxC5o0vOOkuMXnslIRwzPNSPLPUg6olwG04CNsA15CQ --> ssh-ed25519 Wzv8ew 36WVtLCWVXltOp0DOI+13wIHyFyNipYrABQammeawB0 -2HH2ww2uVX4jzlXzJoHYP9W/VBGcpw8YpTw/Awn6DP0 --> ssh-ed25519 XgC3XA DQDnMKY8jDaVlUxFpxSVG5bhqmhHYQh4VimWyEFGtR0 -E0zQkRMYFNWGD1f5+DZcZRAKLdPLl4I9GpHAnMTVPR0 --> ssh-ed25519 l795CA /aSwyb+iwzAs7JFbkUCEG63TNa9TvecOd2fFIHflu3Y -hgSpkb8OyDecZQdSYElSYGHC+GBA0mgHuZeho7Swa+4 --> hVA;w-grease 9%;0zs-E m{dqZB -IpdT0UCfKNEd3kpgCGZVBeQ/kvqDVV4pnLI ---- pnNXlufoQU1IL3aOlDJ3yTiI5eItMPa/fyohWFp9wGE -sUM=n(lYuhMQbS8r !3$/T!\GU(Xv|;4(Sol \ No newline at end of file +-> ssh-ed25519 lC44xg ychfO/nQn0xBBZsyvVTAyYFawVyFigm5WsywfK/kfDA +82ypKNjt/41ZDKATWXnPHUh4lGZ9n/aAiEvGEo1hdxw +-> ssh-ed25519 2L7QNA HSMc0sNNPy39dpsgUT9qNyXzNnFevhpgkj1KwbDFZQM +kn8ktdt0vwa++uJORUZQOWFmmn4mJ+PDm4E0HIQ0/94 +-> ssh-ed25519 sNAOqA GvCvCPUbG3LjmQWAUimsbA/NDoBNJzPnoJi594cegwI +lGC9wWn1Lo44aNXimq1HImX7w1CDsGRXw9C0IFd1BrI +-> ssh-ed25519 13iwjQ yrvtyschjqmaGCSP8qWSrTefE8ctbe4tf1L6ffo6xU4 +ooZrXgNv9ghcsoOebaVjcTELR/vTyhiKg3Hao0tC0ZE +-> ssh-ed25519 7MB20A y9Way1c/1iXusiOhkk6zWObsgRB11Glc/SSJdBBKsVs +mLiZyQFx61KEWPA7BGUD/Ckp5Wi4NSfH9aDpGfNwBZc +-> ssh-ed25519 IvyYug PqoL5RbsxsO72E3tjfZHzvvQ/3yEX0jpFZmVQ8FDhSU +96GpfUAIMxwQOVtrOyiuVm5eVV6isKIaNWqpvWvautI +-> ssh-ed25519 v7O/FA +VH7C9FK23DkFM/ZChV259PPTE03E48B3+FnVmMYfi8 +lSuN6VPgxZQKge8vYjiSJUDiBAETibZnBaObqyrh1dU +-> ssh-ed25519 Wzv8ew Xf28C6hLfYpysyjwIwQheHLr2H0FqU6m+twtcyL5SBE +vIEb6y+pAqzsBCKnqg/cjKbpojHuCX1SoFlsAlXlEW8 +-> ssh-ed25519 XgC3XA Fq1jUNsNPmcfNyu1cBLO+dKN5KRRHQzJ115eaU56G0Y +QA0/b4ICF3EPq7ZL7Gkj+hhI+YHSxQVVucD1QdZrZWg +-> ssh-ed25519 l795CA gqJUSykGRdfZ0JoReEKYqkNETLo8NZgqVyWdshAwIl8 +A23uhE5LdVKSGRr2zgPU3yJfvpWHJ4IDi0iO4biAj1k +-> .-grease < ~~ WMWLfY +JPgVmydA7g9jnNcLZbHG8cd/SBsuYxnKxso +--- vVEO3bWebEWgn6jmie8f+H99IzaXRGnR0H3V3vy42oA +5rl`!y8ΧLdɪL'^9qF gYg)7|חaČ1 .0ѡ6QsеOK4ϸ\D~  \ No newline at end of file diff --git a/secrets/nextcloud_admin_secret.age b/secrets/nextcloud_admin_secret.age index 5b07730..c3fce91 100644 Binary files a/secrets/nextcloud_admin_secret.age and b/secrets/nextcloud_admin_secret.age differ diff --git a/secrets/nextcloud_bucket_secret.age b/secrets/nextcloud_bucket_secret.age index 2c50f98..6f11a36 100644 Binary files a/secrets/nextcloud_bucket_secret.age and b/secrets/nextcloud_bucket_secret.age differ diff --git a/secrets/spotify_password.age b/secrets/spotify_password.age index af11c95..0cb9796 100644 --- a/secrets/spotify_password.age +++ b/secrets/spotify_password.age @@ -1,26 +1,25 @@ age-encryption.org/v1 --> ssh-ed25519 lC44xg Gu2a4bBme7wzv8OHEIyRmvyZ0QHLPEHXuf58YGrDsDM -LiIN1QNhgUuPexUUcuZjUHTRUHL+2no7SkYp5+UgIDI --> ssh-ed25519 2L7QNA pCkz1K5J48W9spryk7R10Czq13C9y0nXSr1sqqmKsU8 -mCVZWpAMKh07YdrBDlti0z4Gl7ciphUn7izbzvqAV0I --> ssh-ed25519 sNAOqA LT2C3WVmw22wFWKv9Q+JKtoEn51uNfbcfbjHSpTXjRs -OhQv/ssw88QbasdvinuOM7xVmYtFFm3dDKND5oJW9ic --> ssh-ed25519 13iwjQ vjvgYAeMOSrXHF792LAN2vgHnNchWSfl3dgntFB77Bc -NLp2HNMl8YMNzKCpMAf5R6+yskq+YEyB+z57kECZkcI --> ssh-ed25519 7MB20A 9Y8MaGIHSjuY/wgyENMtcm1mm+7ykvJXfbZuhdbADV8 -rkj2t4HaUltGvg5t2lwoxj43FqkhVAd2O7FNub8ReOU --> ssh-ed25519 IvyYug vXETZBXjzQHgP3R4O3CyetLWCGlc+vaD6mmuvAfq5D0 -vbVvSvQwDJ/+IyPX/IY67DjYZ7mQboK3gpnsid0LYKA --> ssh-ed25519 v7O/FA R4Ruac52xVswdW+kDauFeWq9k88N3o5Rop9HT62/SkY -2HbAe6y0/b78TDtO1LmN5Sjx5jx7BOLJzuGwtS8MdeQ --> ssh-ed25519 Wzv8ew nVmadpPRxk99IZK7ZgzJgWOFXKnp3uIqbIa/JF0PAm4 -FrNKzTxR1QQQaZF8jIe4ZVscEQ50I4ZKKPEWDKJXSL8 --> ssh-ed25519 XgC3XA XP3+BgBK2X0AVNkJR1Dof3dZJxpeYm8X6aeCbqVofEY -L1De6mLmlB+00XIhrsVKU1CDiAuPgo1VRp/VPodzF8o --> ssh-ed25519 l795CA bG/zMcTC7s9QEu/M/eFh9ZNlUO1rs/M9Vo03NrIhYXY -71XRh4maIrge6IqLqk3bD2Pa5yzOnZLLg1q8cyzU4To --> WPjB}A-grease 7 '}kH |)%1tw1qA'|60 \ No newline at end of file +-> ssh-ed25519 lC44xg qx8ScB8EQSt3zYm/ssCJBJhDnKRnISz6SDIVtp/CVUw +KyzGrKbTVrd7+3Qxo7pIE+B0ZfGY8M/ELyX5S52pEfo +-> ssh-ed25519 2L7QNA O+yiQWRmwQTbxVrcR2ZVblt+x67AHVd7Y44uNUG9zWQ +PJJGYlh9IbQBvVKPSUD3PkneDFpNnnSoGBys6NPGygk +-> ssh-ed25519 sNAOqA iKRbXMoXHsvHu0tvlQSSTILcs130LnK7OtkehxoY2DU +9OuE3tdLJhLgcx0UF+PacOd/0XlDj1cZiHcw6YTO0Oo +-> ssh-ed25519 13iwjQ PxNLHEV39X1RKvuIBiklbiv5ygjZWRAD/qGOxyaJw3g +Srqdehuwr6tJ7dCWnV5QsR1mcqb/LUxlnZkKr1gmEPo +-> ssh-ed25519 7MB20A 6nwXbt9UPU08srOlnbVqsM9yYrl2SVmtOhpDoZRpyCw +1IGrugG0f/anCT6nYffvt1kYcoeWNxeROCz0M0Rmmtk +-> ssh-ed25519 IvyYug 1GtgYlEX8tZzK1mBmudqjNr1TE7ZvBuYkY7CyvCsIlk +KEwiOT+zne9PfK+Rh5KxgnBaly8IU/GWG5vubJbOSho +-> ssh-ed25519 v7O/FA dmGBSmygIDpqoF+n4/AWxkvAnvB9lcf3eXjqpHA001M +LTBJvyp/MGYFcLeLBjdatTW0P1Hf1d65AUxBtaANvFg +-> ssh-ed25519 Wzv8ew GRwNr4PcQeiI0qgcl3QGeo2HcFt65DPw+EXHxeNZZD8 +i5QkEwUZLDqJ5VsMcYajnmZ50d04J1WJ406U+bFlQIA +-> ssh-ed25519 XgC3XA DexhXmClBwlAd4/gXAM58MMmLhpqSDCjvWYX2E7X9EU +HNvLtXFRpXh5JJwUfZ00lXyx+I+RWZpQSli4SbZdvYc +-> ssh-ed25519 l795CA pVq9WszC4VOy61ewkCSykfCnknmsOftp+Cg5Hr5epT4 +1bV64LwANMZe77fPql+GlM0h/8LJ8bW4dETkkoX/MeE +-> ]|v,%-grease +cdOa3vKMVCeih1cEkDclR4tHhbAZ+3DMprjA9w +--- Fh6zKYunbTLngs9QpT12TtRPvgjO1zypM4Q9YbgzqJw +L#b*XHU17۝2ѽF4ćHK \ No newline at end of file