machines/sternenseemann: factor out more common settings out of wolfgang

1 files changed, 2 insertions, 28 deletions

diff --git a/machines/sternenseemann/wolfgang.nix b/machines/sternenseemann/wolfgang.nix
index 8fc6eb29..9f2a9aac 100644
--- a/machines/sternenseemann/wolfgang.nix
+++ b/machines/sternenseemann/wolfgang.nix
@@ -11,6 +11,7 @@ in {
     ./base-laptop.nix
     ./desktop-sway.nix
     ./wireguard.nix
+    ./user-lukas.nix
   ];
 
   boot.initrd.availableKernelModules = [
@@ -52,12 +53,6 @@ in {
 
   networking = {
     hostName = "wolfgang";
-    firewall = {
-      enable = true;
-      allowedTCPPortRanges = [
-        { from = 9990; to = 9999; }
-      ];
-    };
     # nat networking for virtual machines / containers
     # TODO(sterni): remove when I don't have to deal
     #               with such stuff @ work anymore
@@ -66,17 +61,11 @@ in {
       internalInterfaces = [ "ve-+" ];
       externalInterface = "wlp3s0";
     };
-    networkmanager = {
-      enable = true;
-      unmanaged = [ "interface-name:ve-*" ];
-    };
+    networkmanager.unmanaged = [ "interface-name:ve-*" ];
   };
 
-
   virtualisation.docker.enable = true;
 
-  time.timeZone = "Europe/Berlin";
-
   environment.systemPackages = with pkgs; [
     vuizvui.sternenseemann.pass
     exfat borgbackup
@@ -124,11 +113,6 @@ in {
     };
   };
 
-  services.printing = {
-    enable = true;
-    drivers = [ pkgs.gutenprint pkgs.hplip ];
-  };
-
   services.xserver = {
     videoDrivers = [ "intel" ];
   };
@@ -137,15 +121,5 @@ in {
     enable = true;
   };
 
-  nix.trustedUsers = [ "lukas" ];
-  users.users.lukas = {
-    isNormalUser = true;
-    uid = 1000;
-    home = "/home/lukas";
-    group = "users";
-    extraGroups = [ "wheel" "networkmanager" "audio" "docker" ];
-    shell = "${pkgs.fish}/bin/fish";
-  };
-
   system.stateVersion = "unstable";
 }