From b896f4bc572ae4de3c4fea212fb87128b2a144d7 Mon Sep 17 00:00:00 2001
From: martyTF <marty@marty.tf>
Date: Fri, 15 May 2026 21:53:47 +0200
Subject: [PATCH] laptop != server

---
 hosts/marty-latitude/custom.nix  |  87 +------------------
 hosts/marty-latitude/options.nix | 138 +------------------------------
 modules/device/laptop.nix        | 136 +++++++++++++++++++++++++++++-
 3 files changed, 139 insertions(+), 222 deletions(-)

diff --git a/hosts/marty-latitude/custom.nix b/hosts/marty-latitude/custom.nix
index 0520a60..33538d2 100644
--- a/hosts/marty-latitude/custom.nix
+++ b/hosts/marty-latitude/custom.nix
@@ -1,93 +1,10 @@
 {
   config,
+  lib,
   pkgs,
-  inputs,
   ...
 }:
 
-let
-  domain = "http://marty-server";
-  netname = "tamatas-upcycling";
-  ipv4host = "192.168.101.10";
-  ipv4local = "192.168.101.11";
-  ipv6host = "fc00::101:1";
-  ipv6local = "fc00::101:2";
-  porthost1 = 9001;
-  portlocal1 = 80;
-
-in
-
 {
-
-  networking = {
-    hosts = {
-      ipv4local = [ netname ];
-      ipv6local = [ netname ];
-    };
-  };
-
-  containers.tamatas-upcycling = {
-    autoStart = true;
-    privateNetwork = true;
-    hostAddress = ipv4host;
-    localAddress = ipv4local;
-    hostAddress6 = ipv6host;
-    localAddress6 = ipv6local;
-    forwardPorts = [
-      {
-        hostPort = porthost1;
-        containerPort = portlocal1;
-      }
-    ];
-    bindMounts = {
-    };
-
-    config =
-      {
-        config,
-        pkgs,
-        lib,
-        ...
-      }:
-      {
-
-        users = {
-          users = {
-            marty = {
-              group = "users";
-              isSystemUser = true;
-            };
-          };
-          groups = {
-            users = { };
-          };
-        };
-
-        services = {
-          wordpress.sites."tamatas-upcycling.de" = {
-            languages = [ pkgs.wordpressPackages.languages.de_DE ];
-            settings = {
-              WPLANG = "de_DE";
-              WP_SITEURL = domain;
-              WP_HOME = domain;
-            };
-          };
-          phpfpm.pools."wordpress-tamatas-upcycling.de".phpOptions = ''
-            upload_max_filesize=1G
-            post_max_size=1G
-          '';
-          resolved.enable = true;
-        };
-
-        networking = {
-          firewall = {
-            enable = true;
-            allowedTCPPorts = [ portlocal1 ];
-          };
-          useHostResolvConf = lib.mkForce false;
-        };
-
-        system.stateVersion = "25.05";
-      };
-  };
+  services.flatpak.enable = true;
 }
diff --git a/hosts/marty-latitude/options.nix b/hosts/marty-latitude/options.nix
index f572036..23f349b 100644
--- a/hosts/marty-latitude/options.nix
+++ b/hosts/marty-latitude/options.nix
@@ -6,9 +6,6 @@
 }:
 
 {
-  imports = [
-    ../../modules/device/server.nix
-  ];
   config = {
     user = {
       userName = "marty";
@@ -18,139 +15,8 @@
       timezone = "Europe/Berlin";
       language = "en_GB.UTF-8";
       locale = "de_DE.UTF-8";
-      hostname = "marty-server";
-    };
-    apps = {
-      audio = {
-        base.enable = true;
-        media.enable = false;
-        editing.enable = false;
-      };
-      development = {
-        editor = {
-          vscodium.enable = false;
-          emacs.enable = true;
-          default = "emacs";
-        };
-        languages = {
-          python.enable = true;
-        };
-        godot.enable = false;
-      };
-      gaming = {
-        enable = true;
-        steam.enable = false;
-        minecraft.enable = false;
-      };
-      image = {
-        base.enable = true;
-        editing.enable = false;
-      };
-      internet = {
-        browsers = {
-          zen-browser.enable = false;
-          tor-browser.enable = false;
-          default = "lynx";
-        };
-        mail = {
-          enable = false;
-          providers = {
-            protonmail.enable = true;
-          };
-        };
-      };
-      messaging = {
-        signal.enable = false;
-        element = {
-          enable = false;
-          selfhosted = false;
-        };
-      };
-      misc = {
-        obsidian.enable = false;
-        bitwarden.enable = false;
-        blender.enable = false;
-      };
-      sync = {
-        kde-connect.enable = true;
-        nextcloud.enable = false;
-        syncthing = {
-          enable = true;
-          devices = {
-            marty-pc = {
-              id = "6PJZD52-EEWIO7U-MZMJJ5B-33DGNSU-O7DJVRT-GAE7QZG-ZY3VIMV-VSMBDQP";
-              autoAcceptFolder = true;
-            };
-            marty-server = {
-              id = "UDMXEKZ-HYIFI5S-VAKE75O-K3C65QV-LS43QA5-3JTHWKL-CI5C3Y6-P4NSQQM";
-              autoAcceptFolders = true;
-            };
-            marty-latitude = {
-              id = "SOAWHKA-BCQGO5G-IJ24WTO-RDETP5M-LNTVO66-MHIOUU2-NNQ57P6-FFKNSA6";
-              autoAcceptFolders = true;
-            };
-            marty-thinkpad = {
-              id = "NWHFQSW-FOBGFLV-YMZR77Q-KNRR3YC-4C6PKXT-TTPDCOL-CDB6QX4-3QJE2AN";
-              autoAcceptFolders = true;
-            };
-            marty-pixel = {
-              id = "GSBXOGW-6SYLDUQ-HPH7FBJ-CKHWQIK-K5YORB4-CYKGYT6-DLCVSAK-LA2RMAK";
-              autoAcceptFolders = true;
-            };
-            marty-fairphone = {
-              id = "2ISVWQV-4USY5IA-2OU55CE-Q7VLPD7-4RVQ5WX-FXQSJMY-2ES4EZG-IGFB7QG";
-              autoAcceptFolders = true;
-            };
-          };
-        };
-      };
-      terminal = {
-        kitty = {
-          enable = true;
-        };
-        default = "kitty";
-        tui = {
-          ranger.enable = true;
-        };
-        toys = true;
-      };
-      video = {
-        base.enable = true;
-        media.enable = false;
-        editing.enable = false;
-      };
-    };
-    desktop = {
-      window-managers = {
-        hyprland = {
-          enable = false;
-        };
-        niri = {
-          enable = false;
-        };
-        sway = {
-          enable = false;
-        };
-      };
-      shell = {
-        noctalia = {
-          enable = false;
-        };
-        swww = {
-          enable = false;
-        };
-        walker = {
-          enable = false;
-        };
-        waybar = {
-          enable = false;
-        };
-      };
-      utilities = {
-        grimblast = {
-          enable = false;
-        };
-      };
+      hostname = "marty-latitude";
     };
+    device.type = "laptop";
   };
 }
