home/doggo/doggo.nix

@@ -108,11 +108,6 @@
     LOW_LATENCY_LAYER = "1";
     # Note: set LOW_LATENCY_LAYER_REFLEX = "1" for games with nvidia reflex
     # (or some like cyberpunk 2077 where anti-lag 2 is supported but is worse than reflex and/or none)
-
-    # flatpak --user remote-add --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
-    # flatpak --user install org.freedesktop.Platform.GL.mesa-git
-    # flatpak --user install org.freedesktop.Platform.GL32.mesa-git
-    FLATPAK_GL_DRIVERS = "mesa-git";
   };
 
   programs = {

local_packages/lsfg-vk-ui/package.nix

@@ -1,45 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  cmake,
-  llvmPackages,
-  qt6,
-}:
-
-llvmPackages.stdenv.mkDerivation (finalAttrs: {
-  pname = "lsfg-vk-ui";
-  version = "2.0.0-dev";
-
-  src = fetchFromGitHub {
-    owner = "PancakeTAS";
-    repo = "lsfg-vk";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-Qb3vufCzNpM1r+vgo8M9nnA7CENgGTithWG0oXqLKbI=";
-  };
-
-  nativeBuildInputs = [
-    llvmPackages.clang-tools
-    llvmPackages.libllvm
-    cmake
-    qt6.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    qt6.qtbase
-    qt6.qtdeclarative
-  ];
-
-  cmakeFlags = [
-    "-DLSFGVK_BUILD_VK_LAYER=OFF"
-    "-DLSFGVK_BUILD_UI=ON"
-    "-DLSFGVK_INSTALL_XDG_FILES=ON"
-    "-DLSFGVK_BUILD_CLI=OFF"
-  ];
-
-  meta = {
-    description = "Lossless Scaling Frame Generation on Linux (UI part)";
-    homepage = "https://github.com/PancakeTAS/lsfg-vk/";
-    license = lib.licenses.mit;
-    platforms = lib.platforms.linux;
-  };
-})

local_packages/lsfg-vk/package.nix

@@ -4,6 +4,7 @@
   cmake,
   vulkan-headers,
   llvmPackages,
+  qt6,
 }:
 
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
@@ -21,16 +22,19 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     llvmPackages.clang-tools
     llvmPackages.libllvm
     cmake
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
     vulkan-headers
+    qt6.qtbase
+    qt6.qtdeclarative
   ];
 
   cmakeFlags = [
     "-DLSFGVK_LAYER_LIBRARY_PATH=${placeholder "out"}/lib/liblsfg-vk-layer.so"
-    "-DLSFGVK_BUILD_VK_LAYER=ON"
-    "-DLSFGVK_BUILD_UI=OFF"
+    "-DLSFGVK_BUILD_UI=ON"
+    "-DLSFGVK_INSTALL_XDG_FILES=ON"
     "-DLSFGVK_BUILD_CLI=OFF"
   ];
 

modules/mesa.nix

@@ -17,7 +17,6 @@ in
     };
     extraPackages = with pkgs; [
       (functions.mkUnstable low-latency-layer) # Better alternative (+ vendor-agnostic) to mesa's amd anti-lag 2
-      (functions.mkUnstable lsfg-vk)
     ];
   };
 }

modules/system-packages.nix

@@ -2,14 +2,13 @@
 
 let
   functions = rec {
-    mkSpecial = pkg: version: src_name: suffix:
+    mkSpecial = pkg: version: suffix:
       pkg.overrideAttrs (old: {
         inherit version;
-        src = nixtamal.${src_name + suffix};
+        src = nixtamal.${pkg.pname + suffix};
       });
-    mkSpecialAuto = pkg: version: suffix: mkSpecial pkg version pkg.pname suffix;
-    mkSpecialVersion = pkg: version: mkSpecialAuto pkg version "";
-    mkUnstable = pkg: mkSpecialAuto pkg "unstable" "-git";
+    mkSpecialVersion = pkg: version: mkSpecial pkg version "";
+    mkUnstable = pkg: mkSpecial pkg "unstable" "-git";
 
     mkPatched = pkg: newPatches:
       pkg.overrideAttrs (old: {
@@ -44,7 +43,7 @@ in
     cmake
     sbctl # For secure boot with Limine
     jq # I use it somewhere in my nixtamal manifest
-    (functions.mkSpecial lsfg-vk-ui "unstable" "lsfg-vk" "-git")
+    (functions.mkUnstable lsfg-vk) # TODO: Split package in 2 so I can put the ui here, and the layer in mesa.nix
   ];
 
   programs.steam = {
@@ -66,18 +65,6 @@ in
   };
 
   services.flatpak.enable = true;
-  systemd.user.services.flatpak-repos = {
-    after = [ "network.target" ];
-    serviceConfig = {
-      Type = "oneshot";
-      RemainAfterExit = "yes";
-      ExecStart = "${pkgs.bash}/bin/sh -c '" +
-        "${pkgs.flatpak}/bin/flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo && " +
-        "${pkgs.flatpak}/bin/flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo" +
-      "'";
-    };
-    wantedBy = [ "default.target" ];
-  };
 
   services.lact = {
     enable = true;