diff --git a/modules/nix/settings.nix b/modules/nix/settings.nix index 1d72ee3..419adfa 100644 --- a/modules/nix/settings.nix +++ b/modules/nix/settings.nix @@ -12,18 +12,23 @@ in { }; config = mkIf cfg.enable { - nix.optimise.automatic = cfg.optimise; - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - nix.registry.nixpkgs.flake = pkgsVersion; - nix.gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 30d"; + systemd.services.nix-daemon.serviceConfig.OOMScoreAdjust = + lib.mkDefault 250; + + nix = { + optimise.automatic = cfg.optimise; + settings.experimental-features = [ "nix-command" "flakes" ]; + registry.nixpkgs.flake = pkgsVersion; + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 30d"; + }; + extraOptions = '' + min-free = ${toString (100 * 1024 * 1024)} + max-free = ${toString (1024 * 1024 * 1024)} + ''; }; - nix.extraOptions = '' - min-free = ${toString (100 * 1024 * 1024)} - max-free = ${toString (1024 * 1024 * 1024)} - ''; #nix.nixPath = [ "nixpkgs=flake:nixpkgs" ]; nixpkgs.config.allowUnfree = true; ##home-manager.users.${config.mainUser.name}.home.sessionVariables = { diff --git a/modules/services/default.nix b/modules/services/default.nix index 852eb3f..b6af121 100644 --- a/modules/services/default.nix +++ b/modules/services/default.nix @@ -2,23 +2,24 @@ { imports = [ ./acme.nix - ./caldav.nix - ./opensnitch.nix - ./github-runner.nix - ./adguard.nix - ./dnsmasq.nix - ./games - ./gitolite.nix - ./ente.nix - ./kubernetes.nix - ./kavita.nix - ./nginx.nix - ./fileshelter.nix - ./wireguard.nix - ./kop-monitor.nix - ./kop-fileshare.nix ./adam-site.nix + ./adguard.nix + ./caldav.nix + ./dnsmasq.nix + ./ente.nix + ./fileshelter.nix + ./games + ./github-runner.nix + ./gitolite.nix + ./kavita.nix + ./kop-fileshare.nix + ./kop-monitor.nix + ./kubernetes.nix + ./nginx.nix + ./opensnitch.nix ./plausible.nix + ./smartd.nix ./syncthing.nix + ./wireguard.nix ]; } diff --git a/modules/services/kavita.nix b/modules/services/kavita.nix index 36f6d34..7ec0949 100644 --- a/modules/services/kavita.nix +++ b/modules/services/kavita.nix @@ -110,7 +110,8 @@ in { ${mangal} inline -S Manganato --query "Terror_man" --manga first --download ${mangal} inline -S Manganato --query "I_Stole_the_Number_One_Ranker" --manga first --download ${mangal} inline -S Manganato --query "hidan_no_aria" --manga first --download - ${mangal} inline -S AsuraScans --query "the_max_level" --manga first --download + ${mangal} inline -S AsuraScans --query "the_max_level_hero" --manga first --download + ${mangal} inline -S Manganato --query "Parallel_City" --manga first --download ''; serviceConfig = { PrivateTmp = true; diff --git a/modules/services/nginx.nix b/modules/services/nginx.nix index 7c1b45e..e552dad 100644 --- a/modules/services/nginx.nix +++ b/modules/services/nginx.nix @@ -59,7 +59,7 @@ in { "/stash" = { basicAuthFile = config.age.secrets.stash-auth.path; extraConfig = '' - client_max_body_size 5000M; + client_max_body_size 20000M; proxy_redirect off; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; diff --git a/modules/services/smartd.nix b/modules/services/smartd.nix new file mode 100644 index 0000000..e3fd24f --- /dev/null +++ b/modules/services/smartd.nix @@ -0,0 +1,44 @@ +{ config, pkgs, inputs, system, lib, ... }: +let + notifyScript = pkgs.writeScript "smartd-notify.sh" '' + #!${pkgs.runtimeShell} + source ${config.age.secrets.webhook-smartd.path} + MSG=$( + ${pkgs.coreutils}/bin/cat < -M exec ${notifyScript} -M test"; + }; + }; +} diff --git a/pkgs/mangal/default.nix b/pkgs/mangal/default.nix index 2f19543..a32cca9 100644 --- a/pkgs/mangal/default.nix +++ b/pkgs/mangal/default.nix @@ -12,8 +12,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "Kropatz"; repo = pname; - rev = "ed061400fbadb0ecceb4f9ae0a39da42475b709d"; - hash = "sha256-778jdPJC8wzrwawbuTPbS5vCOAR76G+1WvbMpQ7jpNw="; + rev = "ebbbc83ce87f124cc819ef440e40f1c93a5f2ecd"; + hash = "sha256-++fJhHbEKNg3XaCPrYzUmMpF44IM3C1W69ZsTTSqX2g="; }; vendorHash = "sha256-FOi36EmbggxkJ1/wtBO9Vrr716z3dwDevSokFKWwGzY="; diff --git a/secrets/adminarea.age b/secrets/adminarea.age index 06efd1d..783b949 100644 Binary files a/secrets/adminarea.age and b/secrets/adminarea.age differ diff --git a/secrets/coturn-secret.age b/secrets/coturn-secret.age index ff23d9f..bd6b5bd 100644 Binary files a/secrets/coturn-secret.age and b/secrets/coturn-secret.age differ diff --git a/secrets/duckdns.age b/secrets/duckdns.age index cabdf6a..d6858ca 100644 --- a/secrets/duckdns.age +++ b/secrets/duckdns.age @@ -1,12 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 oDXHAQ MYpdCG0zLQb4gMMtefpozExZtYwQ76dzr/ihEP5HiAU -jiiqWsDcEWHJRA1cGlstdbTM6N8y3kDM8Rx6PWYTH0c --> ssh-ed25519 xfrWcQ k5mGfz1oY2TRsOuCA6VXH7W1nEJlkxGgcgQ3xgKyBCU -j4wVkbV2qagGQymSXRJJGfUYuwf0Rn/DRZgxkLR1y1Q --> ssh-ed25519 IV3DkQ 7dpHUynNdZpktntsGd2oTv5+30o8t3mUFWnutB0omWc -c4XxxS1+ZpJqGmjLOW5Xi70DpY1T/9SAnt4Fs5/1RCQ --> ssh-ed25519 DCzi1A KBIJpSeVZtbujtLdP2fSjVis1DF/PdiKdzYRXuSWzVA -Jr6kB1eJlr1IgcJj6wThm+yPxyFmqLb/6xb2nmrceDU ---- 6eIZactoXlgq/FVUuqPMyVxjXer9eXyNhMMmvfhnvF4 -ՕxV#2HC)%7Hr -Uq:@ưEXh{xaq'nk \ No newline at end of file +-> ssh-ed25519 oDXHAQ KTTFsKXQfHVY+ZhdsNfC6kUnuEdNSlz9Z+TiisCLFkY +UEpAdS9bPcPjsAYzfxbN6ir5BqV07RWuOupaPU+7IPY +-> ssh-ed25519 xfrWcQ mC3yi/OAqQH0epKWQqXBJUDgu8hQ/bJtOyi0qz6dkB0 +SrIKQABaoCouhsix3smMayrhM/2OJppTKenazJlah+I +-> ssh-ed25519 IV3DkQ 7wZ3eoFc7TqIyGG4GHqanEkwqTTWDNUubgxIGfYm2jE +O7Us7B146qYwxE1oFU6VqL6XJ3AclFnSvgr3wBPXG1k +-> ssh-ed25519 DCzi1A CIIjo9BNl/H2ZCRRhgw0dT6tasW/shVi6w/g9DFOamY +bislSvJ2UN521HDg9U7yHIXbi8KpV61XHuVk4qhgeH0 +--- Lh5SYKYZcCOEq66jW3H3uawATD+aNewkGWR2ePo+BLI +KScm;ѽ9I\@hViXE9%nTG=YY,=uLu.Lιu \ No newline at end of file diff --git a/secrets/fileshelter-conf.age b/secrets/fileshelter-conf.age index 4e1f48b..05c8cbc 100644 Binary files a/secrets/fileshelter-conf.age and b/secrets/fileshelter-conf.age differ diff --git a/secrets/github-runner-pw.age b/secrets/github-runner-pw.age index 6c4df20..58b8da3 100644 --- a/secrets/github-runner-pw.age +++ b/secrets/github-runner-pw.age @@ -1,11 +1,12 @@ age-encryption.org/v1 --> ssh-ed25519 oDXHAQ JS7roTe8m4VejCS3nqP2292m82GDhM0U4SCpesfjDw4 -/RaBXs+cF1XuqqLNxJNAUX27F7BlfJprZ8a4TWpFiOk --> ssh-ed25519 xfrWcQ hnbpQY6jZ9H1WYqUs/KuRts9dk3UZOMfljy2zVA6lzA -3r2lBcpXU6RJQrP0otUTD2AU5yipeLOJ9XWXO6QQg10 --> ssh-ed25519 IV3DkQ LiIYTXR1VK0cI7C+KwvX6rSa/vodxDoXTxWlswxHNWM -A1ZDFMQxuhb1SRQc2qtsXnH5pp48wNM8DHYwg/dwzo0 --> ssh-ed25519 DCzi1A BR7ab5iNCbjc/LvvaOSw9ZLcWo024edlgiXge688NBw -TjQh/eq3v7hBy3KmDnz68lFd9hRmalBLTLT8ATac/FY ---- T7Cjd9cmYNYdl1iIeKBI7HgG4bZ9OX3em/wvHaZ0lpA -*`iu6&h0* 'eZNt˨{m_f+o sPTr( ?~ez'V|&43J'u7Ik!\R \ No newline at end of file +-> ssh-ed25519 oDXHAQ kMAByOKgWC2oTQkaubpmBBGP87GrY4/1jTn1OpEspi0 +aCsXmxooueb4NpbJ7qANkzczwG85K0iAMJE57QtHT1k +-> ssh-ed25519 xfrWcQ N/S2HphlENnOkoMMKQliOhnti+Rg+sRa1oerrRru3R0 +UrBV2ovRaAVqlQmpjf7bACcF2apy0u1oluZ9Z62YkHA +-> ssh-ed25519 IV3DkQ VtXX4lTyQR3ktYlfqkAeCufDtWWW/CjgnaOX0/UGeFU +0bH3YijjGWRaFQ8I/PwupAZ333MvPKQcghuCc6+qndE +-> ssh-ed25519 DCzi1A a7X1kOvA1X7rFXatX4msDHNnGBhxqd5GPMlI2k9juXs +YC6J3AQbhCwhi7h/X1RQgb0vrprXLAoAfVdLCwoSjiQ +--- koN20eQkT5Bpi6kLiIa4eVkN3+vl/RA91zm2PSg0ldw +J?")wn^+F@] i +%72v6o'oqЃԀk}%8+)Nw;**QiJlUP=PSm$ \ No newline at end of file diff --git a/secrets/github-runner-token.age b/secrets/github-runner-token.age index 37b4ed9..bc4c9ca 100644 Binary files a/secrets/github-runner-token.age and b/secrets/github-runner-token.age differ diff --git a/secrets/grafana-contact-points.age b/secrets/grafana-contact-points.age index b724fe2..db8f78e 100644 Binary files a/secrets/grafana-contact-points.age and b/secrets/grafana-contact-points.age differ diff --git a/secrets/kavita.age b/secrets/kavita.age index 9f88df9..c27386f 100644 Binary files a/secrets/kavita.age and b/secrets/kavita.age differ diff --git a/secrets/matrix-registration.age b/secrets/matrix-registration.age index 7cd0662..d353eff 100644 --- a/secrets/matrix-registration.age +++ b/secrets/matrix-registration.age @@ -1,13 +1,12 @@ age-encryption.org/v1 --> ssh-ed25519 oDXHAQ fBX5T49EJAUK7dCANM91vXzRO+VXQknI7ayeZNk2LV4 -E8tZ+cGclHoQAq81rhIiFNNGvT2uy9Z6UfKthE+2gqA --> ssh-ed25519 xfrWcQ NMbZGSkY6/yGLRF7JS5dU/kKYVvIpL0UXDoacaqNyjE -vqOMR+Ud3syclJofwDPZkzIZJJoyX/2qbp3wu+sssbU --> ssh-ed25519 IV3DkQ nUbVOu7ff8nv/XODyMsLnrdoTvV28elfeEdsRFdVLQk -PuiMJvwNse6HBNZVs9u5UpQs5N5pE6Q4TUFCovXXZMk --> ssh-ed25519 DCzi1A CmKvFWalJbkzC+CE8nC/bFuL2Pi8Fgy9apb+BtSK/Hc -X06AaeTTSP6M90a1fRbu2zuIf49XuxxPvRNls+Rx0Lc ---- wKfObEsamnSkQ4EBzThGxTvsHhXkw/5L83yKJIrgSvQ -#&_o+}8FҋV:LM8{"*';fL -w,$*3VRl8i! KY.KԮ)Cx6 -*흂:jm^H#!Vgnw׊xg2]Hi2+R*w `\L!w~C \ No newline at end of file +-> ssh-ed25519 oDXHAQ LZnNv6OdgvEdrogYC1yQiFdu8OpI0RnX0F7esNimB30 +cWlVnYK4IxCQtA0FHeA4AmAY5EzdkshY3VV58zydFcQ +-> ssh-ed25519 xfrWcQ hLs4PfX/g/hQaAeGlkQWxbWlk+Y6f+JzwsPFTpYYhHs +DdLSEuFxdAEX2hyM+DTKl7GxzJd6ZwlOZI7KD+lxcek +-> ssh-ed25519 IV3DkQ PwXrK5LB0YzBDrSAo1SYtxUEslAnuPBncQbnaniE8i0 +6VZg/BTxiDACoFPy7uNIjydeauiktIAnvU2cHdMc+Yo +-> ssh-ed25519 DCzi1A 4PRejuLL3Lk4GcV2Jxrp/7XYt3nJv9jwmVa+2pzVuFE +J4Nh0lPN8pELXQ0PHbM/uyfNhbm0JrcTc4IrsX/7lr8 +--- sNlrWTi0hCVj8woT52fTlj3fjl+RlVxfU12bg3dZ0co +O=?khCRM]SɿNCLTR/ :a1iyo즄0+U|"y:7bwH^jr:B i0B`[XN`ZB ޽q-e +T?*OWI.<>pZhD%ԖoJ.%tZ&baB\׉2zxU~sq&MAoi \ No newline at end of file diff --git a/secrets/nextcloud-admin.age b/secrets/nextcloud-admin.age index 0433049..d06f85a 100644 --- a/secrets/nextcloud-admin.age +++ b/secrets/nextcloud-admin.age @@ -1,11 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 oDXHAQ fXHB5hLI9sET0Rc8lJThV5j2JmA63LObUPQBt/vc+RI -E1U7sRa0TpAof0WyJ5sBSFGzRkIu0SL4PNSkqAbYz8A --> ssh-ed25519 xfrWcQ 9BGmBObA+CgnHAnzeI73f8A9ckeE8q5ePLhrRm1GSlo -Y3VYXUGZue7MXSEGcaKdv9+HLTSxqWQn1hF4P+6GYxg --> ssh-ed25519 IV3DkQ LXwU7NB/ayZI18XNfe7U9kcfRqUkX93dvJFik6D/DGk -nGR0ZFlSPFZpfb6V4zcRsgXcrlcqJtCanHtXCVodBeY --> ssh-ed25519 DCzi1A FyYNnl0gS6QtnKCNigBodzbY88z1KQWCnX4ghU23im8 -38zIk+7Vnho8dbqO10LaPqvN4eNxBoPJvzn90z5J0ww ---- p81MUS7mwH72TH/SkcvKhsPjK+ZHF2bMhuSyXdgELak -\WPŋQBJԻY\_KTF/#"4$y#K&͇)Jm"f \ No newline at end of file +-> ssh-ed25519 oDXHAQ RXCzzID/JwHJWJ+dNI0h2EUum/JaNfasDVQcJtM0ejg +VwajpdL/Jf5msT1YiNEfOuumcrNNEpqiLFDLUA6Oc8o +-> ssh-ed25519 xfrWcQ 6keCDcLkT+CTHzU8bLEDgLV0SvB6Dxje3yelkR0ipzo +YDsEJ+hH9pFcmH0K8rY3H0G69n8pUul8Ga4OH1i+Xvc +-> ssh-ed25519 IV3DkQ +ZYvrVB4zr/3qkmOE8LM+NNkuwvsXYj1/0S4Wu9iQS8 +va3vbt69s9T/UZ15UOdfuxlvAs1C3nMzynaqZzp4vZE +-> ssh-ed25519 DCzi1A mwaJICkeBEi5UBosbHCiXTqjSUN2Lq9lUkTqKetXvSk +VwieNZ0asL2W49XQfboJJMh6ZEZ/KVghW8K/vS0WMTM +--- qXLby/6NBNzXc3GyckAR/PxxG0oj2+MMQvTE3QaZibM +Zg*̡$.m8S&9A V`qb,Ww"R"N"SYjp I \ No newline at end of file diff --git a/secrets/nextcloud-cert.age b/secrets/nextcloud-cert.age index fb8241b..89a10d7 100644 Binary files a/secrets/nextcloud-cert.age and b/secrets/nextcloud-cert.age differ diff --git a/secrets/nextcloud-key.age b/secrets/nextcloud-key.age index b5105d7..9afba72 100644 Binary files a/secrets/nextcloud-key.age and b/secrets/nextcloud-key.age differ diff --git a/secrets/paperless.age b/secrets/paperless.age index db1ecf9..f4a99bb 100644 Binary files a/secrets/paperless.age and b/secrets/paperless.age differ diff --git a/secrets/plausible-admin.age b/secrets/plausible-admin.age index 887d439..2d01cca 100644 --- a/secrets/plausible-admin.age +++ b/secrets/plausible-admin.age @@ -1,8 +1,7 @@ age-encryption.org/v1 --> ssh-ed25519 bqM3xA OXbI4U7+w3NjG5eJKiSu1B/tk4TYCkF/uT8yikuMgxc -L0Ib9e0VT7VM7FeJGdsZMSiUrastAVbezp8gx0DumlQ --> ssh-ed25519 DCzi1A qS32ujkMmq+SKb3yQgtpa6hkv06nlLXTSLysPEyDlkM -Nyw3JSe0nY20pku/T2wH3ev6U16rUNi1hOYLrJ569TM ---- 8Utd0TThR3dlnBQiwZDl7SvCxD0aKpobakweyQEu5II -]XG X>u -'m5#gdłvP{ ^CI` S sf3mہ:eIDHD_- 7Ĵ*UN## \ No newline at end of file +-> ssh-ed25519 bqM3xA 1a6orkPmKeoDTOCt7lQptYH0/xs8xmaZ0Ypj9V2unnM +eC8xde1MzItMTVpXRi3E2UWDb00qfqPrzppD3P+QAOk +-> ssh-ed25519 DCzi1A 794GChvGjZAuky4TMtrETHEmXlU9hKH1orMGIZKAeXY +bnCI2krZFbQGKo1QsuTUMaZrptySEwhFomUGTbsFayg +--- uqxWg3hKE13fDU4QOelLf5zl2lvUBOSWu4pOKzkZCbY +ФcP) ^f:/˫ 5\)IzES R(`o:bx`N$|H ssh-ed25519 oDXHAQ bCdTSCV6rBWSRZRM2Pkyw65B6XHNaE0ApGZ+9UTz5ko -+301nQus+FP6u2hA0WAjfqUuYjSp9nU+LkoxEAKE20g --> ssh-ed25519 xfrWcQ 9HqCTMDwCWLMWmJDpR9b8yDtG954dVXFaDptjtFdCyw -bgNBTtiI/BrZ7fCP/fYcMJfQ6GdQDKR0KueezZp4h8Y --> ssh-ed25519 IV3DkQ 4MS0ryEQmYsI8RPumMlbHT3mf8q9ghts2O9BweSJA1w -gIHoHJE4clbLEpTwY5j5kcqw/ZM6ZDGY3s2/m01/mE4 --> ssh-ed25519 DCzi1A W8IIOPopRIc19tHye2WoPXSa2SgvcXd29Xlybj/H5QI -sDniYKIfudgMlV0C/eR32b4FUOb+YEKC158Nq1+XW/o ---- KBBcuTa6W9FyFl9I7M3pokd6Pd+owUAUmzxr9N+vRcw -‰W5ï7V4 -z~w0.R}k6Tz{C2Ѫ'*:e5;pTAw \ No newline at end of file +-> ssh-ed25519 oDXHAQ MeblW5bvjNPWwGJfdZ8Miwrht79BUbHw0Jy0up1N4hw +4egfGFBxHU1FSk3LSNRR9A/pANR6nJ1CBLth/GzfwXQ +-> ssh-ed25519 xfrWcQ ocBSkSDvN/RUnlnvJD4xB6C+a7RZUVWSpQzJDFL1WGc +n+90x0g0SJennwiFIthCpWeb9EFPmvopg16+tH1O98o +-> ssh-ed25519 IV3DkQ CUmoMjOf+LwLQyi2yYiZUuMFjt6JhyGPVmICaZR+Ql0 +7DHpXnG7+f2SZDhI+7kLoDLMxPWPuyRKuvNrFyrjFhk +-> ssh-ed25519 DCzi1A ZiGuuA3LOUyO7/7tWGczEfu633myZBQoZWqf5GySTh8 +qRZ/kc8o7dRW+vg2b1hl6rNouW6iObDKymglwePUkMk +--- s5II1ux/XZVfBGxBvKCsaD5jFiFrkzKIeQ+7fa57owA + X^7YR!jŋ3)2GڹZiօunb?t@zf!ڦՔ Hn \ No newline at end of file diff --git a/secrets/restic-s3.age b/secrets/restic-s3.age index 00321cf..e69a089 100644 --- a/secrets/restic-s3.age +++ b/secrets/restic-s3.age @@ -1,11 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 oDXHAQ nUi7y8LS4in+TRKsFjuuoV0PMys5yac1CVeER1pS+Xo -ccg0QK2ceiS4WaHL+eLgqQVPubWOrSzt6+fmqSuW5nU --> ssh-ed25519 xfrWcQ Oorl6EfcWwvyvFdy0f5DYXnmNVP281L3ekMVCzSsTkg -FKYOWsTlXMhhwt8j+p9820fOG8ta87eNP8D/xmKOuZ4 --> ssh-ed25519 IV3DkQ 5TFbxZFziJXpqp4+8gKaRay+yexcFyuvtlKsGU2EPQA -tOxTJWyv29OKcVGpShE+azvgXvvx118lc/n7063pwBQ --> ssh-ed25519 DCzi1A NeMQp162PDxljqB5cROa6c884oH2CS9cb+VTzw44qQI -KRaE3g7F8CfdwvQyh2Oenq8BovoqbSe3ydzLSpZoMfw ---- CyUjL5upG69cWorYHcDLaDuf6ciDBkr1Ns/J3gSHNcw -ICA7㑙YUդm/BG"&^@έP/]yԔT/ܦ.q}JUi]/3P1( OuF-/3XudqS؛qI˩W[U&3& \ No newline at end of file +-> ssh-ed25519 oDXHAQ XOzDNsdpRfXTbFAMh827HC8fpfbZlh3hLucRdC3BUkc +PpB9oNTwrMetQ0la8Jgamms2MB9jvu9026lsgmgMahk +-> ssh-ed25519 xfrWcQ LEjVX7bulslggbRPYHZ9NSF8keYkftMCj9axmnAtWTY +Z/DVUfeHL8kc3RyK2wOxVL+KJ4Kl8k5w87aDcFq1IpQ +-> ssh-ed25519 IV3DkQ TmMbexUGnFUk1bago4Jij9o8NSYnh1DH/V4bZTLmYV4 +nTh6jPMDNHa5ColIpaYEqrp6IwN5hbAhKz8R6zbLUZw +-> ssh-ed25519 DCzi1A DlB+qSeuF/GbE+pjdLQv4cDxxf4ryihE0afur4qGWCw +JCiIrF0KsQ2LzbKGuBuEg9Exk2Uq3KJm5L2c6d2Aj7w +--- +CnD1rfpAvIzKfq1FBG4dUP9wmOWX/hG32Bco8xergg +KXHc,rJWdq/[FTOdGӋbJJe!2-\]{ZՒf[+s %k0r 39хn p 9z*!wT*([ \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 93ec47f..436d94a 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -5,6 +5,7 @@ let mini-pc = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILGsTZvAahTrszYDHn+94sLtcF8865/mpd26ZDVQklSj root@server-vm"; mini-pc-proxmox = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP0kX32LfIOv8FDVvdp7lWesVvMGh5tj84nv7TkIR1cs root@mini-pc"; adam-site = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfaIaKoNStnbfjB9cSJ9+PW0BVO3Uhh1uIbZA2CszDE root@nixos"; + amd-server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII/t25OaQF020DZdew53gMFqoeHX1+g3um02mopke2eX root@nixos"; users = [ kop ]; systems = [ mini-pc mini-pc-proxmox server laptop ]; in @@ -28,7 +29,7 @@ in "step-ca-key.age".publicKeys = [ mini-pc mini-pc-proxmox server kop ]; "grafana-contact-points.age".publicKeys = [ mini-pc mini-pc-proxmox server kop ]; "fileshelter-conf.age".publicKeys = [ mini-pc mini-pc-proxmox server kop ]; - "webhook.age".publicKeys = [ mini-pc mini-pc-proxmox server kop ]; + "webhook.age".publicKeys = [ mini-pc mini-pc-proxmox server kop amd-server ]; "stash-auth.age".publicKeys = [ mini-pc mini-pc-proxmox server kop ]; "plausible-admin.age".publicKeys = [ adam-site kop ]; "plausible-keybase.age".publicKeys = [ adam-site kop ]; diff --git a/secrets/stash-auth.age b/secrets/stash-auth.age index 7485453..ad3e73a 100644 Binary files a/secrets/stash-auth.age and b/secrets/stash-auth.age differ diff --git a/secrets/step-ca-key.age b/secrets/step-ca-key.age index c9bf369..4ee59f5 100644 Binary files a/secrets/step-ca-key.age and b/secrets/step-ca-key.age differ diff --git a/secrets/step-ca-pw.age b/secrets/step-ca-pw.age index c03c5a7..e593ea5 100644 --- a/secrets/step-ca-pw.age +++ b/secrets/step-ca-pw.age @@ -1,11 +1,12 @@ age-encryption.org/v1 --> ssh-ed25519 oDXHAQ L8RbnVX5rl8T6esRa9icyYuYjyqO1+NRPQtS8GdrwTk -DhrclVhBTnBQmqkErXwhXN19jcgCWPmOAdKOAo8WQKs --> ssh-ed25519 xfrWcQ r0NyjJ63Ary6rW8fTfOJEioCgeA63USQjlYug4R7+VQ -SCzuV64fSfACUjMsn8SFn1wNNN4iaEej/6QVnJuOSVQ --> ssh-ed25519 IV3DkQ q2NjfeA7twQvW5uV2FQQQKEHKwv7OyQNjhyRY7YYTnw -CW7RgadfeiApJGEBfW15SlQBLuQdZT+8HswmoS78Gio --> ssh-ed25519 DCzi1A ZqeBvfOmcrSckdQ8gA4yuOSgVCBfENC7MRM2tcC/pT4 -6bmUiD9b/eA00J1H/N6RKEaX4ewm6cM74qDTcBaftx8 ---- mdS5mRZRE3Otc89527fOYllyFM2TmlOWdDRbkjrrZ+M -MN$E<^5"ه6r9^U75)ʞ,QJg~]O \ No newline at end of file +-> ssh-ed25519 oDXHAQ 2ymfFXvSKnGRgK3lYGpGjKSo2aHoc8pWRzyfr4wvAm0 +vr5pxY9w5wtzgv/UeQZLD7GWnrMtx/CYcdm9QKJqcBc +-> ssh-ed25519 xfrWcQ fGCZ2z1IjkVbX7wvoHeXJdZ4BEnpSs+y7dirgWkWU0U +IhvYJJxfW7+v4rDZ7vCuNN/Wxihi3Q/svjnDkZqb/dQ +-> ssh-ed25519 IV3DkQ 4oGxySHQjh8m0vUawi/wCTQXsvabLzV0z+KKLADkpDo +PydLpD7UwO6+r2JisXwSdJqIKcheRCBUGbeAhbrkKsc +-> ssh-ed25519 DCzi1A dObjGBaWBiC8VFbFtKnicT9PB66fI69F2ZGpdyTl+20 +6yv8Jaee08k6KF2WJUPYYqtoe9JItZUvcjqEdYrxpDY +--- 5hzUeFAdm5Tag8G0OAtSCyE4d2uq0ZaBsLyF53oGuuo +[םK 쟵z[ +&C11V?˜Rjbj)H o"W3O \ No newline at end of file diff --git a/secrets/webhook.age b/secrets/webhook.age index 28511d0..4afda69 100644 Binary files a/secrets/webhook.age and b/secrets/webhook.age differ diff --git a/secrets/wireguard-client.age b/secrets/wireguard-client.age index c21a10e..bd2f47c 100644 Binary files a/secrets/wireguard-client.age and b/secrets/wireguard-client.age differ diff --git a/secrets/wireguard-private.age b/secrets/wireguard-private.age index afd46ea..4d1bb71 100644 --- a/secrets/wireguard-private.age +++ b/secrets/wireguard-private.age @@ -1,12 +1,11 @@ age-encryption.org/v1 --> ssh-ed25519 oDXHAQ ycMrply5zXpS2iEZ9WlqMzh+TJrxKlajkloyEesNPAE -9E7h1h8m0b1O264V6XdQnvbDS9QdKGg5RL+a9mROkr8 --> ssh-ed25519 xfrWcQ tuUCexB9PelrmSscKj03mJNIudr9ufvNZ5eDPKMdXh0 -m8oM1uUT6t4w46X6tcwLH42ArDP2jWA2V37tEXAPwiY --> ssh-ed25519 IV3DkQ czqea5pCSja7n/3fMtAoeIz9J+3y4yIzIhuA/gJg9yw -5y5yAyEYyWT7sdnzVaNHnLM5SRFcZi3w/rcBTkJuYx4 --> ssh-ed25519 DCzi1A LyDvQ5eUvoEywd/brvNjieQEPR0vqhLcuAWOOdNCpFc -IUiKZKf9adTo2PgBZcCjwtH4noKN/MNSa8Rnff+XpJs ---- aL1YI8NF550QgpFeXzWCR2DziD7u+eytLZZnvju8I6c - "`{F}*Ns݂. -\,8ap͔nn <5_(իȜg& 9ؽE\ u  \ No newline at end of file +-> ssh-ed25519 oDXHAQ UN2WuFkB+D68fbdzOC0g6x1qPQnVg++ab1zQpULSWjk +eCezJvnuZYERwVsl3r0nsEF43Y+Jm48NWJzhMjgxZ/I +-> ssh-ed25519 xfrWcQ MjbZTZcj3ldyD7CwAvWkj0GuiL0HL3vx/wV0y9/IYy4 +u3RvnnYKHyAT6INoGcpT26sL+EhLe4rZ3/mOSpkXFTA +-> ssh-ed25519 IV3DkQ ftYKp8MC6n26hGxiT3QjVXptmvBQTKyi6oX0UJrbfFI +lL/C4ufi2vD/B+uLyGr8OLBx6TuF/KVvnkjRVSzGtcw +-> ssh-ed25519 DCzi1A 9jKX67gvYP89v3u7Ir37EMDDXrTQTBzZOuObHrXxhG0 +KjB0/6x/9XgXiRNfPi1YZ7KtrvwZP3QIKluj1D7VDJY +--- dECyVdvzWEG1gBOC4YHSq3dK94vaImUSI5M5dXThx44 +ڻwsqB_xI Q{1t{`CPNCqQk:?}1w]/UE08U \ No newline at end of file diff --git a/systems/amd-server/configuration.nix b/systems/amd-server/configuration.nix index e08d398..b8fc557 100644 --- a/systems/amd-server/configuration.nix +++ b/systems/amd-server/configuration.nix @@ -27,6 +27,9 @@ ssd.enable = true; wooting.enable = true; }; + services = { + smartd.enable = true; + }; graphical = { audio.enable = true; sddm.enable = true;