rekey and other stuff

flake.nix

@@ -191,9 +191,9 @@
         # build vm -> nixos-rebuild build-vm  --flake .#vm
         "vm" =
           mkHost { modules = [ ./users/vm ./systems/vm/configuration.nix ]; };
-
+        # nixos-rebuild switch --flake .#server-vm --target-host root@192.168.0.21 
         "server-vm" =
-          mkHost { modules = [ ./users/anon ./systems/server-vm/configuration.nix ]; };
+          mkHost { modules = [ ./users/anon ./systems/amd-server-vm/configuration.nix ]; };
       };
 
       packages.x86_64-linux = {
@@ -205,7 +205,7 @@
             pkgsVersion = nixpkgs-unstable;
           } // {inherit inputs outputs; };
           lib = nixpkgs-unstable.legacyPackages.x86_64-linux.lib;
-          modules = defaultModules ++ [ home-manager-unstable.nixosModules.home-manager ./users/anon ./systems/server-vm/configuration.nix {
+          modules = defaultModules ++ [ home-manager-unstable.nixosModules.home-manager ./users/anon ./systems/amd-server-vm/configuration.nix {
             # 100G disk;
             virtualisation.diskSize = 100 * 1024;
           } 

modules/services/adguard.nix

@@ -54,7 +54,7 @@ in {
             "$2y$15$iPzjmUJPTwWUOsDp46GOPO/LYor/jDJjndwy2QlPddaKSD4QXvq9W";
         }];
         dns = {
-          bind_hosts = [ "127.0.0.1" ip wireguardIp ];
+          bind_hosts = [ "127.0.0.1" ip ] ++ lib.lists.optionals config.custom.services.wireguard.enable  [ wireguardIp ];
           port = 53;
           protection_enabled = true;
           filtering_enabled = true;

pkgs/ente-frontend/default.nix

@@ -7,13 +7,13 @@ buildNpmPackage rec {
   src = "${(fetchGit {
     url = "git@github.com:oberprofis/ente.git";
     ref = "master";
-    rev = "1b6219ee1d9c7be207cc8a2e8282704fb577356c";
+    rev = "42ccf9f7427d8007fce65526e9b9d0443115e476";
   })}/website/tracker-site";
   npmDepsHash = "sha256-fYTRhIU+8pdIm3wC5wJRcDUhgN3d+mmvfmVzuu0pjLQ=";
 
   # The prepack script runs the build script, which we'd rather do in the build phase.
-  npmPackFlags = [ "--ignore-scripts" ];
+  #npmPackFlags = [ "--ignore-scripts" ];
-  npmFlags = [ "--legacy-peer-deps" ];
+  #npmFlags = [ "--legacy-peer-deps" ];
 
   installPhase = ''
     mkdir -p $out

secrets/adminarea.age

@@ -1,8 +1,7 @@
 age-encryption.org/v1
--> ssh-ed25519 bqM3xA Y42xefWKGT6S7hVhvXEVOygSFfJj2N+Hgq5C4w+YGgQ
+-> ssh-ed25519 bqM3xA myivNex19fF3ZRHmnoxewa4kW5YvX7hxvSlhJm6SsRw
-DNOblrNet6mE+cYe6bCehdJB++t/yXn6i6PU9oMg8Y8
+kknnuW/w+ku4ZuqPkW6d+XLdaMS83AH1d9555DD3wbY
--> ssh-ed25519 DCzi1A jkOZ2PwpkqFpQwtEwIPU1N5jeUySAMVNc56a06CM+w0
+-> ssh-ed25519 DCzi1A df+C5KNtrYLTOIBsCKNuzF9ePjh4mm2YtYPzoxZNQ18
-LApR3u9D3+v5F6NHLVr8MSAM8aYSYMwOBlY8UXnyYfw
+S54lzYFdLgEP0LaOUa7U5RvyVKeUs3Hw/oNVUZwRVb4
---- o3Gzah0R4s3bKF77NH2HbuePX6odQ4Tt1xXh4FM5lh8
+--- KPaLIgkd4T3K9OYTiqDJsiQ5hTefahEFv7h+ndxCMC8
-°È{îû乑D0Ç/s&iCM‘È®ˆç³îçÄ~àX¤ö¸
+n“òcÄ$—š *ïh•ZLÚ?ÚðŽ2Ûqo¤#sfk³;jkC?çÀiçEŽ, ´$Å6þD$·ï[˜‡sA¾Èqë¼i;²
	ª™A’{ˆªñÕb\ñ†ö»rÊÌËTâT9»„¨lópè
-­Z–h+™ g1ÄYÐ<59>6	kišË
P¡má…¦JV ò(Œ£]9;+Óü%‰µ‚ƒúüQDϦ*·²¬3ÍÎ7ô¡º‚þÁŸ

secrets/duckdns.age

@@ -1,12 +1,13 @@
 age-encryption.org/v1
--> ssh-ed25519 su0Eyw cZ2LcxtHVTS0C6UtosikfFdj383T+CqORj2OzvWkYCI
+-> ssh-ed25519 dkV/5A NszBp6tthzJKoeujJ0k1AbIWvK0Vii3yK3iHCZC8yFk
-2mEybfmdlP0+MD2F4If/vZ1CEOC62I9wz2PGPIvsk6E
+3Uxxeb8RijQb63WOVcYXL53C5cl3vTGG/s2t8pJavL4
--> ssh-ed25519 xfrWcQ AigoFpYG/JShNhp/00vRkJAjAfww9yDDDAfi66TrtgI
+-> ssh-ed25519 xfrWcQ I8RgQBkcI+eGYLuJRiadQSMm7VlL7PIvCLv9P3nQ5WE
-0fiThEgz8SibuSkgr06wwuKATYaIsLgaSVlTKyOft6I
+tmfz9k8r2V9urFjIU+JDtHpCxQlAioTY90EqjXCVKvk
--> ssh-ed25519 IV3DkQ bhsNlU2erEJP/aJsycYslfJUJSHibYPLH7vXKpuobFU
+-> ssh-ed25519 IV3DkQ eOiXgjJi7XrNULS+4rTY61Nw8YqUUDmW+r29q5vQFAc
-sLPF6S/FHIQm80dxHSUkY8+/6mhsY4Npii8cXgCyVfU
+V2C6EHeXDseNKd4Vus0mcI808FySxQQ1DJUdpLwFqaQ
--> ssh-ed25519 DCzi1A XN9ZzLYfLJ5g2604Q3zh+GU9WEYWnWFTEj/NKhGx/no
+-> ssh-ed25519 DCzi1A E/zVOLiv2O66rwbK++3YDGr/h+FZmk5f5WTo9W/3VQE
-Qo18RZB/urMS1sI/HaBexiwvIoouGJNHgDoISMWfp5U
+VW7yJONqcOqcHE9CK9iRNPFDBFpf0+/oISyIYmuoiJs
---- ypjgJk/XWMXN49ydjElxn3DRVYXHOdTtjJsFMoVz/L8
+--- pcApz4sq0MZALDTE7lvbXHUyBP2CctsVZX7bsR5Lry0
-¹ÄÅÈ
+
-èoµÖÌå|ó;ªŽªì}ihÛ¸,¯DgP_N½Ët3³æ#“>=KIå<ìŽrwd«¤ÚêØ'Þn	\¿ËYÞ+
+ióE)fy"|z
+RS®AKNÕ<±å}-ô<>Š,Ïõ¦„8âþƒ7˜ O³\œ–ÑrW…×%eÄyÙ¯ÜÎ<a

