2 files changed, 69 insertions, 72 deletions
diff --git a/hosts/thinklappi/default.nix b/hosts/thinklappi/default.nix
index 5019f10..8a2fe78 100644
--- a/hosts/thinklappi/default.nix
+++ b/hosts/thinklappi/default.nix
@@ -1,3 +1,70 @@
-{...}: {
-  thinklappi = import ./thinklappi.nix;
+{
+  config,
+  pkgs,
+  ...
+}: let
+  compiledLayout = pkgs.runCommand "keyboard-layout" {} ''
+    ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${../../files/neoqwertz.xkb} $out
+  '';
+in {
+  imports = [
+    ./basesystem.nix
+    ../../common/environment
+    ../../common/nix
+    ../../common/packages
+    ../../common/users
+    ../../services/zsh
+    ../../services/flatpak # Mainly for minecraft
+
+    # Desktop Environment to use
+    ../../desktop/gnome
+  ];
+
+  services = {
+    printing.enable = true;
+    xserver = {
+      layout = "de";
+      #xkbVariant = ",neo";
+      xkbOptions = "grp:win_space_toggle";
+      displayManager.sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY";
+    };
+    pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      jack.enable = true;
+    };
+  };
+
+  hardware = {
+    bluetooth.enable = true;
+    pulseaudio.enable = false;
+  };
+  security.rtkit.enable = true;
+
+  environment.systemPackages = [pkgs.xorg.xkbcomp];
+
+  i18n.defaultLocale = "en_US.UTF-8";
+
+  networking = {
+    hostName = "thinklappi";
+    nameservers = ["2620:fe::fe" "2620:fe::9" "9.9.9.9" "149.112.112.112"];
+    networkmanager = {
+      enable = true;
+      dns = "none";
+    };
+  };
+
+  time.timeZone = "Europe/Berlin";
+
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "de";
+    #useXkbConfig = true; # use xkbOptions in tty.
+  };
+
+  programs.ssh.startAgent = true;
+
+  system.stateVersion = "23.05";
 }
diff --git a/hosts/thinklappi/thinklappi.nix b/hosts/thinklappi/thinklappi.nix
deleted file mode 100644
index 05909b9..0000000
--- a/hosts/thinklappi/thinklappi.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: let
-  compiledLayout = pkgs.runCommand "keyboard-layout" {} ''
-    ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${../../files/neoqwertz.xkb} $out
-  '';
-in {
-  imports = [
-    ./basesystem.nix
-    ../../env.nix
-    ../../nix.nix
-    ../../packages.nix
-    ../../users.nix
-    ../../zsh.nix
-    ../../flatpak.nix # Mainly for minecraft
-
-    # Desktop Environment to use
-    ../../desktop/gnome.nix
-  ];
-
-  services = {
-    printing.enable = true;
-    xserver = {
-      layout = "de";
-      #xkbVariant = ",neo";
-      xkbOptions = "grp:win_space_toggle";
-      displayManager.sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY";
-    };
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-      jack.enable = true;
-    };
-  };
-
-  hardware = {
-    bluetooth.enable = true;
-    pulseaudio.enable = false;
-  };
-  security.rtkit.enable = true;
-
-  environment.systemPackages = [pkgs.xorg.xkbcomp];
-
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  networking = {
-    hostName = "thinklappi";
-    nameservers = ["2620:fe::fe" "2620:fe::9" "9.9.9.9" "149.112.112.112"];
-    networkmanager = {
-      enable = true;
-      dns = "none";
-    };
-  };
-
-  time.timeZone = "Europe/Berlin";
-
-  console = {
-    font = "Lat2-Terminus16";
-    keyMap = "de";
-    #useXkbConfig = true; # use xkbOptions in tty.
-  };
-
-  programs.ssh.startAgent = true;
-
-  system.stateVersion = "23.05";
-}