Structure: Move configuration.nix into host specific file

This ensures that nixos-rebuild uses flakes and will probably have
advantages in case I'll ever want to deploy multiple machines using this
config.

1 files changed, 66 insertions, 0 deletions

diff --git a/sysconf/thinklappi.nix b/sysconf/thinklappi.nix
new file mode 100644
index 0000000..4904ffd
--- /dev/null
+++ b/sysconf/thinklappi.nix
@@ -0,0 +1,66 @@
+{
+  config,
+  pkgs,
+  ...
+}: let
+  compiledLayout = pkgs.runCommand "keyboard-layout" {} ''
+    ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${../files/neoqwertz.xkb} $out
+  '';
+in {
+  imports = [
+    ../hardware/basesystem.nix
+    ../env.nix
+    ../nix.nix
+    ../packages.nix
+    ../users.nix
+    ../zsh.nix
+    ../flatpak.nix # Mainly for minecraft
+
+    # Desktop Environment to use
+    ../desktop/plasma.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";
+    networkmanager.enable = true;
+  };
+
+  time.timeZone = "Europe/Berlin";
+
+  console = {
+    font = "Lat2-Terminus16";
+    keyMap = "de";
+    #useXkbConfig = true; # use xkbOptions in tty.
+  };
+
+  programs.ssh.startAgent = true;
+
+  system.stateVersion = "23.05";
+}