secrets/github-runner-token.age

@@ -1,12 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 su0Eyw tsRQwOuzuo1myyOmMvzxYDHA4zlK7EyTGrNpsq0t9go
+-> ssh-ed25519 dkV/5A rWzRyAbe/agyiwmtBOI/lRHWYxB18Ag3TqDs6WQaBhM
-ki9GV4V/SJPMlL6iMDBgWR5bNPGvrR3CsDnhdvFba/k
+heDqzOOBC+k80bfwZWX7Snq7Yh9BzEf/lpza8bs8f28
--> ssh-ed25519 xfrWcQ 6CfTJmuCMghUL1yiJROIWRzgiMhs6VsFXofByAxqflo
+-> ssh-ed25519 xfrWcQ bGntPjfBzp5o09BovuG8odcZ40MLJyEXDmv2PkypehQ
-iJ+nA4HzCVjNCGWfLAnFMpZU2/hefoWjqDZVt7tjSUI
+J5FJ7+u4afdnVAC7Y8yoAQOYPe+UnOGU620dtNt787g
--> ssh-ed25519 IV3DkQ MXXlf/hEZAla6p/RwBTFPCntO3ITxTQMghLvT260Hgo
+-> ssh-ed25519 IV3DkQ Y3HuEQ+pxsx4Zen2ChZDAzABKQQf654GDsv3u2cG6j4
-007T3jGbgoLM4xseJ8CEGqFH9waxm+U0N8BwNVBhLYk
+moeEQxNMsZxd9ILeoAQoMcmE6b6SN6tRF6YRGgoysvQ
--> ssh-ed25519 DCzi1A LMrXbICNNDoowdi0E7Y8/2jKmaQJUhje7fMc8nS9Vxg
+-> ssh-ed25519 DCzi1A 723bVp7bkm0RvPusFz1ZONVG4/+fXW35sVLqFZTOxHM
-sc7G1TDDVEMohVJKm/bKi5E+UysMlzaEFbbUsq6Icvk
+JnsF2C0mfRrNsskJgz7Am5JqABrOc7utXMZ83AfwjF0
---- 4KneAxtY+GSh+aPdcliazRLvh8H9/9pc6CGsbMb6r/o
+--- 5UIyWetLujNh36YyeeYMGoBFn4F/nJz9HNT1glkp7QA
-Ó˜$`wãˆàe è4qŸ*mˆ¨Ò½¯p1“Ý·îøîž~\
+­]é}GçÛýã|‰±ÑnÙ»åT}ƒ›Ø~ÅÖ¹ÕÚ= ߥŸ´&<26>>½œÄ
-qJ<Qùì¦_ÕV1&žk\äiXØ€ê¡xÏ¢ÏU÷˜ýA§ËÒE}—ªªôvöh¦3¢Àwš+´V²	­Ó¨v{oj@Î<>Y¿ŠD€#þ®øj¸M¸ÅçÅJ

secrets/paperless.age

@@ -1,11 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 su0Eyw SMreMP94QyAiyvhz+WA/s8ZIiSvr7EXTt7jVOEqn3yc
+-> ssh-ed25519 dkV/5A 6v3LNRJ6Lr/Ae0hPiN7OdW+OUFMWC8I4z81g2FFsGWc
-3srDjvhsTRLJpKj+mMw41SgNiP1a8o9MIbtpn/llYWc
+sxh+9UUCnsKvttqsW6923mztw+xyvNWhmbfCnfts92g
--> ssh-ed25519 xfrWcQ DBXUORSHA1ncTGxR1DXniHE30FiJtxM5h6Vm4AR0eSQ
+-> ssh-ed25519 xfrWcQ 9fTveDQemfAdZJz/Gy+y+VWeTPpi0rAKqhgaG4UWhT8
-F+5QgUnFcBOh3ogJfqyYrORigid9qxVsaxpcOeQH1Hw
+HcAL+mG/iarpSODGwSUTqE9BLsH2b/J+9W/1ltHoAls
--> ssh-ed25519 IV3DkQ KPGXb3+MUvsNE22F787u1diONSWdnxSmmBQAgAE3yRs
+-> ssh-ed25519 IV3DkQ IHC/AKhklAjr7snFg6mX5gTL4WqyKU6ZJlurLAHsHzE
-xQPgMee8nKR1pbYXPDCrPamVz7rxsp6T7VGVqHYRPV0
+AwTcys0aZQy8eK6son1/rOQr+3UgpGMVvviF+MjlhXo
--> ssh-ed25519 DCzi1A +jUwmDeIX4QCfGtVESMi9BNYBwsH+ntdx7LtXhX5BFE
+-> ssh-ed25519 DCzi1A 5sW3obtVcuGeuQaaaD2xWdpVhHoxQlyC8fO6RreE+hY
-fpPZFMomCAoyIniCtKbMfiUnlu3Js6vHv9MgVHR3XJw
+f/uGVNZHQfD0oi/bmdlIILPrMZqE2cLLDwlAS2Lvjx4
---- VMOK7LJR3QvQ65+Ei6OxDbqHpOwJmCRb7OBSZM9bKLs
+--- dcmGgM7+4AWkXbwLOyEVpfl2hpvbKoFFIfeHKFJkqcY
->Hｼｺ軆紕阿2Dﾒ楔a"ﾛC･ｩ演n_ｧW<EFBDA7>繙傔<E7B999>PH樰iｹﾟｩ\%錡yoU｡sﾋｿZ9"M｡ﾉ<EFBDA1>X7]ｧreT隆<54>ﾋ蜴$KO<03>(
+7Åó8òávMçžp"³XðÁÛŠ¯Â]P°Nè”(Éîɶ2á,[­ÖŒÖ«c ¬$\'"‚…|Jý«N‰ù=KúŠãm—CVøx‚¥&¥>Ķñij`

