diff --git a/desktop/default.nix b/desktop/default.nix index 1092570..5fbec0e 100644 --- a/desktop/default.nix +++ b/desktop/default.nix @@ -7,7 +7,7 @@ allowUnfree = true; }; # boot.plymouth.splashBeforeUnlock = true; - users.users.schweby.packages = with pkgs; [ + environment.systemPackages = with pkgs; [ pulsemixer pavucontrol firefox git kitty j4-dmenu-desktop bemenu breeze-qt5 mako diff --git a/hosts/nixda/configuration.nix b/hosts/nixda/configuration.nix index 1a168d1..94dd3d3 100644 --- a/hosts/nixda/configuration.nix +++ b/hosts/nixda/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { imports = @@ -30,9 +30,10 @@ networking.wg-quick.interfaces.cornbox = { privateKeyFile = "/etc/wireguard/cornbox.key"; address = [ "195.39.247.67/28" "2a0f:4ac0:1337::12/64" ]; - postUp = "ip link set dev cornbox mtu 1400"; + postUp = "/run/wrappers/bin/ping -c5 195.39.247.65"; peers = [ { + persistentKeepalive = 25; allowedIPs = [ "2a0f:4ac0:1337::/48" "195.39.247.64/27" ]; publicKey = "8IWyiQL3wKP9CD/4UdS9b8mcbL67mkUyeSPORgEPvV0="; endpoint = "cornbox.hetzner.chaoswit.ch:51821"; @@ -40,6 +41,25 @@ ]; }; + services.xserver = { + enable = true; + videoDrivers = [ "nvidia" ]; + }; + hardware.nvidia.modesetting.enable = true; + + boot.kernelPackages = pkgs.linuxPackages; + boot.blacklistedKernelModules = [ "snd_blackmagic_io" ]; + + users.users.stream = { + isNormalUser = true; + password = "hacchacc"; + extraGroups = [ "audio" "video" ]; + }; + + services.pipewire.enable = true; + services.pipewire.pulse.enable = true; + hardware.pulseaudio.enable = lib.mkForce false; + # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave