diff --git a/assets/waybar.gif b/assets/waybar.gif new file mode 100644 index 0000000..f004e9a Binary files /dev/null and b/assets/waybar.gif differ diff --git a/base/apollo/configuration.nix b/base/apollo/configuration.nix index 5c28aff..317cbed 100644 --- a/base/apollo/configuration.nix +++ b/base/apollo/configuration.nix @@ -63,7 +63,7 @@ enable = true; wifi.backend = "iwd"; }; - + programs.gphoto2.enable = true; # Set your time zone. time.timeZone = "Australia/Perth"; @@ -146,7 +146,7 @@ users.users.maya = { isNormalUser = true; description = "Maya"; - extraGroups = [ "networkmanager" "wheel" "libvirtd" ]; + extraGroups = [ "networkmanager" "wheel" "libvirtd" "camera" ]; packages = with pkgs; [ # thunderbird ]; diff --git a/base/apollo/hardware-configuration.nix b/base/apollo/hardware-configuration.nix index e8ac372..866d6fc 100644 --- a/base/apollo/hardware-configuration.nix +++ b/base/apollo/hardware-configuration.nix @@ -10,9 +10,12 @@ boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" ]; boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ]; - boot.kernelModules = [ "kvm-intel" "vfio_virqfd" "vhost-net" ]; - boot.extraModulePackages = [ ]; - boot.extraModprobeConfig = "options vfio-pci ids=10de:2184,10de:1aeb,10de:1aec,10de:1aed,1b21:1242"; + boot.kernelModules = [ "kvm-intel" "vfio_virqfd" "vhost-net" "v4l2loopback" ]; + boot.extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ]; + boot.extraModprobeConfig = '' + options vfio-pci ids=10de:2184,10de:1aeb,10de:1aec,10de:1aed,1b21:1242 + options v4l2loopback devices=2 video_nr=1,2 card_label="OBS Cam, Virt Cam" exclusive_caps=1 + ''; boot.blacklistedKernelModules = ["nouveau"]; boot.kernelParams = [ "amdgpu.ppfeaturemask=0xffffffff" "intel_iommu=on" "iommu=pt" "pcie_acs_override=downstream,multifunction" "preempt=voluntary" "module_blacklist=nouveau" ]; diff --git a/home/default.nix b/home/default.nix index 8f910c8..1732afe 100644 --- a/home/default.nix +++ b/home/default.nix @@ -56,5 +56,17 @@ user.signingkey = "~/.ssh/id_ed25519.pub"; init.defaultBranch = "main"; }; - }; + }; + xdg.portal = { + enable = true; + extraPortals = [ pkgs.xdg-desktop-portal-wlr ]; + }; + programs.obs-studio = { + enable = true; + plugins = with pkgs.obs-studio-plugins; [ + wlrobs + obs-backgroundremoval + obs-pipewire-audio-capture + ]; + }; } diff --git a/home/packages.nix b/home/packages.nix index 57f754b..d9456aa 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -37,6 +37,7 @@ vlc playerctl firefox + v4l-utils libreoffice ]; } diff --git a/home/waybar/config b/home/waybar/config index 9b70569..d7ef299 100644 --- a/home/waybar/config +++ b/home/waybar/config @@ -9,7 +9,7 @@ "position": "top", "modules-center": ["group/mpdg"], "modules-left": ["group/dtray"], - "modules-right": ["clock", "wireplumber"], + "modules-right": ["battery", "battery#bat1", "battery#bat2", "clock", "wireplumber"], "group/dtray": { @@ -60,5 +60,20 @@ "format": "{title} - {album} - {artist}", "format-paused": "{title} - {album} - {artist}", }, + "battery": { + "bat": "BAT0", + "interval": 5, + "format-icons": [" ", " ", " ", " ", " "], + "format": "{icon} {capacity}%", + "tooltip-format": "BAT0, {power}W" + }, + "battery#bat1": { + "bat": "BAT1", + "tooltip-format": "BAT1, {power}W" + }, + "battery#bat2": { + "bat": "BAT2", + "tooltip-format": "BAT2, {power}W" + }, } ]