diff options
Diffstat (limited to 'machines')
-rw-r--r-- | machines/sternenseemann/base-laptop.nix | 15 | ||||
-rw-r--r-- | machines/sternenseemann/user-lukas.nix | 15 | ||||
-rw-r--r-- | machines/sternenseemann/wolfgang.nix | 30 |
3 files changed, 32 insertions, 28 deletions
diff --git a/machines/sternenseemann/base-laptop.nix b/machines/sternenseemann/base-laptop.nix index c50b20e9..1b4420f7 100644 --- a/machines/sternenseemann/base-laptop.nix +++ b/machines/sternenseemann/base-laptop.nix @@ -50,5 +50,20 @@ enable = true; freeMemThreshold = 5; }; + + networking = { + firewall = { + enable = true; + allowedTCPPortRanges = [ + { from = 9990; to = 9999; } + ]; + }; + networkmanager.enable = true; + }; + + services.printing = { + enable = true; + drivers = [ pkgs.gutenprint pkgs.hplip ]; + }; }; } diff --git a/machines/sternenseemann/user-lukas.nix b/machines/sternenseemann/user-lukas.nix new file mode 100644 index 00000000..da4c7c1c --- /dev/null +++ b/machines/sternenseemann/user-lukas.nix @@ -0,0 +1,15 @@ +{ pkgs, ... }: + +{ + config = { + 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"; + }; + }; +} 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"; } |