diff --git a/modules/device/laptop.nix b/modules/device/laptop.nix
index 2085aba..3c30b9e 100644
--- a/modules/device/laptop.nix
+++ b/modules/device/laptop.nix
@@ -6,5 +6,139 @@
 }:
 
 {
-  config = { };
+  config = {
+    apps = {
+      audio = {
+        base.enable = true;
+        media.enable = true;
+        editing.enable = false;
+      };
+      development = {
+        editor = {
+          vscodium.enable = true;
+          emacs.enable = true;
+          neovim.enable = true;
+          zed.enable = false;
+          default = "codium";
+        };
+        languages = {
+          python.enable = true;
+        };
+        godot.enable = true;
+      };
+      gaming = {
+        enable = false;
+        steam.enable = false;
+        minecraft.enable = false;
+      };
+      image = {
+        base.enable = true;
+        editing.enable = false;
+      };
+      internet = {
+        browsers = {
+          zen-browser.enable = true;
+          tor-browser.enable = true;
+          default = "zen";
+        };
+        mail = {
+          enable = true;
+          providers = {
+            protonmail.enable = true;
+          };
+        };
+      };
+      messaging = {
+        signal.enable = true;
+        element = {
+          enable = true;
+          selfhosted = true;
+        };
+      };
+      misc = {
+        obsidian.enable = true;
+        bitwarden.enable = true;
+        blender.enable = false;
+      };
+      sync = {
+        kde-connect.enable = true;
+        nextcloud.enable = true;
+        syncthing = {
+          devices = {
+            marty-pc = {
+              id = "6PJZD52-EEWIO7U-MZMJJ5B-33DGNSU-O7DJVRT-GAE7QZG-ZY3VIMV-VSMBDQP";
+              autoAcceptFolder = true;
+            };
+            marty-server = {
+              id = "UDMXEKZ-HYIFI5S-VAKE75O-K3C65QV-LS43QA5-3JTHWKL-CI5C3Y6-P4NSQQM";
+              autoAcceptFolders = true;
+            };
+            marty-latitude = {
+              id = "SOAWHKA-BCQGO5G-IJ24WTO-RDETP5M-LNTVO66-MHIOUU2-NNQ57P6-FFKNSA6";
+              autoAcceptFolders = true;
+            };
+            marty-thinkpad = {
+              id = "NWHFQSW-FOBGFLV-YMZR77Q-KNRR3YC-4C6PKXT-TTPDCOL-CDB6QX4-3QJE2AN";
+              autoAcceptFolders = true;
+            };
+            marty-pixel = {
+              id = "GSBXOGW-6SYLDUQ-HPH7FBJ-CKHWQIK-K5YORB4-CYKGYT6-DLCVSAK-LA2RMAK";
+              autoAcceptFolders = true;
+            };
+            marty-fairphone = {
+              id = "2ISVWQV-4USY5IA-2OU55CE-Q7VLPD7-4RVQ5WX-FXQSJMY-2ES4EZG-IGFB7QG";
+              autoAcceptFolders = true;
+            };
+          };
+        };
+      };
+      terminal = {
+        kitty = {
+          enable = true;
+        };
+        default = "kitty";
+        tui = {
+          ranger.enable = true;
+        };
+        toys = true;
+      };
+      video = {
+        base.enable = true;
+        media.enable = false;
+        editing.enable = false;
+      };
+    };
+    desktop = {
+      window-managers = {
+        hyprland = {
+          enable = false;
+        };
+        niri = {
+          enable = true;
+        };
+        sway = {
+          enable = false;
+        };
+      };
+      shell = {
+        noctalia = {
+          enable = true;
+        };
+        swww = {
+          enable = false;
+        };
+        walker = {
+          enable = true;
+        };
+        waybar = {
+          enable = false;
+        };
+      };
+      utilities = {
+        grimblast = {
+          enable = true;
+        };
+      };
+    };
+  };
 }