Merge branch 'master' of https://git.xorydev.xyz/Xory/dots

hosts/nullstar/configuration.nix

@@ -28,6 +28,7 @@
       "/var/lib/ollama-models"
       "/var/lib/zerotier-one"
       "/var/lib/flatpak"
+      "/var/lib/tailscale"
       "/etc/NetworkManager/system-connections"
     ];
     files = [
@@ -74,6 +75,9 @@
   services.zerotierone.enable = true;
   services.zerotierone.joinNetworks = [ "b3ce837c63" "363c67c55a726a89" ];
   
+  # tailscale
+  services.tailscale.enable = true;
+
   # nix-ld
   programs.nix-ld.enable = true;
   programs.nix-ld.libraries = with pkgs; [
@@ -165,6 +169,12 @@
   hardware.inputmodule.enable = true;
   hardware.keyboard.qmk.enable = true;
   
+  # AMDGPU stuff
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = true;
+  };
+
   services.ollama.enable = true;
   services.ollama.acceleration = "rocm";
   services.ollama.models = "/var/lib/ollama-models";

hosts/nullstar/home.nix

@@ -19,7 +19,15 @@
     yt-dlp
     prismlauncher
     keepassxc
-    obs-studio
+    (wrapOBS {
+      plugins = with pkgs.obs-studio-plugins; [
+        obs-vaapi
+        obs-gstreamer
+        obs-vkcapture
+        wlrobs
+        obs-pipewire-audio-capture
+      ];
+    })
     mpv
     kdePackages.kdenlive
     gimp
@@ -49,6 +57,9 @@
     feh
     opentrack
     aitrack
+    progress
+    croc
+    libarchive
   ];
 
   home.file = {

hosts/voidspear/home.nix

@@ -19,7 +19,15 @@
     yt-dlp
     prismlauncher
     keepassxc
-    obs-studio
+    (wrapOBS {
+      plugins = with pkgs.obs-studio-plugins; [
+        obs-vaapi
+        obs-gstreamer
+        obs-vkcapture
+        wlrobs
+        obs-pipewire-audio-capture
+      ];
+    })
     mpv
     kdePackages.kdenlive
     gimp
@@ -31,8 +39,11 @@
     (lutris.override {
       extraLibraries = pkgs: [
         wineWowPackages.stable
+        winetricks
       ];
     })
+    libadwaita # fucking winetricks
+    zenity
     woeusb-ng
     ntfs3g
     hyprpaper
@@ -40,7 +51,15 @@
     grim
     slurp
     input-leap
-    webex
+    viber
+    hyprpolkitagent
+    pulsemixer
+    feh
+    opentrack
+    aitrack
+    progress
+    croc
+    libarchive
   ];
 
   home.file = {
@@ -88,8 +107,7 @@
   wayland.windowManager.hyprland.enable = true;
   programs.waybar.enable = true;
   programs.wofi.enable = true;
-  services.dunst.enable = true; # cba to configure this yet
+  services.dunst.enable = true;
-  services.hyprpolkitagent.enable = true;
 
   home.stateVersion = "25.05";
 }