lots of updates; playing with wine

configuration/base.nix

@@ -107,7 +107,13 @@
       vim
       curl
       inetutils
+      dig
+
       rar
+      zstd
+      xz
+      p7zip
+
       libva-utils
       smartmontools
       appimage-run

configuration/modules/virtualisation.nix

@@ -28,6 +28,6 @@
     # };
   };
   programs.virt-manager.enable = true;
-  environment.systemPackages = with pkgs;[ podman-compose ];
+  environment.systemPackages = with pkgs;[ podman-compose podman-tui podman-desktop ];
 }
 

devices/tuxedo/configuration.nix

@@ -71,8 +71,19 @@
     dumpcap.enable = true;
   };
 
+  programs.gpu-screen-recorder.enable = true; # For promptless recording on both CLI and GUI
+
+  # programs.obs-studio = {
+  #   enable = true;
+  #   enableVirtualCamera = true;
+  # };
+
   environment.systemPackages = with pkgs;[
     distrobox
+    gpu-screen-recorder-gtk
+
+    inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk
+    inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".lsfg-vk-ui
   ];
 
   # Define a user account. Don't forget to set a password with ‘passwd’.

devices/tuxedo/home.nix

@@ -35,17 +35,14 @@
     # media
     jellyfin-media-player
     haruna
-    fooyin
-    strawberry
-    mpc-qt
 
     # misc
     electrum
-    gpu-screen-recorder-gtk
     syncthing
     dbeaver-bin
     ruffle
     popsicle
+
     # for headset tune
     headsetcontrol
   ];
@@ -79,11 +76,10 @@
       config = {
         profile = "gpu-hq";
         vo = "gpu-next";
-        gpu-api = "opengl";
+        gpu-api = "auto";
-        gpu-context = "wayland";
+        gpu-context = "auto";
-        hwdec = "vulkan";
+        hwdec = "auto";
-        # screenshot-directory = "/mnt/HDD2/Pictures/";
+        screenshot-directory = "/mnt/HDD2/Pictures/";
-        screenshot-directory = "~/Pictures/";
         glsl-shaders = "~~/shaders/Anime4K_Clamp_Highlights.glsl:~~/shaders/Anime4K_Restore_CNN_VL.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_VL.glsl:~~/shaders/Anime4K_AutoDownscalePre_x2.glsl:~~/shaders/Anime4K_AutoDownscalePre_x4.glsl:~~/shaders/Anime4K_Upscale_CNN_x2_M.glsl";
       };
       extraInput = ''

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752113600,
+        "lastModified": 1755519972,
-        "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=",
+        "narHash": "sha256-bU4nqi3IpsUZJeyS8Jk85ytlX61i4b0KCxXX9YcOgVc=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "79264292b7e3482e5702932949de9cbb69fedf6d",
+        "rev": "4073ff2f481f9ef3501678ff479ed81402caae6d",
         "type": "github"
       },
       "original": {
@@ -45,11 +45,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752527596,
+        "lastModified": 1755776884,
-        "narHash": "sha256-kn620ocx9JmmWKBN4X+kTbsQg/nv2HBxceDf2zV08VM=",
+        "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8597e85e2ce33e6a6f1df99cc56cdf7680cb22e0",
+        "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86",
         "type": "github"
       },
       "original": {
@@ -66,11 +66,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752441837,
+        "lastModified": 1755404379,
-        "narHash": "sha256-FMH1OSSJp8Cx8MZHXz6KckxJGbCnVMotZNAH3v2WneU=",
+        "narHash": "sha256-Q6ZxZDBmD/B988Jjbx7/NchxOKIpOKBBrx9Yb0zMzpQ=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "839e02dece5845be3a322e507a79712b73a96ba2",
+        "rev": "ebbc1c05f786ae39bb5e04e57bf2c10c44a649e3",
         "type": "github"
       },
       "original": {
@@ -105,11 +105,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1752459325,
+        "lastModified": 1755827962,
-        "narHash": "sha256-46TgjdxT02a4nFd9HCXCf8kK5ZSH7r9gYROLtc8zVOg=",
+        "narHash": "sha256-qY4UcgSy60Urcwp+fdWCasueERzZo5foMVMwIVEEzts=",
         "owner": "nix-community",
         "repo": "nix-vscode-extensions",
-        "rev": "61c2e99ebd586f463a6c0ebe3d931e74883b163d",
+        "rev": "55b18afeadde679c876620d9dbc7e01a4f4dbb77",
         "type": "github"
       },
       "original": {
@@ -120,11 +120,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1752048960,
+        "lastModified": 1755330281,
-        "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
+        "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
+        "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0",
         "type": "github"
       },
       "original": {
@@ -152,11 +152,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1751984180,
+        "lastModified": 1755615617,
-        "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=",
+        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0",
+        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
         "type": "github"
       },
       "original": {
@@ -168,11 +168,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1752308619,
+        "lastModified": 1755704039,
-        "narHash": "sha256-pzrVLKRQNPrii06Rm09Q0i0dq3wt2t2pciT/GNq5EZQ=",
+        "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "650e572363c091045cdbc5b36b0f4c1f614d3058",
+        "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545",
         "type": "github"
       },
       "original": {
@@ -202,11 +202,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1748252092,
+        "lastModified": 1755728642,
-        "narHash": "sha256-6nL55wvV7SthEXaXDiQo8xxkxQLAVcNBU21YJ7GJLm8=",
+        "narHash": "sha256-sZZiMh39kdOjh86ob/X1qXTC5j8iY5/In70rmYQjyxw=",
         "owner": "numtide",
         "repo": "system-manager",
-        "rev": "c6850451ef769fd03d0ad5474f928b916aa23775",
+        "rev": "3219a927e180f52112088d02e8d000017e63a943",
         "type": "github"
       },
       "original": {

home-manager/base.nix

@@ -1,9 +1,10 @@
-{ pkgs, lib, inputs, ... }:
+{ pkgs, ... }:
 
 {
   imports = [
     ./base/fonts.nix
     ./base/terminal.nix
+    ./base/mpv.nix
     ./firefox/firefox.nix
   ];
 
@@ -13,11 +14,14 @@
     keepassxc
     qbittorrent
     libreoffice-qt
-    inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".joplin-desktop
+    joplin-desktop
 
     # comms   
     teamspeak_client
-    vesktop
+    discord
+
+    # media
+    strawberry
   ];
 
   # set breeze as default cursor
@@ -40,31 +44,5 @@
       enable = true;
       package = pkgs.brave;
     };