secrets/plausible-keybase.age

@@ -1,8 +1,8 @@
 age-encryption.org/v1
--> ssh-ed25519 bqM3xA pYt0CoyfIkCGgoWQrIEqpoVXz/8YgN3mOcl+GJNgu2s
+-> ssh-ed25519 bqM3xA /51wbxBqMFtCXGpoiDTf7tekNOhT1z7BS8O1RQpssw4
-K5HaUKQb/oJ/BIqPEWwfwP89qdlbStI7EDZcy7u3C2s
+gU08DxPsS1sLfIm3z9sSlC8OAxIrXRsllYHr+p3Nhtg
--> ssh-ed25519 DCzi1A X5unppDtHIfPkYyt53pyWt0D+TYKO/8vOSZCmLeS9UA
+-> ssh-ed25519 DCzi1A cX1K/YwnW1sKbmCYSDWQQUPEZ8PvHQ7oRk6dQ2WMYCw
-pmWOrT3kB89a+rxoe37uRR+EPESYKlwlTITqDXB/SuU
+W0KvV/7NQ4fLETiTy52uo+dr0DOr3RSt+FiW5ETp4jc
---- eKLEbWNmQOwYObYWmp3TsplYv4yEeJms+c8Ny0bclTs
+--- J42z35mU+Wql9jKlGEiea9EiqjcV+nWhc/rucZwUNyA
-fßÜÕoCP‘V¾K¿Ú¹ù¹ø]âÁôzäŸu©Þ÷Ž©<C5BD>Öö#	7Jž8VÖ®I´ÅEðÍ7u0v&_žÞg­D/‰®ª—ZøQÞ‘+â¤ZÅ;G<åÂã²kÙ©¨Ÿ£¡ªrR¼µbB¶C¦L
+öâ´â€V¸„uiÿ”63<1F>®±\Ruƒçþ<"’@·ò™”ù<E2809D>#)l	Ñ«ï
-j÷XÏòŠØC”:¥S×
+UÁã4AƒûjÏ™×áÜ»p¡'7™<>
<01>À`Jœ©¢(죽êsYƒÿØEÊzEÛHü„:$í5ó[ä)t³ÙWD•ÞÐ<C39E>b²UX€Fñš

secrets/secrets.nix

@@ -2,7 +2,7 @@ let
   kop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFeP6qtVqE/gu72ZUZE8cdRi3INiUW9NqDR7SjXIzTw2 lukas@Kopatz-PC2";
   server = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUA7uVKXAF2UcwaIDSJP2Te8Fi++2zkKzSPoRx1vQrI root@server";
   laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDqcphdDEJhnSBkAZzQXZJDCzsyb/Tqpcf0pUADFpbd1 root@nix-laptop";
-  mini-pc = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKla9+Gj2i9Ax7cIdnTM6zsmze3g1N/qCPqhga0P+toU root@mini-pc";
+  mini-pc = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA/hwMtI0Xj4eRLjITV/Q2BQGG11NCHZRTLuecE/ZPM5 root@server-vm";
   mini-pc-proxmox = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP0kX32LfIOv8FDVvdp7lWesVvMGh5tj84nv7TkIR1cs root@mini-pc";
   adam-site = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfaIaKoNStnbfjB9cSJ9+PW0BVO3Uhh1uIbZA2CszDE root@nixos";
   users = [ kop ];

secrets/stash-auth.age

@@ -1,11 +1,13 @@
 age-encryption.org/v1
--> ssh-ed25519 su0Eyw ubrXjjXR/NWzbnYk8/x9A64iQDmxXsHHyxHyHvFouAE
+-> ssh-ed25519 dkV/5A H45UCnfk0L30LTAIJQ21zWMfvYurNxsC7wZJbCZRr1U
-ot9ZNCyG0OGVALdtrHwg+6jQiNznDicBu74yyFernKU
+pexJiRj9wUy5S8jzMDWUZpKTCQIpGKDH3o/BPGDIrXc
--> ssh-ed25519 xfrWcQ kFeLZt8cxhBhe54M1FQTAw5B/zOzaXBM8uDJMrKPwAY
+-> ssh-ed25519 xfrWcQ PnFaA7dYMhvwECptLvjkZPY5exA7QQU9J3yuzfFHU0M
-lzEzl/ZcKSZ3xmxdKE2qSJWSrJl9vS5uFpACOgTITfg
+tf7pmM2cNqanKNINYkSmn5XMl4VaHpGTIM/3yJydnV4
--> ssh-ed25519 IV3DkQ 2Gobyktl920WUhBp7ukIcDcdyRem3Y359C7BUIX2Q0Q
+-> ssh-ed25519 IV3DkQ NByh1UlLrvvrALcRr25S/Q3TKxbJupknfPxT0BcfbHA
-n/+a2XRZghCC/Ufaix50eoQJMr2ThM+xz6MimINxZE4
+RMAV0OJ70qcce0hVZ49HgMLqTjmhEnyHunnSPs6PDt0
--> ssh-ed25519 DCzi1A 1WGot8qzyx1OZ4oeOG1rGjhgUcjfyEd9G4GAwWG2MX0
+-> ssh-ed25519 DCzi1A AK2WRW6/SwNkv8ZC2RafnpuODniO0hi44hr6j6zmsB0
-ky/XJR/qcmISfgwkC+ColVTjQJQWkg48whKo1glg7oQ
+keejUQyYNd3mKqf0bBIaxGWuVncge7bWnnPwFAwuY7A
---- ISzwjQcQ3rt/fcVDESFhiv+k6gPvpckjlkFZ7aWyxXA
+--- 1S9P2L4/3qA01SRlO/GOZfSg2Y5ckO58iYMe6rfl3es
-¤qø
ÿ¬‹GðSå•<11>ïg÷/™‚’yâÊëT×$øÖ©œ<d"æ<13>}éûçtð¾Ýª%Ç,Bê–c¢ù0(º<C382>¹ ·¼9&o¹c ‘ˆÐòÔĆHËR:L;73å
+“jÚ>;‹g°cE@suÇ
+ß–6È»ñëóøPIdzÜÙå*±#Áù}itü
ÐbÈ©<0F>Å
+Þ5¦ä€‰oǼ…léeB{Úwìal/“0£¯J“¥Oƒü¤ªó

secrets/wireguard-private.age

@@ -1,11 +1,11 @@
 age-encryption.org/v1
--> ssh-ed25519 su0Eyw TSYqpni/Ql+lZa+oFPN3hn8fR4HM3mZ6o9UQKF2KI2s
+-> ssh-ed25519 dkV/5A FhMxjBcbjjS/qYHq0W9vuAEWh0D4LG62iTKNm0vacwY
-/IxKWNcfPpsW74ajLj5Nzu8oqLEvGht4mOaJCGKUpHE
+2o6VCE8zZsRZczN0QemFPCyRqciTHx0Nmzgl+nlXBHA
--> ssh-ed25519 xfrWcQ ti3YCRm+xByOvl4kjqqFMA82QNogaQsD52VelAb1IyA
+-> ssh-ed25519 xfrWcQ j6+gGMbV+v2jVQU7DjTI+nBI8S5rncXY7nEmNBmhujU
-m4M25xeL2PIzp/BZ23VLb1G+3R6FYAt7wH+816hGSSs
+SVkjUG0FUzxOlJZ9O5LhmIP3XhAvDQQWE0MYaHl7qAI
--> ssh-ed25519 IV3DkQ ZqrkWMup3fqiPtDa57NifZEyRTdNdcp+ZJzB6oKZjAk
+-> ssh-ed25519 IV3DkQ rb7ReLYjttHEhEhhVFF7eqNSFXrBzMZpusvTyuMXzQs
-jszSfRmBrN5QLqKdM329uGHQYY+t7m0Ra/RpNkI56AQ
+OSzhuMUuYUogRFxc7cYOJm8ndm+GLoNZT5VQ4A91k5Q
--> ssh-ed25519 DCzi1A vOXrGSxFvRj7S33RfhNuI1WvOITZ0vcLsLmuutlcqx4
+-> ssh-ed25519 DCzi1A BqUcBTDbhl5cbe3lLePWMm7UL1Q0mocynUHG6BxrlH0
-8ZQQ26trhVFNEG9yFOmjFgDZh1qq0v4lpDzWYlPC5L4
+ISVR5FWzADZOaJA2SRv1TmmMqJ6yz+pLWE1miHn2VJk
---- E0g+TAkc6Mj2vicS3ub2CEr2XYu4Q1nkWgnrs8KnFVE
+--- MeQ/Wz0RDfi0OR8Bwvp1QJRlx9FH52S38DFsl9n4V1U
-vÀäéîvÉ,6|WA?§d'!DÌÐÖZfu½¦*}a
+D釈ﾄﾙ7E\蠹J6我l溥ｬ柞<EFBDAC>:Vz惴ZZｬⅱｼ鐱ﾊﾞﾆ?ﾚ[c4朸)G|舘ﾛO;z裘<>?ｬcﾜ猜Ydｪ(

systems/amd-server-vm/configuration.nix

@@ -19,6 +19,7 @@
     loader.grub = {
       efiSupport = true;
       efiInstallAsRemovable = true;
+      device = "nodev";
     };
   };
 
@@ -27,10 +28,9 @@
   custom = {
     static-ip = {
       enable = true;
-      ip = "192.168.0.21";
+      ip = "192.168.0.10";
       interface = "eth0";
-      #dns = "127.0.0.1";
+      dns = "127.0.0.1";
-      dns = "192.168.0.10";
     };
     user = {
       name = "anon";
@@ -43,48 +43,48 @@
     };
     misc = {
       docker.enable = true;
-      #backup = let
+      backup = let
-      #  kavita = "/data/kavita";
+        kavita = "/data/kavita";
-      #  gitolite = "/var/lib/gitolite";
+        gitolite = "/var/lib/gitolite";
-      #  syncthing = [ "/data/synced/default/" "/data/synced/work_drive/" ];
+        syncthing = [ "/data/synced/default/" "/data/synced/work_drive/" ];
-      #  syncthingFull = syncthing
+        syncthingFull = syncthing
-      #    ++ [ "/data/synced/fh/" "/data/synced/books/" ];
+          ++ [ "/data/synced/fh/" "/data/synced/books/" ];
-      #  backupPathsSmall = [ "/home" gitolite ] ++ syncthing;
+        backupPathsSmall = [ "/home" gitolite ] ++ syncthing;
-      #  backupPathsMedium = [ "/home" gitolite ] ++ syncthing;
+        backupPathsMedium = [ "/home" gitolite ] ++ syncthing;
-      #  backupPathsFull = [ "/home" kavita gitolite ] ++ syncthingFull;
+        backupPathsFull = [ "/home" kavita gitolite ] ++ syncthingFull;
-      #in {
+      in {
-      #  enable = true;
+        enable = true;
-      #  small = backupPathsSmall; # goes to backblaze
+        small = backupPathsSmall; # goes to backblaze
-      #  medium = backupPathsMedium; # goes to gdrive
+        medium = backupPathsMedium; # goes to gdrive
-      #  large = backupPathsFull; # goes to local storage medium
+        large = backupPathsFull; # goes to local storage medium
-      #};
+      };
     };
     services = {
       acme.enable = true;
-      #gitolite.enable = true;
+      gitolite.enable = true;
-      #github-runner.enable = true;
+      github-runner.enable = true;
       #caldav.enable = true;
-      #kop-monitor.enable = true;
+      kop-monitor.enable = true;
       kop-fileshare = {
         basePath = "/stash";
         dataDir = "/1tbssd/kop-fileshare";
         enable = true;
       };
-      #nginx.enable = true;
+      nginx.enable = true;
-      #ente.enable = true;
+      ente.enable = true;
-      #kavita = {
+      kavita = {
-      #  enable = true;
+        enable = true;
-      #  dir = "/data/kavita";
+        dir = "/data/kavita";
-      #};
+      };
-      #wireguard = {
+      wireguard = {
-      #  enable = true;
+        enable = true;
-      #  ip = "192.168.2.1";
+        ip = "192.168.2.1";
-      #};
+      };
-      #adguard.enable = true;
+      adguard.enable = true;
-      #syncthing = {
+      syncthing = {
-      #  enable = true;
+        enable = true;
-      #  basePath = "/data/synced";
+        basePath = "/data/synced";
-      #};
+      };
     };
     nftables.enable = true;
     cli-tools.enable = true;
@@ -98,6 +98,16 @@
   virtualisation.vmware.guest.enable = true;
   services.xserver.videoDrivers = [ "vmware" ];
 
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-label/nixos";
+    fsType = "ext4";
+    options = [ "defaults" "noatime" ];
+  };
+  fileSystems."/boot" =
+  { device = "/dev/disk/by-label/ESP";
+      fsType = "vfat";
+  };
   fileSystems."/data" = {
     device = "/dev/disk/by-uuid/d117419d-fce9-4d52-85c7-e3481feaa22a";
     fsType = "btrfs";

systems/amd-server/configuration.nix

@@ -5,12 +5,10 @@
 { config, lib, pkgs, ... }:
 
 {
-  imports =
+  imports = [ # Include the results of the hardware scan.
-    [ # Include the results of the hardware scan.
     ./hardware-configuration.nix
   ];
 
-
   custom = {
     #tmpfs.enable = true;
     nftables.enable = true;
@@ -51,9 +49,7 @@
       nightlight.enable = true;
       i3.enable = true;
       shared.enable = true;
-      games = {
+      games = { enable = true; };
-        enable = true;
-      };
     };
   };
   mainUser.layout = "de";
@@ -61,6 +57,27 @@
 
   virtualisation.vmware.host.enable = true;
 
+  systemd.services.start-vm = {
+    description = "Start VM";
+    wants = [ "network-online.target" ];
+    after = [ "network.target" "network-online.target" "vmware-networks.service" ];
+    wantedBy = [ "multi-user.target" ];
+
+    serviceConfig = {
+      Type = "forking"; #?????? doesnt work without it, thanks vmware
+      ExecStart = let
+        script = pkgs.writeShellScript "start-vm" ''
+          ${pkgs.vmware-workstation}/bin/vmrun start /root/vmware/server/server.vmx nogui
+        '';
+      in "${script}";
+      User = "root";
+      Restart = "on-failure";
+      RestartSec = "5s";
+      ProtectHome = false;
+      ProtectSystem = false;
+    };
+  };
+
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
@@ -96,4 +113,3 @@
   system.stateVersion = "24.05"; # Did you read the comment?
 
 }
-

systems/amd-server/hardware-configuration.nix

@@ -23,17 +23,6 @@
     options = [ "fmask=0077" "dmask=0077" ];
   };
 
-  fileSystems."/data" = {
-    device = "/dev/disk/by-uuid/d117419d-fce9-4d52-85c7-e3481feaa22a";
-    fsType = "btrfs";
-    options = [ "compress=zstd" "noatime" "nofail" ];
-  };
-  fileSystems."/1tbssd" = {
-    device = "/dev/disk/by-uuid/801d9217-9c38-4ca8-914e-e31361603892";
-    fsType = "ext4";
-    options = [ "defaults" "nofail" "noatime" ];
-  };
-
   swapDevices = [ ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking