From effb6e63971d7c5f867bf8853769804add84c64a Mon Sep 17 00:00:00 2001
From: DashieTM <fabio.lenherr@gmail.com>
Date: Sat, 24 Aug 2024 18:05:37 +0200
Subject: [PATCH] extract hardware config

---
 .gitignore                                    |  12 -
 flake.lock                                    |   6 +-
 flake.nix                                     |  20 +-
 hardware/marmo/configuration.nix              |  33 --
 hardware/overheating/configuration.nix        |  50 ---
 hardware/overheating/dsdt.nix                 |  19 -
 hardware/overheating/firmware.nix             |  16 -
 hardware/overheating/firmware/TAS2XXX38BB.bin | Bin 64504 -> 0 bytes
 .../overheating/firmware/TIAS2781RCA4.bin     | Bin 2740 -> 0 bytes
 .../firmware/TIAS2781RCA4.bin.orig            | Bin 2740 -> 0 bytes
 hardware/overheating/overheating.nix          |   5 -
 hardware/overheating/ssdt6.aml                | Bin 5404 -> 0 bytes
 hardware/server/configuration.nix             | 342 ------------------
 hardware/server/hardware-configuration.nix    |  56 ---
 hardware/server/mautrix-discord.nix           | 247 -------------
 hardware/server/mautrix-whatsapp.nix          | 247 -------------
 hardware/spaceship/configuration.nix          | 106 ------
 lib/default.nix                               |  16 +-
 modules/conf.nix                              |  10 +
 modules/programs/home_packages.nix            |   1 +
 programs/default.nix                          |   1 +
 programs/individual_configs/fish.nix          |   2 +-
 22 files changed, 31 insertions(+), 1158 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 hardware/marmo/configuration.nix
 delete mode 100644 hardware/overheating/configuration.nix
 delete mode 100644 hardware/overheating/dsdt.nix
 delete mode 100644 hardware/overheating/firmware.nix
 delete mode 100644 hardware/overheating/firmware/TAS2XXX38BB.bin
 delete mode 100644 hardware/overheating/firmware/TIAS2781RCA4.bin
 delete mode 100644 hardware/overheating/firmware/TIAS2781RCA4.bin.orig
 delete mode 100644 hardware/overheating/overheating.nix
 delete mode 100644 hardware/overheating/ssdt6.aml
 delete mode 100644 hardware/server/configuration.nix
 delete mode 100644 hardware/server/hardware-configuration.nix
 delete mode 100644 hardware/server/mautrix-discord.nix
 delete mode 100644 hardware/server/mautrix-whatsapp.nix
 delete mode 100644 hardware/spaceship/configuration.nix

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index e173d3f..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,12 +0,0 @@
-/nvim/plugged/*
-gtk-3.0/bookmarks
-gtk-3.0/servers
-gtk-4.0/servers
-/fish/fish_variables
-fish/fish_variables
-fish/*.tmp.*
-copyq/copyq.lock
-copyq/copyq_geometry.*
-copyq/copyq_tab*
-nvim/lazy-lock.json
-ncspot/*.cbor
diff --git a/flake.lock b/flake.lock
index 2481d6a..3633057 100644
--- a/flake.lock
+++ b/flake.lock
@@ -218,11 +218,11 @@
         "nixvim": "nixvim"
       },
       "locked": {
-        "lastModified": 1724498597,
-        "narHash": "sha256-rq3CS7CpkC5lLn/eDqmftyA2C7McUm+sYGUMpH2oJU4=",
+        "lastModified": 1724509876,
+        "narHash": "sha256-SvtppTW041MCVGmhKu8lsEbzVXwerLEIDcizdY0ZqEI=",
         "owner": "DashieTM",
         "repo": "DashVim",
-        "rev": "02e646467e4454633a7d248dfda7a7a7ecb4bf6b",
+        "rev": "309544615a01e9aa242ca71bff58f503273345ea",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d9b1f91..4bab6f6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -61,22 +61,12 @@
           allowUnfree = true;
         };
       };
-      dashielib = import ./lib { inherit inputs pkgs; };
     in {
-      nixosConfigurations =
-        (dashielib.build_systems [ "marmo" "overheating" "spaceship" ]) // {
-          server = inputs.stable.lib.nixosSystem {
-            specialArgs = {
-              inherit inputs;
-              pkgs = stable;
-            };
-            modules = [
-              inputs.sops-nix.nixosModules.sops
-              inputs.dashvim.nixosModules.dashvim
-              ./hardware/server/configuration.nix
-            ];
-          };
-        };
+      dashNixLib = import ./lib { inherit inputs pkgs; };
+      dashNixInputs = inputs;
+      stablePkgs = stable;
+      unstablePkgs = pkgs;
+      modules = ./modules;
     };
 
   nixConfig = {
diff --git a/hardware/marmo/configuration.nix b/hardware/marmo/configuration.nix
deleted file mode 100644
index e0ed8ef..0000000
--- a/hardware/marmo/configuration.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ config, ... }: {
-  imports = [ ../../modules ];
-  # variables for system
-  conf = {
-    monitor = "DP-1";
-    hostname = "marmo";
-    cpu = "intel";
-  };
-  mods = {
-    gaming = {
-      enable = true;
-      gpu_device = 1;
-    };
-    stylix.colorscheme = "catppuccin-mocha";
-    hyprland.monitor = [
-      # default
-      "DP-1,1920x1080@144,0x0,1"
-      # all others
-      ",highrr,auto,1"
-    ];
-    amdgpu.enable = true;
-    kde_connect.enable = true;
-    xone.enable = true;
-    greetd = { resolution = "3440x1440@180"; };
-    nextcloud = {
-      synclist = [{
-        name = "pw_sync";
-        remote = "/PWs";
-        local = "/home/${config.conf.username}/Music";
-      }];
-    };
-  };
-}
diff --git a/hardware/overheating/configuration.nix b/hardware/overheating/configuration.nix
deleted file mode 100644
index 5ced1e6..0000000
--- a/hardware/overheating/configuration.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ config, ... }: {
-  imports = [ ../../modules ];
-  conf = {
-    monitor = "eDP-1";
-    scale = "2.0";
-    hostname = "overheating";
-    boot_params = [ "rtc_cmos.use_acpi_alarm=1" ];
-    ironbar.modules = [{
-      type = "upower";
-      class = "memory-usage";
-    }];
-  };
-  mods = {
-    stylix.colorscheme = "catppuccin-mocha";
-    hyprland = {
-      monitor = [
-        # default
-        "eDP-1,2944x1840@90,0x0,2"
-
-        # all others
-        ",highres,auto,1"
-      ];
-      extra_autostart = [ "hyprdock --server" ];
-    };
-    amdgpu.enable = true;
-    kde_connect.enable = true;
-    bluetooth.enable = true;
-    acpid.enable = true;
-    greetd = { resolution = "3440x1440@180"; };
-    nextcloud = {
-      synclist = [
-        {
-          name = "document_sync";
-          remote = "/Documents";
-          local = "/home/${config.conf.username}/Documents";
-        }
-        {
-          name = "picture_sync";
-          remote = "/Pictures";
-          local = "/home/${config.conf.username}/Pictures";
-        }
-        {
-          name = "pw_sync";
-          remote = "PWs";
-          local = "/home/${config.conf.username}/Music";
-        }
-      ];
-    };
-  };
-}
diff --git a/hardware/overheating/dsdt.nix b/hardware/overheating/dsdt.nix
deleted file mode 100644
index 8395d7c..0000000
--- a/hardware/overheating/dsdt.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ pkgs, ... }:
-let
-  # credit to benley: https://github.com/benley/dotfiles/commit/325748c3a8553d55c9fab08654a77b252aa0fde7
-  patched_ssdt = pkgs.stdenv.mkDerivation {
-    name = "patched_ssdt";
-    src = ./.;
-    buildInputs = [ pkgs.libarchive ];
-    installPhase = ''
-      mkdir -p kernel/firmware/acpi
-      cp ${./ssdt6.aml} kernel/firmware/acpi/ssdt6.aml
-      mkdir -p $out
-      echo kernel/firmware/acpi/ssdt6.aml | bsdcpio -v -o -H newc -R 0:0 > $out/lenotrolli-ssdt.img
-    '';
-  };
-
-in {
-  boot.kernelParams = [ "mem_sleep_default=deep" ];
-  boot.initrd.prepend = [ "${patched_ssdt}/lenotrolli-ssdt.img" ];
-}
diff --git a/hardware/overheating/firmware.nix b/hardware/overheating/firmware.nix
deleted file mode 100644
index 8d9beed..0000000
--- a/hardware/overheating/firmware.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ pkgs, ... }: {
-  hardware.firmware = [
-    (
-      # lenovo is such a good manufacturer!!1!11!
-      # credit for the binary files: https://github.com/darinpp/yoga-slim-7
-      pkgs.stdenv.mkDerivation {
-        name = "firmware-lenotrolli";
-        src = ./firmware;
-        installPhase = ''
-          mkdir -p $out/lib/firmware
-          cp ${./firmware/TAS2XXX38BB.bin} $out/lib/firmware/TAS2XXX38BB.bin
-          cp ${./firmware/TIAS2781RCA4.bin} $out/lib/firmware/TIAS2781RCA4.bin
-        '';
-      })
-  ];
-}
diff --git a/hardware/overheating/firmware/TAS2XXX38BB.bin b/hardware/overheating/firmware/TAS2XXX38BB.bin
deleted file mode 100644
index d729b9771f31a9652f9e0096394109fc869c4405..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 64504
zcmXptH8o;j`28ct@IW;KqZ<PwBLf2i10zF<H1E7%a|;7qLlZ~OAYDgCXWfEaL*2sC
z#1!2!LjyfST_Xb{V*_I&Bi-O&Lu1{<oPvx*Gmu^s%nLS*VZj>|Q3!{Lfk9^p1B1>H
z2zTU>A*FeldFcwi`6;Pnd7hDhpC77`6%@{ln;C@|7~~un7#Q3bm>48_7&#ai{yC^H
z{9#}~-~b4liNT<U(Sm{DACoph4y4WjA`jPt#%E$E=wT87=?g~I$7I03#ALz1#3aE9
z*3Wc6fPu+@L7vHjrGY7c*_PqIW?4VO|8G72S*2P$7+G4pSlF06n69^Yu`n_nU~p$T
z!4TeZiiN4=5DQ4336lo{GgAPA0>ghT0kAzx3>7`h91JZUENoys9xM$lUM$Q^8Vn1W
zE-+*<9biykI>Er)a*2hZ<q!)KlLLb}lLvzkQvmm*mQyS&Em|zB4F9#Zfy`oZVEWMF
z#KOd+!Jfc$f&pZI0n-Img}%Qm4K1e>OIj|mFt;3HVPtaPp2QTu?$Dye!oUEspM`^g
z;lK77uo(v!7<&FQtYuRWM1-%JLk>u;?=SbHHdclWEo_S1Z6_Hvwq0ac-{#1$uH}>>
zPs=4m&K4&{j<&-L+Zg`q$b-}~9pGSSbz*4b_@f}e!63lE<iU^%5@%3ys04@80fuC-
z{j3}yzp*h)bEpN&|8r;q(S3gzf_nZlZD={jw4v>UB2(K1MdqG=j6zHS3;_)PwSV^g
zVSEpg@B7Oj*>ZqU7)gyPQvgE{R1G7O1FICnf2Kl^nNap3F#7-l6WD$>4u+PK4Dvjj
zY8*@+3_F+{81h>VGsrXim&paIb71IW@?c<K_%CAu;j<oM@?cP43SgMP@LyIJEOvr%
zH`4)Dhn7>Ic;-6D<iW_m6u_(i3U7x0GLyk-99Zu$d2li?{MUI6<|i;Pg6(JLU|{lK
zZD>2lFqMH}0#kni14GLpO@@|3jGPSr9atFtIDo>j0T!-3{~5M19bjN&QxIeUnFGd3
z4mX)J7zBF$GwfkHz`%eecO9gr<sgGu&wqyPYzhJheW3W~;9y{IbGQjo1JcXz&*3I0
z9zpE3!wh>saoDneiGk@bg9t1x`~EUGfYdW6Ii7Dh$Y9U$hoz$DKhpxHYz7IY1O~>I
z7H)=?7HtNm2<}}>0Zi8!82T7n4uJfW$-s1g;Q*5dgE>eH?0-%UhL#hY3@xWX@+=HY
z9^8jOX_Vo=t|G_|P<jNp1>~o`zYO5C#h~WM&2)f)qva&XZk3%q|G8(kBrr1f{AW1C
zRLmgR639KfrG=M)DT9H9fuWD7<%B0g%PDSf9%e~k-~p#cP(B3tpNj)5&Y<Mj!gPSa
z9FkYLCxP-Y!++L3kQ<m17+CuLvhuVY&}3}!VqpjQvF|U-@3sg{h88atj-LOlJWSpU
z5^X0KncD&wnc5s#c|d7_;jbFlY^DPY;Sh5fvY0#=+(G%5;Xi{H*#F!R`&$B7*umzU
zX5eaxVBu&xz{uX_!N}Scz{u7XkqF8o5VM>aBtdR!b6{kEn;*cy&=Lend#s&I9t?5}
z|9Lz>YCvh3=>WqHP&#aJVqxg}3yKd0Glu^%g+2edcY*Ea;Q+<SKCt^d!18?z|7FZU
z@;(1S<}rHo8~p#>;>E(ibbzrGY*r8pJCg(VE+!AwLk$0AdBJuaV7<q5g6U9;2Mc@4
zDHcYMd3}ErnZe-&QX9Zv%J5$otQMpOqz7z2F9!qItN`v$pm1e6z+lRBg6kmD1@1?n
z^aDyKEjKb5T5fqVv^cRaGTmU@-ExbCnaP3sP|GD27FhY(62QX7@L%SB-yg-FOc@M}
zOd!8FFii#PKcLOfa)_IO;h*C~kiAUM@B-V<2eKdJPo!{z%0v9mAj|NdC#dHi<9D#R
z2N;-`JXrp=9AaT-ieME1r40ee1q^K`5<!0DX!A&91jT(@Kq6C{LncE@6bmQV&S(Y+
z5Dkm7p8qVr!1nWVfYK>r%K;X44h9`iJhOxHXp096M@s|?Cqt6sG>{$8e0GD$gCPnW
z7amO4nUWbKm;x9~TD(}8T7p<uK<SL>1oy2LM{xZBF7NyPvM?|Ourx6IXZhOFqR9X?
zr?TfiO9R+`0S*SHWCqE81BRTwzYGN+HDG@_FxZ2`?u0i(%PDP!R!;_bP`$$N&tVsj
zf(%E`e+GLHAH)XbPjK9MurM&N`~#O?Odbpem;xBW85p2^2c{3;JjF1Nq2&-K1Cs-*
z0s|96NRJ=~1Jelxc?PIBDD0RV7_u1t>uv{y7c8!r9Egh}ko!RT7?>DJ7?^k%Kn;h~
zH9h+Ezqg4ruz0?y|DK}(ZC^0FJEF<(s)UV!;c0>+)0s18VB#P>FgA!r)ho@w!eh?B
zz?lG&0^<W<5=1aDh#eMq%)rEuz`)GGVA8<A0BXe4|Ns9VBn!gGY>+)53=#)pkU^50
z7;gT##UOU@5(76#P;%x>2FaN-nZ5ED{>Sk#us^*35@isOwFlMTA`HwqApQpi1_ls*
zz+h}_3=#mvEdvV&1G86Pj&4?4z6k>Zg9rlygSN4;u>b=D1NY3Cv$)QjISaO5ob@26
zt)+MK^+FI<^3m8^aqZ811_q`GH=Rw7EE^aYKxWj$`7v>r=Z4swJ-ws;-(Po-bN~HY
zvIS%xliQXj9Kx-MApe0d*nU<H2JXZT1_o9=aCqgMIdhhE<}3yua9A@ofb><)+-%5d
z>Ano)j-Yj3tRU?5!utXUJ1hCl24U+M|1=Obo)%~b!rB*t{(!IwSIBV?mT?K21i}mq
z4Eq@v82CWuGB7dZFtBlenGFpL3<nM{Fg$p`!0_P%1H+FW3=Dt%Ffjc4$G`xK8IWT@
z{&@fm$RD6)BLgV)GBAK5?|%aW!~X*e4F4Z6F#P|3iNO{zF|aVO)i6N)pTWQ`z)(JW
zkAqEPHNViG2P}IgugZBoaouURd%Hg|FfiCMFfb@EFfhpdnbDT`dtaXZzc)^8|CT#R
z;L^jwV=fGeCkW=g#K6D}G6&SV0ktJK7&v%9&R_-+3?R2~h%hiHL~mtaV#r|NkYE5Q
z<XRYXk-^1Cn1z7>oHsypXU7SdvU2k$llrr5DtWm!l_YlwPI}&vnJZB~ebJnvwqmZC
z%2^R#!W!ml-KxJD`n<ufTO8!ax)Zr(P22cC)p~y5Ygu~4zCOsAt%m&vxL#r4goHiV
zEes5hFkxU|Xgsv6s_xFEq$Z6Qo**-7W-$C}sE+zj-+cRh!&l|G^({*UK)6v|`EcD0
z5$z_Q?Fn@^?%0Ab%q$QM(hH({MUz()y_yp-b(PqSnrm_obL&sJgVP?UUI!_FVwid;
z7fj(3W8r>aOm29A?dRrTAUWK?u7VISw~-TGVEcJE7(ihL!VnW7B+Oi_;RaCxCSmHp
z94LWL3>04ZY5(_5n91M_wx5@S0mRP>iu9S!v3UuI4Uz-VFtJL}bE3_?Yo~(Dttkr1
zZhK|;no(p~Aq>OR!T2B=CRS57XLoaBvMY#&=>@StVqp9EI2b^Dm>dI-R{#v-6>~8H
z<uS02LHYgnbY}TK4G%zh6)XlSr@p&ZR()T8Y#W1u+Ghp^@d6ejXAegHce7I3-v%;>
ztkVYD&ksre|G&gafXzABk@aVFY6r-W|F8B&V>5?Ic6L2Ohy6vcIh>L=z-lirF#KP&
zYBks$juJi$_QyYh#6e}%x7#{)Ah*EW!EkdIAA|PF7_j{U91I|HK=#PADr^8@<>!;_
zL3&}BG5E3izq?;AgXpUFd0L%&3wMFo#E5~+m7F<q76a=Bc41><V^F0E5(D*=!1fD5
z{137#;rW9P^Cjd3Ky<87@WySe$_qejbTMq{f%$5$Jq*M2!uTK>CI*UYP~3xPu>C?D
z46t|xiNWMxVz9ITqVb7=%101puA6=ZMAyHxn*zd~IS1E*FsQHvVFpkI0>exU6%4{0
z3}7*_{b>xycx#sy!`3b>R%y;Z$e8hamnFzt7zUXQ!yxlv7!;nBGiS~M<rxOCgE=6~
zsJhpK(InoT!Ekmi7=!E=;a~u<Ys<1_TYUBiGDI@ph2iSe96jx>_sc->1;U`TB)qI<
zA&h2n?66`G;&H0~|8^Eg3}om3-Em(S7`S(U+72K+rsup5L(|G75DiT~J3(x4_=|Ed
z{JZ-VLyj1++I{86Kz49h{}DjOU_XN#gM=A<zFGZuSZ@QOGt3nCtcsrd8En582e{7Z
z4iB&a=__sKvz(x{>pwVE@=6zi@=5)buq6!4Zg&_Mf**ru9u~f7KeZZd7#BUWU|sT&
zpY@R9V~}132FrSOu@WY>iQUUU`J934_1>Sm8N69uURuR0rW?jq@-mdcK!cHi!TK))
z`@=n8`^7mJ7?>V^XPW!9nc<Uw1IRxhXM<=M28Ass+(G$1EiElg=ggV2It&a9Dre4|
zRbgOYU_-(T42(Jq42(+{7#JTgFbR5s^wd5|X#|<c#$h6-{JK@10pu^Pm~CMDCBQz-
zk!k#Q$Mx#6wK672whWTHB|+-{KXZ9r|FiCD1JB(akXsm-cC#_$a#t}hbf1UOAa{ZM
z$-uj;je+fQ5rfs`Dlnh5^baWgf-zrO8Uy3ZSquUU42;azxj<%Xf(TIhlLYx6$(^9I
z${5=Qaw|v)v$3%;w)Dj?(_kN?z{htCOuKnO;R9+Qftn8>Juy|mw->jrQ3cWA#g<3+
z{8f<yvC+lA{+Hrlh_KeTgW+{j4YLm2bG!=UgJ_r-D9xg$%liL;wvH0YCqZ$*z}ON6
zvLA&1_nbNVGvfF1-`7sV#wi)nFTI(~z*_p}Z<E3Fztf9t!S+jo!`}u}24_XxJvDWy
zk{O83X!?3!`K*#i5F1^rWWB=U*4K5upfpz{(zv-h;Jz&5^%q<)4ATqagJ_sol^Lf{
z>&b8LKr{mrgA0QU2LsFukQhu3CdQ!H9uLEK#h4fz7<9m?go}ZJQJsN-aUTN%$9!-(
z&%kh)fq^H8fq{E70|T270|SRG1B32%P&i>=P@2#MhY3^)RHAVog7lEMCowR9*i3U7
z7#KhjGZ+{^Vho}T3=BOC450oYLkOhZ3uc3QFq0S<z+yHGpq>x|E2#99g&Gc%4`N_o
z+Q7iTU;>U4J&^q%b3tQL4D%QmK>bs6K0_7*16V#BYA?b_N?1$`8Vvd%`-wD!i9v@!
z7UX5PdUgf|29W=l85r0-85r0T7OW5eRY|5G|ARaa_M;r6+=GUVG)Ol%_8{TPP;u?g
zJO>8986a^`Is;)48-^kMK5$n7+&KY>L-Qc0ISk@5)c-ew_mx3$!rL~b9)!X6%Y*y~
zi$_*51_o9O1_o9G1_o9s21sOsy2Nm^7#LV5K`?^>1E|9awgFu9fmoolz{mjVOoJwH
zAo@Y#Ff$549B7&WrGg3u1(5yVZZ{(X1Jgnjc}S58vik&756FCw5|9`OLxT#O20?sK
z_Ge^ZV26o=!W*QX3FL1E2KG!4hk*e!&IpPHh6)Bnu>Bx)jL<a9%fP_B3!0Wd?Jtx_
zh3E(O<sL!Rf$RlgL5LhU&OuQC$_wVuG?350zyOj5<qc4O{{RC6<6Ut0D}n51TEM`-
z;LE_k^nrnai60tlQVa~NP;)?W0tzEmkiUW$7+4Q6Fo41z>`w;<22POoJQ*0cK;r^u
zq3!~y1*Jid+e|?mjByoE9#;n04{<rI##eBTtAOlRLD&y+BM3uW!@$4*s!&K7Uts`^
zQ!~UshXhc@SJ1~*ctPVXAp2E8qs!p&m6`a)SBgZM4uHm29QJNMVA+&VPwMyz+PKOY
z(6|aX{?$03<0}wfSI(R{lhxwAiNoUST%h<0IBa^^LG8JX(N~>+8dYjX6x2TROLhr|
zi+Cm+6_B;p<vDZa442lei=eR_WZWU#ng}rwI=;fdz<@rk0=8eB13tb28e;)rkUmiP
z1PXqN##b0Xb0iFm&@u~DhDjlhm4NNn;9#KQI18vAImEyK8b=0~iJ-K<6_h!k<p-#)
zV+4<}FhIt088pG^FN}eKfwKA%6lh=!DxyGjBdEv&)m0!itbAoattUb0PYZ0nJhc1=
zxfjF+`Gd6j5?ud+>p|k{Ns#^8VEe%?rxO7xi?@N}go#0bK?h_%GpL*c)s+w@FfuSQ
zFfxI}m>4%R{$pTJXklPrNE)3_9-U7folhQ}Pad65W?&edPad659-U8SVL+erADvGg
zolgcgB1h+wSr|s=lfg*=L_qtXASN8+69dhUf;wa5%)f*CwWIUNqw~q2LHE)5WCm<=
z$JoS1=acQgbJd_ZW!PLYhz5-)!7!-s8l6uDg#rYF=8;F|lSk*1LG#M6Ic9MEJ35~{
zI-ktIFgl+MT{jAy{}`Q5hRjQk&L@K>nMdc7L2LCv80&id(fQ;=*qrj{eDdggGIX64
zbbcAjx~suHpUlL-0a{iirRd0@z{w;9-gCjg!yxdP2~;aEGB60VK*WR@IJg)bK(o*c
z4C0`DS1b$+QVa}9W*y*NpbYYi3=9f-5Va-@Y<t(PfT*<qnZwM$VEu=I!DcrDgDq%{
z4-07L#y8Mr9?-ltg9}Iv8v{d(Bm+Zi0|P^XA_GIR2Ll6Wt$8|VO%w+MLl%QjHG>p0
z!!#xaMh12UhGGr|hSCQN4CM?A3{?sYjN&I47!?^97&Rd38R5&_L1r^DFuH=oB^X!)
z7;x<)0=u2X0Mv;B?L`q`U~vGo4KVf)fz`2!Fo5;~LD-;ac}7r}1Te5_Fi?Fz5NPiU
zJ@)~D_uWAD+JODXp#k1!17>r1fHOUW9RU$%U|?q4%&0WFCSi1s`{*8b$k_p-d)yfq
zM%N^au1Of(<375_9dxe4=$eGlJ?^0W?I1k5$9-_^ac>mlv#1aJDA*Vpy$>}1U;AW1
zJ~?}~LHo2p7}SA+VUT$sHrBn`puX`C+~ZEI@B+`tjP7wC-Q(W=HW0MO2eiK(glV(K
zeWT^*9(T}&A0!Mae+cbym;7ABiiAno;|?nOia~p-K>LQp4(2c#-JT5I<8B~(fdPa;
z_Jj7g8^~U$z5U{BbNhA`*#349J-Wvo#~%0CwSRw{nVZJ={l6Nsxn(r7`>kuBum<mO
zPdKuPojK_de2@E%B7K&(S9UTBX}hzPy^3M5P)%cCFiT)ypK1**e?fcPnd>Z>TGP%m
zN}gQ^%7>u(3Pi&&XwMgDFF9zxI;DHu)j{b2%N}<r`G||IE?sNowh5XHl|AkZzof%P
z_qdPlac5u{-Qx}_GoTo>zZkS{Z*-44cs?CGT`;=Goq=I=k2~lP6wo<>pmxvb9{15b
z?$kR=5VSXZbdNi+XTgB--(cS3j%!WAWUOlvoFMBAP}U?gj;=`<@oN%T7&kLM99@$z
zx+Y<CO~UA!gwb>N85o#G&)pwAcOP^I!sxmC;JYS9*CdRtNdT=!0O8R!38QNghVr@l
zqiYgI&)pw-=k9COjIK#QT8{uaU=%bqM`%sLf*YNzNSKs0383`|APhQlAA}jzk7+>G
zB>2o`Fz}fTo)ZVJN${Cnd+bzA^G1ugptT4vJXF>sfadFwF=TxJbcPN}QT3bz=lk(L
zK6vpmE;9ea(#sjbvSiXkh@F=8>@Evr*{=V(315@2%lSLYtDmo!McKsIN^8C{=xZ-v
zV6e$YU6UYC#FTYJo8c{EIcOaM$jKlYhN-zGL8a=U2i9}<1;4X6bufC#I7W+5eN6(R
z)Jg^hw^a;GhgL9%R6PXwkJxkf8Nqi)VBYHhK6jtzpzr9KgwZt#qiYgSj%XiUlK@$Z
z04iochfsr#F&kZzFuEoIlper$?10-nqiYgI*CdRtNdTR-52`#sWh96VT3a!C?mp_8
z1TFCXchETr*w-YuU|EweYjjP*h+mVy%D9;^Y;;Y+=$eGlH3_3@5=Pe~jIK#wy1_WQ
zCSi0<0s~V3!|0j>CI%4(=Fv3?p!EnKJh~=fbWOtOnuP5M;IX;Ua}q|+Nub9$32aTz
zN7p2fz9xaCI6V~^ld>iOG*1q~p!EnK%&7Qa4R}q0kzh9i2!qx{fYu}!33k_3ypL>g
zy{!yej{u@a*CgOLCxP*Y>`#TjJ&bFf&t?r4>1WNG#|92(2FrSOx!z-JbFW6i*Cg!R
zJ(=b8`Af_q26}9z&tEba%HL;Tu>8Ql{%{Yt`~{zrV6cEG>p~dAxBb?jbqJuz6A%r<
z)LfIG%w=1MZB2r#rMsWg3Y{2f^(AscW=(?lnS-Ni5*jym2i%usy#9g<hBKPJ9#}rB
zBof94(J-+pGftt_li%KfXa*(*7X}%Q(YqT)?{1KWl{uq#H-JKdfen0TGy}uv-3{RN
z9iw+QfbMMo;nBMr5{?SU+UxS1Idg_f>()isoeeO0^zH`mxh$YL{;kk51azI+b}(BZ
zdMg71%P(-dPZM+(Jwq4+0|OTW1EV?v1LHmh29EilYy21(7!ETq@B}e1aBpT{U=w0s
z;IL(2&;^+RE}XCvAZxe}fwL<E_ap`e5SwW(v^<}|02YIuCj@HuYk}<ttwR`HlK=})
z(47g4ObQI7tx0ghvL<2j=$eF)y(S?!KQApay|gH?Br`uR-mx?#Ge170G%qtRUBNd$
zB{kl}Lc!akD!$mzI39d41}q7}X?_rEH)!VqhylU^3=9lH3=E8$7#O&gFfcGkGcYnR
zGca&)GB9v5F)(mJ?-=1__{_x60+AEpVqg$+0N?uongd`@0hz<dz`%Wpfr0xIxJ&}w
z;sLq`g9CCe1vz)n7IV#1&WiXF)-Ye|R{hn`=M8?{;-LO;-HBYYrfvM6YCS*jwJbei
zUmxVmR>S^d7r6Z61eZS`_kb}-J%}-SKJNejIKvGTKu}Ccc!9%zbli7z+?O8XzN{PA
zN5_3hANOUI=KO<<Ng4MYy|WiuNP;RjpKn&9clM6n**kh?FU`h%IZ{$UZ8>P0l8J#M
zB?WW=9lRf`gvgCxmLmfLBdF~u1InHZj0|iHjOJDhe|dQs{<0lpV3d3SWnX1rU~pw%
zV60?dU;r5i>YcHmsQt?ZQX|a3z*t78O*|R3P3$yS+r-p5Zvb>(1PFse97@32jH7o(
zEETA4St`(|u6(%ehKP2P&*)kRaG!vWW3)|7mp1X}oe`kXN(RvA1`LD7Bnh3*fOKC3
z=<W!{?_HMlFYTtluxHM}wJ;1aABI82AE@j@IiF$l&IlXOISm<RihEW?&;1O}|6&~A
zJ)7O(0XCrUDsASooS?PqKd5#GuNlx@8B>2HYzYIi+Z_gm;Kv}EXY|g9^9;G%RSXQ>
z=Y^NmEM(w%y_bP^SsMe}<st^F%T-`LYv~_`tzBAR%$JtNz&LXjg8%~qBlC4GP}(H+
zd<JG?W8?b&*w1Gey))wf|0<C|vlfC-n^+kX??~8*gf_7o5p7}-1_s8{INHR}J(j!-
zXl-Jb(Khj%h^ec@Zq!_pdpNp2c(hFnt`kSw#0)8PX%mm0Sq5salH4XnI<E|Lb{Q#c
zVo-Y+gh6YAL3s4cvh~zy6OW!*Mp~PA^vp7FQ!xF~o7oJkrGNf58BG5>z1S99|44&-
zUpAmJI4kPzsi{kq%s@13JuirjE>^N$;c@HhI$uy9ZV0uBRltFOAe>2P6T1`9CKhF2
zV3a4ZP3$(>CLV1QkB$=?zOJd8v%9%5*%e$SjkbyD(<UC>GY4AW#z1PD7<s=Oh)qhH
z7*uD1FsMBY!lQfUsMIDN-7_~h+Qg%K=7!QZu_~fD3}(5I&?fdE)Fw_&%*jlGu23dv
zZ8F#?3=9mo*C>P5W2|9dV32{VL#F*2WtfvdG`Rc*F_19HVxaj*9BY)3j0Mk^f%pxb
z?*!_LnyxqU?0s8bCinq_n@!^QY7XuC+ZOiDu;%o_Paq6Z3&VKb1hStC-1mbihuZ}g
zfZh9wEPy1&0$yOlz<_N{H?kIN?f|#*xFPd_$ZA1sZ0boBBNSd>`*}DRKw$>LAbVk$
zRJ&mMKr}wRpzz91`@eU>Oa^DL{k$9uAbws@q|bbg%}YRRkQ|7HiB*c86K(EYI~8PZ
zO;J#G+pE$0GKSuL86#wka@g+OpfrxYUIH}k48kP0vp=f`upnV#+u5MJ0>hv-HV8AS
z?)3nlO<_1YmjQ%9<say53d7mCwPo3|Ek1h$L1$9HFs`#HKxZa^=Hc0Gxx*POUqoY@
zF9&U;0jV=R=Y5zl__6xGyI(JX=&JX5TAh0fcY@g9{4dJEfK84Vv5G@qR)Xx{vi>80
zj6wbel|#rFv<_o*jq>nWqs;iaRh~KfP|oPt6hmY^254n5gB>VK(qpZ%83O|s-nKE?
zx(tffDuX-*!`R9nlEpw}^Jv?c<n}l$4nQ=%FduCjZ(af$ZwAq@b~T7SItINm2HZ9g
z;GoYKH0uait4!^-@h5>$79>nj+n7pgl|k*%5#2T(U8_vm7&HymDudg`O4UB2ZQ~)=
zHm1j#<<B_U#xz^A3~GzPFupb!Obv*}t8TPyT){9pZag|}3_8f_ORU8I0}Kqm4|Zhz
zS)JMe$~*sG?TrStL%zFKR()T8Y#W1u+Ghp^@d75<+4Vzj+<1hnS*CK^n6=_-Ju;@K
zZA_(mmO*K9Ftv?AZb8P_>Kv+$8;`D8CarBugEh<GwsBm*jnTI8kZT*$W9@P+iEU$w
z*DizVYZ%5>{*Wv-+BP0-8;`E30B5QH!@X@hQr0e0xoyni-Es^WQ`9!5(tRHzzHL0Z
ec6o5LjT;X<7;PI5xwbJ)*D!-CQwE0rga7~n^)Oig

diff --git a/hardware/overheating/firmware/TIAS2781RCA4.bin b/hardware/overheating/firmware/TIAS2781RCA4.bin
deleted file mode 100644
index 481d133059a6a44a225e085ffe7b37ff6a35bde5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2740
zcmZQz;M%f`rJ|RCfsvJgfsrxQDRes{0|N^qBO@aN1h6nLFfD;##uNqyrY8{LkwYd`
z78ENKrRL_Br79%mCFbO(E2Jl8=8+Nr9E>cC9~c-IDi|0TxEL52SQr@ijxaFrJ1{WB
zNHQ=a2r#fP7%(t!$uTf8Ff%alGBPlTIWRDapI~5OU}0b}0NKR|W^+h@*bEGe42%pM
zG7Jzg4F(60C`c`r2Z#j`=Zb)cgVZuGF)%VS@-Z+la4<l0GcqtRF)?8gW5y!Jf<=sJ
z5cr9iI5+6gGF({(fg3!Hf^`kek}^wlQ<F3Di&E24i&FEFQ+11T@=L&}2a+oAksQn{
zjEj-dC^JeLg``g{NZJLZPXQLXrBTA}lA^V{u;mj*!tSDZcwx<}gxy8+@WNJJq!brG
z(<lk45;etw%F$8=1_liV1_owu83-yrA!*Z!fsug~UUo8oiaLG<P(g^b++$%R*&J+X
zfSC+)aKstO?!gwupt=e*$Vlda!uT@-149P`0|O5vj2S_-5-TK+VXe1lRlYJYFffbZ
mj6*DS64tQAqK=7$kyJm@s&0n+k(qQi(LCH)NOu#>!wCRV-GCeb

diff --git a/hardware/overheating/firmware/TIAS2781RCA4.bin.orig b/hardware/overheating/firmware/TIAS2781RCA4.bin.orig
deleted file mode 100644
index 8698e928e650cb56131767c6504791e1bbbc0007..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2740
zcmZQz;M%f`rJ|RCfsvJgfsrxQDRes{0|N^qBO@aN1h6nLFfD;##uNqyrY8{LkwYd`
z78ENKrRL_Br79%mCFbO(E2Jl8=8+Nr9E>cC9~c-IDi|0TxEL52SQr@ijxaFrJ1{WB
z++<)#5MW?oFkoQd(qmv`U}j+8Wn^Fwb6{W;Kf%Dnz{0>{0J4h_%;t~)u^AW`85kKj
zWEdb~8Vn8~QIJ|L4-g9?&J_U>2dQOXVqj!u<YQo9;9!90W@KPsVq(G~#*9Ub1&bIH
zaek7crJtCIa|2Dom4!Gr&@>!8je>Oz&5|-pbW@Wv@{3Z_Qj1dal2dhybMi~TsRxoO
z@R1zMER2hh(kL@Z8ik}!ElAo0rB4ACx}{OV?vkRlyRhXGM#Ao*d3a&XtAyP}^YFq}
zUZfNkK+`A*sS-8Cg38fS1_lNV1_lOZa2W_HKOt$;ih+@V6<&5SfQmYP22eqWwcKN2
zB-tEnX@Hpwb8y5N$?m}x#-O?iHONTjfx`GR0|P?`0|NsOB#aqBwGt~NkI}W>Vq#!m
r7Q-2bSn4FKVT(l_6AL4$exz0T4fi86>29J`y#{v^3+Zm6c{l+8r{#<s

diff --git a/hardware/overheating/overheating.nix b/hardware/overheating/overheating.nix
deleted file mode 100644
index 2cc5014..0000000
--- a/hardware/overheating/overheating.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  # special hardware modules
-  # mostly to fix firmare and dsts
-  imports = [ ./dsdt.nix ./firmware.nix ];
-}
diff --git a/hardware/overheating/ssdt6.aml b/hardware/overheating/ssdt6.aml
deleted file mode 100644
index d8cbadda6fec281fadd009acd8451d39c76cb2bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5404
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
OP;OpGM1Ci^2?GF58k;=;

diff --git a/hardware/server/configuration.nix b/hardware/server/configuration.nix
deleted file mode 100644
index 26e0a84..0000000
--- a/hardware/server/configuration.nix
+++ /dev/null
@@ -1,342 +0,0 @@
-{ config, pkgs, inputs, ... }:
-let
-  nextcloud_pw = (builtins.readFile /etc/nixos/nextcloud);
-  forgejo_pw = (builtins.readFile /etc/nixos/dbpw/forgejo);
-  matrix_pw = (builtins.readFile /etc/nixos/dbpw/matrix-synapse);
-  mautrix_signal_pw = (builtins.readFile /etc/nixos/dbpw/mautrix_signal);
-  mautrix_whatsapp_pw = (builtins.readFile /etc/nixos/dbpw/mautrix_whatsapp);
-  mautrix_discord_pw = (builtins.readFile /etc/nixos/dbpw/mautrix_discord);
-
-  fqdn = "matrix.${config.networking.domain}";
-  baseUrl = "https://${fqdn}";
-  clientConfig."m.homeserver".base_url = baseUrl;
-  serverConfig."m.server" = "${fqdn}:443";
-  mkWellKnown = data: ''
-    default_type application/json;
-    add_header Access-Control-Allow-Origin *;
-    return 200 '${builtins.toJSON data}';
-  '';
-in {
-  networking.hostName = "server";
-  networking.domain = "dashie.org";
-  imports = [
-    ./hardware-configuration.nix
-    ./mautrix-whatsapp.nix
-    ./mautrix-discord.nix
-  ];
-
-  # Use the systemd-boot EFI boot loader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.supportedFilesystems = [ "ntfs" ];
-
-  # Set your time zone.
-  time.timeZone = "Europe/Zurich";
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.root.hashedPassword = "!";
-  users.users.dashie = {
-    isNormalUser = true;
-    extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
-    packages = [
-      inputs.dashvim.nixosModules.packages."x86_64-linux".default
-      pkgs.fuse
-      pkgs.ntfs3g
-      pkgs.rsync
-    ];
-    openssh.authorizedKeys.keyFiles = [ /home/dashie/server.pub ];
-  };
-
-  services.openssh = {
-    enable = true;
-    settings.PasswordAuthentication = false;
-  };
-  services.mautrix-whatsapp-dashie.enable = true;
-  services.mautrix-discord-dashie.enable = true;
-  services.matrix-synapse.enable = true;
-  services.mautrix-signal.enable = true;
-  services.matrix-synapse.settings = {
-    server_name = "matrix.dashie.org";
-    database.name = "psycopg2";
-    database.args.user = "matrix-synapse";
-    database.args.password = "${matrix_pw}";
-    public_baseurl = "https://matrix.dashie.org";
-    enable_registration = true;
-    enable_registration_without_verification = true;
-    suppress_key_server_warning = true;
-    max_upload_size = "1G";
-    listeners = [{
-      port = 8008;
-      bind_addresses = [ "::1" ];
-      type = "http";
-      tls = false;
-      x_forwarded = true;
-      resources = [{
-        names = [ "client" "federation" ];
-        compress = true;
-      }];
-    }];
-  };
-  services.mautrix-whatsapp-dashie.settings = {
-    appservice = {
-      id = "whatsapp";
-      database = {
-        type = "postgres";
-        uri =
-          "postgresql:///mautrix_whatsapp?host=/run/postgresql&sslmode=disable&user=mautrix_whatsapp&password=${mautrix_whatsapp_pw}";
-      };
-    };
-    bridge = {
-      encryption = {
-        allow = true;
-        default = true;
-        required = true;
-      };
-      displayname_template =
-        "{{if .BusinessName}}{{.BusinessName}}{{else if .PushName}}{{.PushName}}{{else}}{{.JID}}{{end}}";
-      permissions = {
-        "@fabio.lenherr:matrix.org" = "admin";
-        "@dashie:matrix.dashie.org" = "admin";
-      };
-    };
-  };
-  services.mautrix-signal.settings = {
-    appservice = {
-      id = "signal";
-      database = {
-        type = "postgres";
-        uri =
-          "postgresql:///mautrix_signal?host=/run/postgresql&sslmode=disable&user=mautrix_signal&password=${mautrix_signal_pw}";
-      };
-    };
-    bridge = {
-      encryption = {
-        allow = true;
-        default = true;
-        required = true;
-      };
-      displayname_template =
-        ''{{or .ProfileName .PhoneNumber "Unknown user"}}'';
-      permissions = {
-        "@fabio.lenherr:matrix.org" = "admin";
-        "@dashie:matrix.dashie.org" = "admin";
-      };
-    };
-  };
-  services.mautrix-discord-dashie.settings = {
-    appservice = {
-      id = "discord";
-      database = {
-        type = "postgres";
-        uri =
-          "postgresql:///mautrix_discord?host=/run/postgresql&sslmode=disable&user=mautrix_discord&password=${mautrix_discord_pw}";
-      };
-    };
-    bridge = {
-      displayname_template =
-        "{{or .GlobalName .Username}}{{if .Bot}} (bot){{end}}";
-      permissions = {
-        "@fabio.lenherr:matrix.org" = "admin";
-        "@dashie:matrix.dashie.org" = "admin";
-      };
-    };
-  };
-  services.nginx = {
-    enable = true;
-    recommendedGzipSettings = true;
-    recommendedOptimisation = true;
-    recommendedProxySettings = true;
-    recommendedTlsSettings = true;
-  };
-  services.nginx.virtualHosts."dashie.org" = {
-    addSSL = true;
-    enableACME = true;
-    root = "/var/www/dashie.org/";
-  };
-  security.acme.certs."dashie.org".extraDomainNames = [
-    "cloud.dashie.org"
-    "matrix.dashie.org"
-    "git.dashie.org"
-    "navi.dashie.org"
-  ];
-  services.nginx.virtualHosts."cloud.dashie.org" = {
-    addSSL = true;
-    enableACME = true;
-    locations."/*".proxyPass = "http://127.0.0.1:12002";
-  };
-  services.nginx.virtualHosts."git.dashie.org" = {
-    forceSSL = true;
-    enableACME = true;
-    locations."/".proxyPass = "http://127.0.0.1:3000";
-  };
-  services.nginx.virtualHosts."navi.dashie.org" = {
-    addSSL = true;
-    enableACME = true;
-    locations."/".proxyPass = "http://127.0.0.1:4533";
-  };
-
-  services.nginx.virtualHosts."localhost" = {
-    listen = [{
-      addr = "0.0.0.0";
-      port = 8448;
-    }];
-    locations."/".proxyPass = "http://[::1]:8008";
-  };
-
-  services.nginx.virtualHosts."matrix.dashie.org" = {
-    forceSSL = true;
-    enableACME = true;
-    locations."/".extraConfig = ''
-      return 404;
-    '';
-    locations."/_matrix" = { proxyPass = "http://[::1]:8008"; };
-    locations."/_synapse/client".proxyPass = "http://[::1]:8008";
-
-    locations."= /.well-known/matrix/server".extraConfig =
-      mkWellKnown serverConfig;
-    # This is usually needed for homeserver discovery (from e.g. other Matrix clients).
-    # Further reference can be found in the upstream docs at
-    # https://spec.matrix.org/latest/client-server-api/#getwell-knownmatrixclient
-    locations."= /.well-known/matrix/client".extraConfig =
-      mkWellKnown clientConfig;
-    extraConfig = "client_max_body_size 2G;";
-  };
-
-  services.nextcloud.enable = true;
-  services.nextcloud.hostName = "cloud.dashie.org";
-  services.nextcloud.https = true;
-  services.nextcloud.config = {
-    adminpassFile = "/etc/nixos/file2";
-    dbuser = "nextcloud";
-    dbhost = "/run/postgresql";
-    dbname = "nextcloud";
-    dbtype = "pgsql";
-    dbpassFile = "/etc/nixos/nextcloud";
-  };
-  services.nextcloud.settings = {
-    port = 12001;
-    trusted_domains = [ "cloud.dashie.org" "192.168.1.23" ];
-  };
-  services.forgejo = {
-    enable = true;
-    database.passwordFile = /etc/nixos/dbpw/forgejo;
-    settings = {
-      server.DOMAIN = "git.dashie.org";
-      server.SSH_PORT = 12008;
-      server.SSH_LISTEN_PORT = 12008;
-      server.START_SSH_SERVER = true;
-      service.DISABLE_REGISTRATION = true;
-    };
-  };
-  services.navidrome.enable = true;
-  services.navidrome.settings = {
-    MusicFolder = "/var/lib/nextcloud/data/DashieTM/files/Share/Music";
-  };
-  systemd.services."nextcloud-setup" = {
-    requires = [ "postgresql.service" ];
-    after = [ "postgresql.service" ];
-  };
-  services.postgresql = {
-    enable = true;
-    authentication = pkgs.lib.mkOverride 10 ''
-      #type database  DBuser  auth-method
-      local all       all     trust
-      host  all       all   127.0.0.1/32   trust
-      host  all       all   ::1/128   trust
-    '';
-    initialScript = pkgs.writeText "backend-initScript" ''
-      CREATE DATABASE nextcloud;
-            CREATE USER nextcloud WITH ENCRYPTED PASSWORD '${nextcloud_pw}';
-            GRANT ALL PRIVILEGES ON DATABASE nextcloud TO nextcloud;
-
-      CREATE DATABASE forgejo;
-            CREATE USER forgejo WITH ENCRYPTED PASSWORD '${forgejo_pw}';
-            GRANT ALL PRIVILEGES ON DATABASE forgejo TO forgejo;
-
-
-      CREATE USER "matrix-synapse" WITH ENCRYPTED PASSWORD '${matrix_pw}'
-      SELECT 'CREATE DATABASE "matrix-synapse" LOCALE "C" ENCODING UTF8 TEMPLATE template0 OWNER "matrix-synapse"'
-      WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'matrix-synapse')\gexec
-
-      CREATE USER mautrix_whatsapp WITH ENCRYPTED PASSWORD '${mautrix_whatsapp_pw}'
-      SELECT 'CREATE DATABASE "mautrix_whatsapp" LOCALE "C" ENCODING UTF8 TEMPLATE template0 OWNER "mautrix_whatsapp"'
-      WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'mautrix_whatsapp')\gexec
-
-      CREATE USER mautrix_signal WITH ENCRYPTED PASSWORD '${mautrix_signal_pw}'
-      SELECT 'CREATE DATABASE "mautrix_signal" LOCALE "C" ENCODING UTF8 TEMPLATE template0 OWNER "mautrix_signal"'
-      WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'mautrix_signal')\gexec
-
-      CREATE USER mautrix_discord WITH ENCRYPTED PASSWORD '${mautrix_discord_pw}'
-      SELECT 'CREATE DATABASE "mautrix_discord" LOCALE "C" ENCODING UTF8 TEMPLATE template0 OWNER "mautrix_discord"'
-      WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'mautrix_discord')\gexec
-    '';
-  };
-  security.acme = {
-    acceptTerms = true;
-    defaults.email = "fabio.lenherr@gmail.com";
-  };
-
-  networking.firewall = {
-    enable = true;
-    allowedTCPPorts = [ 22 80 443 4534 8448 12002 12004 12006 12008 ];
-  };
-  networking.firewall.allowPing = true;
-  services.samba = {
-    enable = true;
-    securityType = "user";
-    openFirewall = true;
-    extraConfig = ''
-      workgroup = WORKGROUP
-      server string = smbnix
-      netbios name = smbnix
-      security = user 
-      #use sendfile = yes
-      max protocol = smb3
-      # note: localhost is the ipv6 localhost ::1
-      hosts allow = 192.168.1. 127.0.0.1 localhost
-      hosts deny = 0.0.0.0/0
-      guest account = nobody
-      map to guest = bad user
-    '';
-    shares = {
-      public = {
-        path = "/mnt/Shares/Public";
-        browseable = "yes";
-        "read only" = "no";
-        "guest ok" = "yes";
-        "create mask" = "0644";
-        "directory mask" = "0755";
-      };
-    };
-  };
-  services.samba-wsdd = {
-    enable = true;
-    openFirewall = true;
-  };
-  services.cron = {
-    enable = true;
-    systemCronJobs = [
-      "0 4 * * FRI      nobody    rsync -ato /var/lib/nextcloud/data /mnt/dump3/nextcloud"
-      "0 4 * * FRI      nobody    pg_dympall > /mnt/dump3/sqdump.sql"
-    ];
-  };
-
-  hardware.cpu.intel.updateMicrocode = true;
-  system.stateVersion = "24.05";
-
-  nix = {
-    settings = { experimental-features = "nix-command flakes"; };
-    extraOptions = ''
-      !include ${config.sops.secrets.access.path}
-    '';
-  };
-
-  sops = {
-    gnupg = {
-      home = "~/.gnupg";
-      sshKeyPaths = [ ];
-    };
-    defaultSopsFile = ../../secrets/secrets.yaml;
-    secrets.access = { };
-  };
-}
diff --git a/hardware/server/hardware-configuration.nix b/hardware/server/hardware-configuration.nix
deleted file mode 100644
index 660cf69..0000000
--- a/hardware/server/hardware-configuration.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{ config, lib, modulesPath, ... }: {
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot.initrd.availableKernelModules =
-    [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/678ecbd1-a5ce-4530-a959-ffb48f76aa43";
-    fsType = "btrfs";
-  };
-
-  fileSystems."/var/lib/nextcloud" = {
-    device = "/dev/disk/by-label/nextcloud";
-    fsType = "ext4";
-  };
-
-  fileSystems."/mnt/dump3" = {
-    device = "/dev/disk/by-label/backup";
-    fsType = "ext4";
-  };
-
-  fileSystems."/mnt/dump1" = {
-    device = "/dev/disk/by-uuid/CC60532860531912";
-    fsType = "ntfs-3g";
-    options = [ "rw" "uid=1000" ];
-  };
-
-  fileSystems."/mnt/dump2" = {
-    device = "/dev/disk/by-uuid/F46896AE68966EDC";
-    fsType = "ntfs-3g";
-    options = [ "rw" "uid=1000" ];
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/B7BE-AB1C";
-    fsType = "vfat";
-    options = [ "fmask=0022" "dmask=0022" ];
-  };
-
-  swapDevices =
-    [{ device = "/dev/disk/by-uuid/832dce11-b4c4-476c-ab28-bd98275a542c"; }];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode =
-    lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/hardware/server/mautrix-discord.nix b/hardware/server/mautrix-discord.nix
deleted file mode 100644
index 90bbe0b..0000000
--- a/hardware/server/mautrix-discord.nix
+++ /dev/null
@@ -1,247 +0,0 @@
-# derived from mautrix signal on nixpkgs -> https://github.com/NixOS/nixpkgs/blob/nixos-24.05/pkgs/servers/mautrix-signal/default.nix#L27
-{ lib, config, pkgs, ... }:
-let
-  cfg = config.services.mautrix-discord-dashie;
-  dataDir = "/var/lib/mautrix-discord";
-  registrationFile = "${dataDir}/discord-registration.yaml";
-  settingsFile = "${dataDir}/config.yaml";
-  settingsFileUnsubstituted =
-    settingsFormat.generate "mautrix-discord-config-unsubstituted.json"
-    cfg.settings;
-  settingsFormat = pkgs.formats.json { };
-  appservicePort = 29334;
-
-  # to be used with a list of lib.mkIf values
-  optOneOf = lib.lists.findFirst (value: value.condition) (lib.mkIf false null);
-  mkDefaults = lib.mapAttrsRecursive (n: v: lib.mkDefault v);
-  defaultConfig = {
-    homeserver.address = "http://localhost:8448";
-    appservice = {
-      hostname = "[::]";
-      port = appservicePort;
-      database.type = "sqlite3";
-      database.uri = "file:${dataDir}/mautrix-discord.db?_txlock=immediate";
-      id = "discord";
-      bot = {
-        username = "discordbot";
-        displayname = "Discord Bridge Bot";
-      };
-      as_token = "";
-      hs_token = "";
-    };
-    bridge = {
-      username_template = "discord_{{.}}";
-      displayname_template =
-        ''{{or .ProfileName .PhoneNumber "Unknown user"}}'';
-      double_puppet_server_map = { };
-      login_shared_secret_map = { };
-      command_prefix = "!discord";
-      permissions."*" = "relay";
-      relay.enabled = true;
-    };
-    logging = {
-      min_level = "info";
-      writers = lib.singleton {
-        type = "stdout";
-        format = "pretty-colored";
-        time_format = " ";
-      };
-    };
-  };
-
-in {
-  options.services.mautrix-discord-dashie = {
-    enable =
-      lib.mkEnableOption "mautrix-discord, a Matrix-Discord puppeting bridge.";
-
-    settings = lib.mkOption {
-      apply = lib.recursiveUpdate defaultConfig;
-      type = settingsFormat.type;
-      default = defaultConfig;
-      description = ''
-        {file}`config.yaml` configuration as a Nix attribute set.
-        Configuration options should match those described in
-        [example-config.yaml](https://github.com/mautrix/discord/blob/master/example-config.yaml).
-        Secret tokens should be specified using {option}`environmentFile`
-        instead of this world-readable attribute set.
-      '';
-      example = {
-        appservice = {
-          database = {
-            type = "postgres";
-            uri = "postgresql:///mautrix_discord?host=/run/postgresql";
-          };
-          id = "discord";
-          ephemeral_events = false;
-        };
-        bridge = {
-          history_sync = { request_full_sync = true; };
-          private_chat_portal_meta = true;
-          mute_bridging = true;
-          encryption = {
-            allow = true;
-            default = true;
-            require = true;
-          };
-          provisioning = { shared_secret = "disable"; };
-          permissions = { "example.com" = "user"; };
-        };
-      };
-    };
-
-    environmentFile = lib.mkOption {
-      type = lib.types.nullOr lib.types.path;
-      default = null;
-      description = ''
-        File containing environment variables to be passed to the mautrix-discord service.
-        If an environment variable `MAUTRIX_DISCORD_BRIDGE_LOGIN_SHARED_SECRET` is set,
-        then its value will be used in the configuration file for the option
-        `login_shared_secret_map` without leaking it to the store, using the configured
-        `homeserver.domain` as key.
-        See [here](https://github.com/mautrix/discord/blob/main/example-config.yaml)
-        for the documentation of `login_shared_secret_map`.
-      '';
-    };
-
-    serviceDependencies = lib.mkOption {
-      type = with lib.types; listOf str;
-      default = (lib.optional config.services.matrix-synapse.enable
-        config.services.matrix-synapse.serviceUnit)
-        ++ (lib.optional config.services.matrix-conduit.enable
-          "conduit.service");
-      defaultText = lib.literalExpression ''
-        (optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit)
-        ++ (optional config.services.matrix-conduit.enable "conduit.service")
-      '';
-      description = ''
-        List of systemd units to require and wait for when starting the application service.
-      '';
-    };
-
-    registerToSynapse = lib.mkOption {
-      type = lib.types.bool;
-      default = config.services.matrix-synapse.enable;
-      defaultText = lib.literalExpression ''
-        config.services.matrix-synapse.enable
-      '';
-      description = ''
-        Whether to add the bridge's app service registration file to
-        `services.matrix-synapse.settings.app_service_config_files`.
-      '';
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-
-    users.users.mautrix-discord = {
-      isSystemUser = true;
-      group = "mautrix-discord";
-      home = dataDir;
-      description = "mautrix-discord bridge user";
-    };
-
-    users.groups.mautrix-discord = { };
-
-    services.matrix-synapse = lib.mkIf cfg.registerToSynapse {
-      settings.app_service_config_files = [ registrationFile ];
-    };
-    systemd.services.matrix-synapse = lib.mkIf cfg.registerToSynapse {
-      serviceConfig.SupplementaryGroups = [ "mautrix-discord" ];
-    };
-
-    # Note: this is defined here to avoid the docs depending on `config`
-    services.mautrix-discord-dashie.settings.homeserver = optOneOf
-      (with config.services; [
-        (lib.mkIf matrix-synapse.enable
-          (mkDefaults { domain = matrix-synapse.settings.server_name; }))
-        (lib.mkIf matrix-conduit.enable (mkDefaults {
-          domain = matrix-conduit.settings.global.server_name;
-          address =
-            "http://localhost:${toString matrix-conduit.settings.global.port}";
-        }))
-      ]);
-
-    systemd.services.mautrix-discord-dashie = {
-      description = "mautrix-discord, a Matrix-Discord puppeting bridge.";
-
-      wantedBy = [ "multi-user.target" ];
-      wants = [ "network-online.target" ] ++ cfg.serviceDependencies;
-      after = [ "network-online.target" ] ++ cfg.serviceDependencies;
-      # ffmpeg is required for conversion of voice messages
-      path = [ pkgs.ffmpeg-headless ];
-
-      preStart = ''
-        # substitute the settings file by environment variables
-        # in this case read from EnvironmentFile
-        test -f '${settingsFile}' && rm -f '${settingsFile}'
-        old_umask=$(umask)
-        umask 0177
-        ${pkgs.envsubst}/bin/envsubst \
-          -o '${settingsFile}' \
-          -i '${settingsFileUnsubstituted}'
-        umask $old_umask
-
-        # generate the appservice's registration file if absent
-        if [ ! -f '${registrationFile}' ]; then
-          ${pkgs.mautrix-discord}/bin/mautrix-discord \
-            --generate-registration \
-            --config='${settingsFile}' \
-            --registration='${registrationFile}'
-        fi
-        chmod 640 ${registrationFile}
-
-        umask 0177
-        # 1. Overwrite registration tokens in config
-        # 2. If environment variable MAUTRIX_DISCORD_BRIDGE_LOGIN_SHARED_SECRET
-        #    is set, set it as the login shared secret value for the configured
-        #    homeserver domain.
-        ${pkgs.yq}/bin/yq -s '.[0].appservice.as_token = .[1].as_token
-          | .[0].appservice.hs_token = .[1].hs_token
-          | .[0]
-          | if env.MAUTRIX_DISCORD_BRIDGE_LOGIN_SHARED_SECRET then .bridge.login_shared_secret_map.[.homeserver.domain] = env.MAUTRIX_DISCORD_BRIDGE_LOGIN_SHARED_SECRET else . end' \
-          '${settingsFile}' '${registrationFile}' > '${settingsFile}.tmp'
-        mv '${settingsFile}.tmp' '${settingsFile}'
-        umask $old_umask
-      '';
-
-      serviceConfig = {
-        User = "mautrix-discord";
-        Group = "mautrix-discord";
-        EnvironmentFile = cfg.environmentFile;
-        StateDirectory = baseNameOf dataDir;
-        WorkingDirectory = dataDir;
-        ExecStart = ''
-          ${pkgs.mautrix-discord}/bin/mautrix-discord \
-          --config='${settingsFile}' \
-          --registration='${registrationFile}'
-        '';
-        LockPersonality = true;
-        MemoryDenyWriteExecute = true;
-        NoNewPrivileges = true;
-        PrivateDevices = true;
-        PrivateTmp = true;
-        PrivateUsers = true;
-        ProtectClock = true;
-        ProtectControlGroups = true;
-        ProtectHome = true;
-        ProtectHostname = true;
-        ProtectKernelLogs = true;
-        ProtectKernelModules = true;
-        ProtectKernelTunables = true;
-        ProtectSystem = "strict";
-        Restart = "on-failure";
-        RestartSec = "30s";
-        RestrictRealtime = true;
-        RestrictSUIDSGID = true;
-        SystemCallArchitectures = "native";
-        SystemCallErrorNumber = "EPERM";
-        SystemCallFilter = [ "@system-service" ];
-        Type = "simple";
-        UMask = 27;
-      };
-      restartTriggers = [ settingsFileUnsubstituted ];
-    };
-  };
-  meta.maintainers = with lib.maintainers; [ niklaskorz ];
-}
-
diff --git a/hardware/server/mautrix-whatsapp.nix b/hardware/server/mautrix-whatsapp.nix
deleted file mode 100644
index 82696f6..0000000
--- a/hardware/server/mautrix-whatsapp.nix
+++ /dev/null
@@ -1,247 +0,0 @@
-# derived from mautrix signal on nixpkgs -> https://github.com/NixOS/nixpkgs/blob/nixos-24.05/pkgs/servers/mautrix-signal/default.nix#L27
-{ lib, config, pkgs, ... }:
-let
-  cfg = config.services.mautrix-whatsapp-dashie;
-  dataDir = "/var/lib/mautrix-whatsapp";
-  registrationFile = "${dataDir}/whatsapp-registration.yaml";
-  settingsFile = "${dataDir}/config.yaml";
-  settingsFileUnsubstituted =
-    settingsFormat.generate "mautrix-whatsapp-config-unsubstituted.json"
-    cfg.settings;
-  settingsFormat = pkgs.formats.json { };
-  appservicePort = 29318;
-
-  # to be used with a list of lib.mkIf values
-  optOneOf = lib.lists.findFirst (value: value.condition) (lib.mkIf false null);
-  mkDefaults = lib.mapAttrsRecursive (n: v: lib.mkDefault v);
-  defaultConfig = {
-    homeserver.address = "http://localhost:8448";
-    appservice = {
-      hostname = "[::]";
-      port = appservicePort;
-      database.type = "sqlite3";
-      database.uri = "file:${dataDir}/mautrix-whatsapp.db?_txlock=immediate";
-      id = "whatsapp";
-      bot = {
-        username = "whatsappbot";
-        displayname = "Whatsapp Bridge Bot";
-      };
-      as_token = "";
-      hs_token = "";
-    };
-    bridge = {
-      username_template = "whatsapp_{{.}}";
-      displayname_template =
-        ''{{or .ProfileName .PhoneNumber "Unknown user"}}'';
-      double_puppet_server_map = { };
-      login_shared_secret_map = { };
-      command_prefix = "!whatsapp";
-      permissions."*" = "relay";
-      relay.enabled = true;
-    };
-    logging = {
-      min_level = "info";
-      writers = lib.singleton {
-        type = "stdout";
-        format = "pretty-colored";
-        time_format = " ";
-      };
-    };
-  };
-
-in {
-  options.services.mautrix-whatsapp-dashie = {
-    enable = lib.mkEnableOption
-      "mautrix-whatsapp, a Matrix-Whatsapp puppeting bridge.";
-
-    settings = lib.mkOption {
-      apply = lib.recursiveUpdate defaultConfig;
-      type = settingsFormat.type;
-      default = defaultConfig;
-      description = ''
-        {file}`config.yaml` configuration as a Nix attribute set.
-        Configuration options should match those described in
-        [example-config.yaml](https://github.com/mautrix/whatsapp/blob/master/example-config.yaml).
-        Secret tokens should be specified using {option}`environmentFile`
-        instead of this world-readable attribute set.
-      '';
-      example = {
-        appservice = {
-          database = {
-            type = "postgres";
-            uri = "postgresql:///mautrix_whatsapp?host=/run/postgresql";
-          };
-          id = "whatsapp";
-          ephemeral_events = false;
-        };
-        bridge = {
-          history_sync = { request_full_sync = true; };
-          private_chat_portal_meta = true;
-          mute_bridging = true;
-          encryption = {
-            allow = true;
-            default = true;
-            require = true;
-          };
-          provisioning = { shared_secret = "disable"; };
-          permissions = { "example.com" = "user"; };
-        };
-      };
-    };
-
-    environmentFile = lib.mkOption {
-      type = lib.types.nullOr lib.types.path;
-      default = null;
-      description = ''
-        File containing environment variables to be passed to the mautrix-whatsapp service.
-        If an environment variable `MAUTRIX_WHATSAPP_BRIDGE_LOGIN_SHARED_SECRET` is set,
-        then its value will be used in the configuration file for the option
-        `login_shared_secret_map` without leaking it to the store, using the configured
-        `homeserver.domain` as key.
-        See [here](https://github.com/mautrix/whatsapp/blob/main/example-config.yaml)
-        for the documentation of `login_shared_secret_map`.
-      '';
-    };
-
-    serviceDependencies = lib.mkOption {
-      type = with lib.types; listOf str;
-      default = (lib.optional config.services.matrix-synapse.enable
-        config.services.matrix-synapse.serviceUnit)
-        ++ (lib.optional config.services.matrix-conduit.enable
-          "conduit.service");
-      defaultText = lib.literalExpression ''
-        (optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit)
-        ++ (optional config.services.matrix-conduit.enable "conduit.service")
-      '';
-      description = ''
-        List of systemd units to require and wait for when starting the application service.
-      '';
-    };
-
-    registerToSynapse = lib.mkOption {
-      type = lib.types.bool;
-      default = config.services.matrix-synapse.enable;
-      defaultText = lib.literalExpression ''
-        config.services.matrix-synapse.enable
-      '';
-      description = ''
-        Whether to add the bridge's app service registration file to
-        `services.matrix-synapse.settings.app_service_config_files`.
-      '';
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-
-    users.users.mautrix-whatsapp = {
-      isSystemUser = true;
-      group = "mautrix-whatsapp";
-      home = dataDir;
-      description = "mautrix-whatsapp bridge user";
-    };
-
-    users.groups.mautrix-whatsapp = { };
-
-    services.matrix-synapse = lib.mkIf cfg.registerToSynapse {
-      settings.app_service_config_files = [ registrationFile ];
-    };
-    systemd.services.matrix-synapse = lib.mkIf cfg.registerToSynapse {
-      serviceConfig.SupplementaryGroups = [ "mautrix-whatsapp" ];
-    };
-
-    # Note: this is defined here to avoid the docs depending on `config`
-    services.mautrix-whatsapp-dashie.settings.homeserver = optOneOf
-      (with config.services; [
-        (lib.mkIf matrix-synapse.enable
-          (mkDefaults { domain = matrix-synapse.settings.server_name; }))
-        (lib.mkIf matrix-conduit.enable (mkDefaults {
-          domain = matrix-conduit.settings.global.server_name;
-          address =
-            "http://localhost:${toString matrix-conduit.settings.global.port}";
-        }))
-      ]);
-
-    systemd.services.mautrix-whatsapp-dashie = {
-      description = "mautrix-whatsapp, a Matrix-Whatsapp puppeting bridge.";
-
-      wantedBy = [ "multi-user.target" ];
-      wants = [ "network-online.target" ] ++ cfg.serviceDependencies;
-      after = [ "network-online.target" ] ++ cfg.serviceDependencies;
-      # ffmpeg is required for conversion of voice messages
-      path = [ pkgs.ffmpeg-headless ];
-
-      preStart = ''
-        # substitute the settings file by environment variables
-        # in this case read from EnvironmentFile
-        test -f '${settingsFile}' && rm -f '${settingsFile}'
-        old_umask=$(umask)
-        umask 0177
-        ${pkgs.envsubst}/bin/envsubst \
-          -o '${settingsFile}' \
-          -i '${settingsFileUnsubstituted}'
-        umask $old_umask
-
-        # generate the appservice's registration file if absent
-        if [ ! -f '${registrationFile}' ]; then
-          ${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp \
-            --generate-registration \
-            --config='${settingsFile}' \
-            --registration='${registrationFile}'
-        fi
-        chmod 640 ${registrationFile}
-
-        umask 0177
-        # 1. Overwrite registration tokens in config
-        # 2. If environment variable MAUTRIX_WHATSAPP_BRIDGE_LOGIN_SHARED_SECRET
-        #    is set, set it as the login shared secret value for the configured
-        #    homeserver domain.
-        ${pkgs.yq}/bin/yq -s '.[0].appservice.as_token = .[1].as_token
-          | .[0].appservice.hs_token = .[1].hs_token
-          | .[0]
-          | if env.MAUTRIX_WHATSAPP_BRIDGE_LOGIN_SHARED_SECRET then .bridge.login_shared_secret_map.[.homeserver.domain] = env.MAUTRIX_WHATSAPP_BRIDGE_LOGIN_SHARED_SECRET else . end' \
-          '${settingsFile}' '${registrationFile}' > '${settingsFile}.tmp'
-        mv '${settingsFile}.tmp' '${settingsFile}'
-        umask $old_umask
-      '';
-
-      serviceConfig = {
-        User = "mautrix-whatsapp";
-        Group = "mautrix-whatsapp";
-        EnvironmentFile = cfg.environmentFile;
-        StateDirectory = baseNameOf dataDir;
-        WorkingDirectory = dataDir;
-        ExecStart = ''
-          ${pkgs.mautrix-whatsapp}/bin/mautrix-whatsapp \
-          --config='${settingsFile}' \
-          --registration='${registrationFile}'
-        '';
-        LockPersonality = true;
-        MemoryDenyWriteExecute = true;
-        NoNewPrivileges = true;
-        PrivateDevices = true;
-        PrivateTmp = true;
-        PrivateUsers = true;
-        ProtectClock = true;
-        ProtectControlGroups = true;
-        ProtectHome = true;
-        ProtectHostname = true;
-        ProtectKernelLogs = true;
-        ProtectKernelModules = true;
-        ProtectKernelTunables = true;
-        ProtectSystem = "strict";
-        Restart = "on-failure";
-        RestartSec = "30s";
-        RestrictRealtime = true;
-        RestrictSUIDSGID = true;
-        SystemCallArchitectures = "native";
-        SystemCallErrorNumber = "EPERM";
-        SystemCallFilter = [ "@system-service" ];
-        Type = "simple";
-        UMask = 27;
-      };
-      restartTriggers = [ settingsFileUnsubstituted ];
-    };
-  };
-  meta.maintainers = with lib.maintainers; [ niklaskorz ];
-}
-
diff --git a/hardware/spaceship/configuration.nix b/hardware/spaceship/configuration.nix
deleted file mode 100644
index cf6c08c..0000000
--- a/hardware/spaceship/configuration.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-{ config, ... }:
-let username = config.conf.username;
-in {
-  imports = [ ../../modules ];
-
-  # config variables
-  conf = {
-    monitor = "DP-1";
-    streamdeck.enable = false;
-    hostname = "spaceship";
-  };
-  mods = {
-    # f to pay respect
-    teams.enable = true;
-    coding = { jetbrains = true; };
-    gaming = { enable = true; };
-    stylix.colorscheme = "catppuccin-mocha";
-    hyprland = {
-      monitor = [
-        # default
-        "DP-2,2560x1440@165,0x0,1"
-        "DP-1,3440x1440@180,2560x0,1,vrr,0"
-        "DP-3,1920x1080@144,6000x0,1"
-        "DP-3,transform,1"
-
-        # all others
-        ",highrr,auto,1"
-      ];
-
-      workspace = [
-        # workspaces
-        # monitor middle
-        "2,monitor:DP-1, default:true"
-        "4,monitor:DP-1"
-        "6,monitor:DP-1"
-        "8,monitor:DP-1"
-        "9,monitor:DP-1"
-        "10,monitor:DP-1"
-
-        # monitor left
-        "1,monitor:DP-2, default:true"
-        "5,monitor:DP-2"
-        "7,monitor:DP-2"
-
-        # monitor right
-        "3,monitor:DP-3, default:true"
-      ];
-      hyprpaper.config = ''
-        #load
-        preload = /home/${username}/Pictures/backgrounds/shinobu_2k.jpg
-        preload = /home/${username}/Pictures/backgrounds/shino_wide.png
-        preload = /home/${username}/Pictures/backgrounds/shinobu_1080.jpg
-
-        #set
-        wallpaper = DP-2,/home/${username}/Pictures/backgrounds/shinobu_2k.jpg
-        wallpaper = DP-1,/home/${username}/Pictures/backgrounds/shino_wide.png
-        wallpaper = DP-3,/home/${username}/Pictures/backgrounds/shinobu_1080.jpg
-        splash = true
-      '';
-      extra_autostart = [ "flatpak run com.core447.StreamController -b" ];
-    };
-    extraDrives = [{
-      name = "drive2";
-      drive = {
-        device = "/dev/disk/by-label/DRIVE2";
-        fsType = "ext4";
-        options = [ "noatime" "nodiratime" "discard" ];
-      };
-    }];
-    virtualbox.enable = true;
-    kde_connect.enable = true;
-    xone.enable = true;
-    amdgpu.enable = true;
-    piper.enable = true;
-    flatpak.additional_packages = [ "com.core447.StreamController" ];
-    vapi = {
-      enable = true;
-      rocm.enable = true;
-    };
-    greetd = { resolution = "3440x1440@180"; };
-    nextcloud = {
-      synclist = [
-        {
-          name = "document_sync";
-          remote = "/Documents";
-          local = "/home/${config.conf.username}/Documents";
-        }
-        {
-          name = "picture_sync";
-          remote = "/Pictures";
-          local = "/home/${config.conf.username}/Pictures";
-        }
-        {
-          name = "phone_sync";
-          remote = "Phone/Stuff";
-          local = "/home/${config.conf.username}/Videos/Phone/Stuff";
-        }
-        {
-          name = "pw_sync";
-          remote = "PWs";
-          local = "/home/${config.conf.username}/Music";
-        }
-      ];
-    };
-  };
-}
diff --git a/lib/default.nix b/lib/default.nix
index 9472ccd..0e075fc 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,8 +1,12 @@
-{ inputs, pkgs, ... }: {
-  build_systems = systems:
+{ inputs, pkgs, ... }:
+let
+in {
+  build_systems = systems: root:
     builtins.listToAttrs (map (name: {
       name = name;
-      value = let mod = ../hardware/${name}/configuration.nix;
+      value = let
+        mod = root + /${name}/configuration.nix;
+        additionalConfig = root + /${name}/${name}.nix;
       in inputs.nixpkgs.lib.nixosSystem {
         specialArgs = { inherit inputs pkgs mod; };
         modules = [
@@ -10,10 +14,10 @@
           inputs.stylix.nixosModules.stylix
           ../base
           ../programs
+          ../modules
           mod
-        ] ++ inputs.nixpkgs.lib.optional
-          (builtins.pathExists ../hardware/${name}/${name}.nix)
-          ../hardware/${name}/${name}.nix
+        ] ++ inputs.nixpkgs.lib.optional (builtins.pathExists additionalConfig)
+          additionalConfig
           ++ inputs.nixpkgs.lib.optional (builtins.pathExists mod) mod;
       };
     }) systems);
diff --git a/modules/conf.nix b/modules/conf.nix
index 4f6e334..c730f54 100644
--- a/modules/conf.nix
+++ b/modules/conf.nix
@@ -101,6 +101,16 @@
       '';
     };
 
+    build-command = lib.mkOption {
+      default =
+        "sudo nixos-rebuild switch --flake /home/${config.conf.username}/gits/dotFiles/.";
+      example = "yourpath/.";
+      type = lib.types.str;
+      description = ''
+        The path for your build command, you can then simply type rebuild to switch to a new configuration.
+      '';
+    };
+
     nvim-colorscheme = lib.mkOption {
       default = { tokyonight = { enable = true; }; };
       example = { catppuccin = { enable = true; }; };
diff --git a/modules/programs/home_packages.nix b/modules/programs/home_packages.nix
index 81a0c34..0967394 100644
--- a/modules/programs/home_packages.nix
+++ b/modules/programs/home_packages.nix
@@ -28,6 +28,7 @@
         kitty
         fish
         ripgrep
+        # TODO add fcp once fixed....
         rm-improved
         bat
         fd
diff --git a/programs/default.nix b/programs/default.nix
index f54dc0d..48643cf 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -14,6 +14,7 @@ let
     inputs.nix-flatpak.homeManagerModules.nix-flatpak
     inputs.sops-nix.homeManagerModules.sops
     inputs.dashvim.homeManagerModules.dashvim
+    ../modules
   ];
 in {
   xdg = {
diff --git a/programs/individual_configs/fish.nix b/programs/individual_configs/fish.nix
index 8f3fd64..9acd841 100644
--- a/programs/individual_configs/fish.nix
+++ b/programs/individual_configs/fish.nix
@@ -14,7 +14,7 @@
 
       set EDITOR "neovide --no-fork"
 
-      alias rebuild='sudo nixos-rebuild switch --flake /home/${config.conf.username}/gits/dotFiles/.'
+      alias rebuild='${config.conf.build-command}'
       abbr --add ls 'lsd'
       abbr --add :q 'exit'
       abbr --add gh 'git push origin'