12 files changed, 78 insertions, 114 deletions
diff --git a/env.nix b/common/environment/default.nix
index b0ebd72..8f58641 100644
--- a/env.nix
+++ b/common/environment/default.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   environment.sessionVariables = rec {
     XDG_CACHE_HOME = "\${HOME}/.cache";
     XDG_CONFIG_HOME = "\${HOME}/.config";
diff --git a/nix.nix b/common/nix/default.nix
index b94cfc9..30f5b38 100644
--- a/nix.nix
+++ b/common/nix/default.nix
@@ -1,9 +1,4 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: {
+{...}: {
   nix = {
     gc = {
       automatic = true;
diff --git a/packages.nix b/common/packages/default.nix
index 3fd53b4..3fd53b4 100644
--- a/packages.nix
+++ b/common/packages/default.nix
diff --git a/users.nix b/common/users/default.nix
index cff3e1d..7f1e7d2 100644
--- a/users.nix
+++ b/common/users/default.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   users = {
     mutableUsers = false;
     users.sils = {
diff --git a/desktop/gnome.nix b/desktop/gnome/default.nix
index 630b30a..dbeb0f6 100644
--- a/desktop/gnome.nix
+++ b/desktop/gnome/default.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   services.xserver.enable = true;
 
   services.xserver.displayManager.gdm.enable = true;
diff --git a/desktop/plasma.nix b/desktop/plasma/default.nix
index 8a33310..4198029 100644
--- a/desktop/plasma.nix
+++ b/desktop/plasma/default.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   services.xserver = {
     enable = true;
     displayManager.sddm.enable = true;
diff --git a/desktop/xfce.nix b/desktop/xfce/default.nix
index 227e063..b0de71a 100644
--- a/desktop/xfce.nix
+++ b/desktop/xfce/default.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   services = {
     blueman.enable = true;
     xserver = {
diff --git a/flake.nix b/flake.nix
index 746ceb6..3b08173 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,7 +16,7 @@
     nixosConfigurations.thinklappi = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = attrs;
-      modules = [./hosts/thinklappi/thinklappi.nix];
+      modules = [./hosts/thinklappi];
     };
   };
 }
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";
-}
diff --git a/flatpak.nix b/services/flatpak/default.nix
index 138a692..d1f4586 100644
--- a/flatpak.nix
+++ b/services/flatpak/default.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{...}: {
   services.flatpak.enable = true;
   fileSystems."/var/lib/flatpak" = {
     device = "/srv/flatpak";
diff --git a/zsh.nix b/services/zsh/default.nix
index c51bcb7..b8349f9 100644
--- a/zsh.nix
+++ b/services/zsh/default.nix
@@ -1,8 +1,4 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   programs.zsh = {
     enable = true;
     syntaxHighlighting.enable = true;