-
-    mpv = {
-      enable = true;
-      package = (
-        pkgs.mpv-unwrapped.wrapper {
-          scripts = with pkgs.mpvScripts; [
-            uosc
-            sponsorblock
-          ];
-
-          mpv = pkgs.mpv-unwrapped.override {
-            waylandSupport = true;
-          };
-        }
-      );
-      config = {
-        screenshot-directory = lib.mkDefault "~/Pictures/";
-        screenshot-template = lib.mkDefault "%F/%F_snapshot_%P";
-        sub-ass-use-video-data = lib.mkDefault "aspect-ratio";
-      };
-      scriptOpts = {
-        uosc = {
-          time_precision = 2;
-        };
-      };
-    };
   };
 }

home-manager/base/mpv.nix

@@ -0,0 +1,30 @@
+{ pkgs, lib, ... }:
+
+{
+  programs = {
+    mpv = {
+      enable = true;
+      package = (
+        pkgs.mpv-unwrapped.wrapper {
+          scripts = with pkgs.mpvScripts; [
+            uosc
+            sponsorblock
+          ];
+
+          mpv = pkgs.mpv-unwrapped;
+        }
+      );
+      config = {
+        screenshot-directory = lib.mkDefault "~/Pictures/";
+        screenshot-template = lib.mkDefault "%F/%F_snapshot_%P";
+        sub-ass-use-video-data = lib.mkDefault "aspect-ratio";
+      };
+
+      scriptOpts = {
+        uosc = {
+          time_precision = 3;
+        };
+      };
+    };
+  };
+}

home-manager/base/terminal.nix

@@ -45,6 +45,12 @@ with lib;
         '';
       };
 
+      nix-index = {
+        enable = true;
+        enableBashIntegration = true;
+        enableFishIntegration = true;
+      };
+
       git = {
         enable = true;
         delta.enable = true;

home-manager/development/dotnet.nix

@@ -1,4 +1,4 @@
-{ pkgs, inputs, ... }:
+{ pkgs, ... }:
 
 {
   home.packages = with pkgs;[

home-manager/development/vscode.nix

@@ -34,7 +34,9 @@ in
           ms-python.python
           ms-python.debugpy
           charliermarsh.ruff
-        ]) ++ (with vscode-marketplace;[ bradlc.vscode-tailwindcss ]);
+        ]) ++ (with vscode-marketplace;[
+          bradlc.vscode-tailwindcss
+        ]);
         userSettings = with pkgs;{
           "workbench.iconTheme" = "material-icon-theme";
           "window.titleBarStyle" = "custom";
@@ -72,7 +74,7 @@ in
           "[jsonc]" = {
             "editor.defaultFormatter" = "biomejs.biome";
           };
-          "biome.lsp.bin" = "${biome}/bin/biome";
+          # "biome.lsp.bin" = "${biome}/bin/biome";
           #"biome.requireConfigFile" = true;
 
           "typescript.preferences.preferTypeOnlyAutoImports" = true;
@@ -89,6 +91,8 @@ in
           "bashIde.shfmt.path" = "${shfmt}/bin/shfmt";
 
           "rust-analyzer.rustfmt.overrideCommand" = [ "${rustfmt}/bin/rustfmt" ];
+
+          "tailwindCSS.classFunctions" = [ "cva" "cx" ];
         };
       };
     };

home-manager/gaming.nix

@@ -1,16 +1,48 @@
 { pkgs, ... }:
 
 {
+  xdg.dataFile."proton/proton-ge" = {
+    source = pkgs.proton-ge-bin;
+  };
+
   home.packages = with pkgs;[
-    steamguard-cli
+    # Wine / Proton
+    wineWowPackages.staging
+    winetricks
     bottles
-    ryubing
-    mgba
-    scanmem
     (heroic.override {
       extraPkgs = pkgs: [
         pkgs.gamescope
       ];
     })
+    (umu-launcher.override {
+      extraPkgs = pkgs: with pkgs.gst_all_1; [
+        gstreamer
+        gst-plugins-base
+        gst-plugins-good
+        gst-plugins-bad
+        gst-plugins-ugly
+        gst-libav
+        gst-vaapi
+        gamescope
       ];
+    })
+
+    # Steam
+    steamguard-cli
+
+    # Emulators    
+    ryubing
+    mgba
+
+    # Cheat engine
+    scanmem
+  ];
+
+  # programs.lutris = {
+  #   enable = true;
+  #   extraPackages = with pkgs; [ mangohud winetricks gamescope gamemode umu-launcher ];
+  #   protonPackages = [ pkgs.proton-ge-bin ];
+  #   winePackages = [ pkgs.wineWowPackages.staging ];
+  # };
 }