Merge branch 'master' of github.com:starr-dusT/dotfiles

home/bin/executable_linux-add-nonsteam-games

@@ -7,7 +7,7 @@ rm $shortcuts_vdf
 
 apps=(
     "/run/current-system/sw/bin/dolphin-emu Dolphin Emulator"
-    "/run/current-system/sw/bin/yuzu Yuzu Emulator"
+    "/run/current-system/sw/bin/sudachi Sudachi Emulator"
     "/run/current-system/sw/bin/ppsspp PPSSPP Emulator"
     "/run/current-system/sw/bin/retroarch Retroarch Emulator"
     "/run/current-system/sw/bin/ryujinx Ryujinx Emulator"

home/dot_config/miniflux_catppuccin.css

@@ -0,0 +1,267 @@
+:root {
+  /* Catppuccin Colors */
+  --rosewater: #f5e0dc;
+  --flamingo: #f2cdcd;
+  --pink: #f5c2e7;
+  --mauve: #cba6f7;
+  --red: #f38ba8;
+  --maroon: #eba0ac;
+  --peach: #fab387;
+  --yellow: #f9e2af;
+  --green: #a6e3a1;
+  --teal: #94e2d5;
+  --sky: #89dceb;
+  --sapphire: #74c7ec;
+  --blue: #89b4fa;
+  --lavender: #b4befe;
+  --text: #cdd6f4;
+  --subtext1: #bac2de;
+  --subtext0: #a6adc8;
+  --overlay2: #9399b2;
+  --overlay1: #7f849c;
+  --overlay0: #6c7086;
+  --surface2: #585b70;
+  --surface1: #45475a;
+  --surface0: #313244;
+  --crust: #11111b;
+  --mantle: #181825;
+  --base: #1e1e2e;
+
+  /* Miniflux Variables */
+  --font-family: Inter, Roboto, 'Helvetica Neue', 'Arial Nova', 'Nimbus Sans', Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  --entry-content-font-family: Charter, 'Bitstream Charter', 'Sitka Text', Cambria, serif;
+
+  --body-color: var(--text);
+  --body-background: var(--base);
+
+  --category-color: var(--flamingo);
+  --category-background-color: var(--surface1);
+  --category-border-color: var(--surface2);
+  --category-link-color: var(--peach);
+  --category-link-hover-color: var(--yellow);
+
+  --alert-info-color: var(--text);
+  --alert-info-background-color: var(--surface1);
+  --alert-info-border-color: var(--surface2);
+
+  --item-border-color: var(--surface1);
+  --item-padding: 1rem;
+  --item-title-link-font-weight: 500;
+  --item-meta-focus-color: var(--subtext1);
+
+  --item-status-read-title-link-color: var(--flamingo);
+
+  --header-active-link-color: var(--red);
+
+  --feed-has-unread-background-color: var(--mantle);
+  --feed-has-unread-border-color: var(--surface0);
+
+  --category-has-unread-background-color: var(--mantle);
+  --category-has-unread-border-color: var(--surface0);
+
+  --input-border: 1px solid var(--surface2);
+  --input-background: var(--surface1);
+  --input-color: var(--text);
+
+  --button-primary-border-color: var(--surface1);
+  --button-primary-background: var(--surface0);
+  --button-primary-color: var(--red);
+  --button-primary-focus-border-color: var(--surface2);
+  --button-primary-focus-background: var(--surface1);
+
+  --panel-background: var(--surface0);
+  --panel-border-color: var(--surface1);
+  --panel-color: var(--text);
+
+  --link-color: var(--lavender);
+  --link-focus-color: var(--mauve);
+  --link-hover-color: var(--mauve);
+
+  --title-color: var(--peach);
+
+  --counter-color: var(--subtext1);
+
+  --table-border-color: var(--surface1);
+  --table-th-background: var(--surface0);
+  --table-th-color: var(--text);
+  --table-tr-hover-background-color: var(--surface0);
+  --table-tr-hover-color: var(--text);
+
+  --logo-color: var(--rosewater);
+  --logo-hover-color-span: var(--rosewater);
+
+  --header-list-border-color: var(--surface1);
+  --header-link-color: var(--text);
+  --header-link-focus-color: var(--blue);
+  --header-link-hover-color: var(--blue);
+
+  --pagination-link-color: var(--rosewater);
+  --pagination-border-color: var(--surface1);
+
+  --entry-header-border-color: var(--surface1);
+  --entry-header-title-link-color: var(--peach);
+
+  --entry-content-color: var(--text);
+  --entry-content-code-color: var(--text);
+  --entry-content-code-background: var(--surface0);
+  --entry-content-code-border-color: var(--surface1);
+  --entry-content-quote-color: var(--text);
+  --entry-content-abbr-border-color: var(--surface1);
+  --entry-enclosure-border-color: var(--surface1);
+
+  --alert-color: var(--text);
+  --alert-background-color: var(--surface0);
+  --alert-border-color: var(--surface1);
+  --alert-success-color: var(--mantle);
+  --alert-success-background-color: var(--green);
+  --alert-success-border-color: var(--surface1);
+  --alert-error-color: var(--mantle);
+  --alert-error-background-color: var(--red);
+  --alert-error-border-color: var(--surface1);
+
+  /* Custom Variables */
+  --border-radius: .25rem;
+}
+
+html {
+  color-scheme: dark;
+}
+.item {
+  background-color: var(--surface0);
+  border-style: solid;
+  border-radius: var(--border-radius);
+}
+
+.item-title a {
+  color: var(--red);
+}
+
+.item-meta a {
+  color: var(--green);
+  font-weight: 600;
+}
+
+.item-meta-icons li > :is(a, button) {
+  color: var(--flamingo)
+}
+
+.item-meta :is(a:is(:focus, :hover),
+button:is(:focus, :hover)) {
+  color: var(--maroon)
+}
+
+.item-status-read a {
+  font-weight: 400;
+}
+
+.disabled {
+  opacity: 40%;
+}
+
+input[type=search],
+input[type=url],
+input[type=password],
+input[type=text],
+input[type=number],
+.button,
+textarea {
+  border-radius: var(--border-radius);
+  border-style: solid;
+}
+
+fieldset {
+  border: var(--input-border);
+  border-radius: var(--border-radius);
+}
+
+select {
+  background-color: var(--surface0);
+  border-style: solid;
+  border-radius: var(--border-radius);
+  border-collapse: collapse;
+}
+select:focus:active {
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+}
+.form-section {
+  border-left: var(--input-border);
+  border-width: 4px;
+  border-top-right-radius: var(--border-radius);
+  border-bottom-right-radius: var(--border-radius);
+  padding: 1rem 0 0 1rem;
+  margin-left: 17px;
+  background: var(--surface0);
+}
+.form-section .buttons {
+  display: inline-block;
+}
+.logo a {
+  font-weight: 900;
+}
+.logo a span {
+  color: var(--blue)
+}
+
+.header li a:hover {
+  color: var(--header-link-hover-color);
+}
+
+.entry header h1 a:hover,
+.entry header h1 a:focus {
+  color: var(--flamingo);
+}
+
+.entry header {
+  padding-bottom: 15px;
+  margin-bottom: 15px;
+}
+
+.entry-meta,
+.entry-website a,
+.entry-date {
+  color: var(--subtext0);
+}
+
+.entry-content {
+  line-height: 1.5em;
+}
+
+.entry-content h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin-top: 2rem;
+  margin-bottom: 1rem;
+}
+
+.entry-content pre,
+.entry-content code {
+  border-radius: var(--border-radius);
+}
+.entry-content code {
+  padding: 0.25rem;
+}
+
+.entry-content blockquote {
+  border-left: var(--input-border);
+  border-width: 4px;
+  margin-top: 2em;
+  margin-bottom: 2em;
+}
+
+.entry-content figure img {
+  border: var(--input-border);
+  border-radius: var(--border-radius);
+}
+.entry-content iframe,
+.entry-content video,
+.entry-content img {
+  width: 100%;
+}
+
+.pagination-entry-bottom {
+  padding-top: 15px;
+}

provision/modules/gaming/emulation.nix

@@ -5,9 +5,10 @@ in {
   options.modules.gaming.emulation.enable = lib.mkEnableOption "emulation";
   config = lib.mkIf cfg.enable {
 
+    
     environment.systemPackages = with pkgs; [ 
-      yuzu-archive # Nintendo Switch emulator.
-      ryujinx-archive # Nintendo Switch emulator written in C#.
+      ryujinx # Nintendo Switch emulator written in C#.
+      sudachi # Nintendo Switch emulator written in C++.
       dolphin-emu # GameCube and Wii emulator.
       ppsspp # PSP emulator.
       mgba # Game Boy Advance emulator.

provision/overlays/default.nix

@@ -4,8 +4,8 @@
 final: prev: {
   advcpmv = final.callPackage ../pkgs/advcpmv.nix {};
   nx_tzdb = final.callPackage ../pkgs/nx_tzdb.nix {};
-  yuzu-archive = final.libsForQt5.callPackage ../pkgs/yuzu-archive.nix {};
+  sudachi = final.kdePackages.callPackage ../pkgs/sudachi.nix {};
   gnome-set-panel-monitor = final.callPackage ../pkgs/gnome-set-panel-monitor.nix {};
   gnome-fullscreen-to-empty-workspace = final.callPackage ../pkgs/gnome-fullscreen-to-empty-workspace.nix {};
-  ryujinx-archive = final.callPackage ../pkgs/ryujinx-archive/default.nix {};
+  ryujinx = final.callPackage ../pkgs/ryujinx/default.nix {};
 }

provision/pkgs/ryujinx/default.nix

@@ -25,7 +25,7 @@
 }:
 
 buildDotnetModule rec {
-  pname = "ryujinx-archive";
+  pname = "ryujinx";
   version = "1.1.1401"; 
 
   src = fetchFromGitea {

provision/pkgs/sudachi.nix

@@ -0,0 +1,196 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  fetchFromGitea,
+  cmake,
+  glslang,
+  pkg-config,
+  qttools,
+  wrapQtAppsHook,
+  boost,
+  fmt,
+  lz4,
+  nlohmann_json,
+  qtbase,
+  qtmultimedia,
+  qtwayland,
+  qtwebengine,
+  zlib,
+  zstd,
+  rapidjson,
+  libva,
+  libvdpau,
+  nv-codec-headers-12,
+  yasm,
+  autoconf,
+  automake,
+  libtool,
+  spirv-headers,
+  catch2_3,
+  vulkan-loader,
+  vulkan-headers,
+}:
+
+let
+  # Derived from externals/nx_tzdb/CMakeLists.txt
+  nx_tzdb = fetchzip {
+    url = "https://github.com/lat9nq/tzdb_to_nx/releases/download/221202/221202.zip";
+    stripRoot = false;
+    hash = "sha256-YOIElcKTiclem05trZsA3YJReozu/ex7jJAKD6nAMwc=";
+  };
+  suyu = fetchFromGitea {
+    domain = "git.suyu.dev";
+    owner = "suyu";
+    repo = "suyu";
+    rev = "ee365bad9501c73ff49936e72ec91cd9c3ce5c24";
+    hash = "sha256-vw9VcSbCaG4MS0PL/fJ73CDALLbd3n0CBT7gkyp5hRc=";
+    fetchSubmodules = true;
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "sudachi";
+  version = "1.0.11";
+  
+  src = fetchzip {
+    url = "https://github.com/emuplace/sudachi.emuplace.app/releases/download/v1.0.11/latest.zip";
+    hash = "sha256-aQ1cNFG6JCNrMz4N9uv6QRidjNwvyJqGunhwhJpvv4s=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    glslang
+    pkg-config
+    qttools
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    vulkan-headers
+    boost
+    fmt
+    lz4
+    nlohmann_json
+    qtbase
+    qtmultimedia
+    qtwayland
+    qtwebengine
+    zlib
+    zstd
+
+    # vendored discord-rpc deps
+    rapidjson
+
+    # vendored ffmpeg deps
+    libva # for accelerated video decode on non-nvidia
+    libvdpau # for accelerated video decode on non-nvidia
+    nv-codec-headers-12 # for accelerated video decode on nvidia
+    yasm
+
+    # vendored libusb deps
+    autoconf
+    automake
+    libtool
+
+    # vendored sirit deps
+    spirv-headers
+  ];
+
+  cmakeFlags = [
+    # actually has a noticeable performance impact
+    "-DSUDACHI_ENABLE_LTO=ON"
+
+    # build with qt6
+    "-DENABLE_QT6=ON"
+
+    # enable some optional features
+    "-DSUDACHI_USE_QT_WEB_ENGINE=ON"
+    "-DSUDACHI_USE_QT_MULTIMEDIA=ON"
+    "-DUSE_DISCORD_PRESENCE=ON"
+
+    # compatibility list currently 404's
+    "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF"
+
+    # don't check for missing submodules
+    "-DSUDACHI_CHECK_SUBMODULES=OFF"
+
+    # use system libraries
+    # NB: "external" here means "from the externals/ directory in the source",
+    # so "off" means "use system"
+    "-DSUDACHI_USE_EXTERNAL_VULKAN_HEADERS=OFF"
+
+    # Disable SDL2 audio
+    # Sudachi seems to have a bug that ignores SUDACHI_USE_EXTERNAL_SDL2 flag
+    "-DENABLE_SDL2=OFF"
+
+    # don't use system ffmpeg, sudachi uses internal APIs
+    "-DSUDACHI_USE_BUNDLED_FFMPEG=ON"
+    "-DFFmpeg_COMPONENTS='swscale;avutil;avfilter;avcodec'"
+    "-DFFmpeg_PREFIX=$src/externals/ffmpeg/ffmpeg"
+
+    # use system spriv headers for sirit
+    "-DSIRIT_USE_SYSTEM_SPIRV_HEADERS=ON"
+  ];
+
+  # Does some handrolled SIMD
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse4.1";
+
+  # This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt`
+  # making the build fail, as that path does not exist
+  dontFixCmake = true;
+
+  preConfigure = ''
+    # see https://github.com/NixOS/nixpkgs/issues/114044, setting this through cmakeFlags does not work.
+    cmakeFlagsArray+=(
+      "-DTITLE_BAR_FORMAT_IDLE=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) {}"
+      "-DTITLE_BAR_FORMAT_RUNNING=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) | {}"
+    )
+
+    # Copy suyu externals
+    rm -R externals/
+    cp -R ${suyu}/externals .
+
+    # replace "SUYU" with "SUDACHI" in externals cmake args
+    chmod u+rw -R externals/
+    grep -rl SUYU | xargs sed -i 's/SUYU/SUDACHI/g'
+
+    # provide pre-downloaded tz data
+    mkdir -p build/externals/nx_tzdb
+    ln -s ${nx_tzdb} build/externals/nx_tzdb/nx_tzdb
+  '';
+
+  doCheck = true;
+  checkInputs = [ catch2_3 ];
+
+  # Fixes vulkan detection.
+  # FIXME: patchelf --add-rpath corrupts the binary for some reason, investigate
+  qtWrapperArgs = [ "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib" ];
+
+  postInstall = ''
+    install -Dm444 "$src/dist/72-sudachi-input.rules" "$out/lib/udev/rules.d/72-sudachi-input.rules"
+    mkdir -p "$out/share/sudachi"
+    cp -R "$src" "$out/share/sudachi/src"
+  '';
+
+  meta = with lib; {
+    description = "Nintendo Switch emulator written in C++";
+    homepage = "https://sudachiemu.com/";
+    changelog = "https://sudachi.emuplace.app/";
+    mainProgram = "sudachi";
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+
+    license = with licenses; [
+      gpl3Plus
+
+      # Icons
+      asl20
+      mit
+      cc0
+    ];
+
+    maintainers = with maintainers; [ starr-dusT ];
+  };
+})

provision/pkgs/yuzu-archive.nix

@@ -1,191 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitea
-, nix-update-script
-, wrapQtAppsHook
-, autoconf
-, boost
-, catch2_3
-, cmake
-, cpp-jwt
-, cubeb
-, discord-rpc
-, enet
-, fmt
-, glslang
-, libopus
-, libusb1
-, libva
-, lz4
-, nlohmann_json
-, nv-codec-headers-12
-, pkg-config
-, qtbase
-, qtmultimedia
-, qttools
-, qtwayland
-, qtwebengine
-, SDL2
-, vulkan-headers
-, vulkan-loader
-, yasm
-, zlib
-, zstd
-, fetchzip
-, fetchgit
-, runCommand
-, gnutar
-, nx_tzdb
-}:
-stdenv.mkDerivation(finalAttrs: {
-  
-  pname = "yuzu-archive";
-  version = "4176";
-
-  src = fetchFromGitea {
-    domain = "git.tstarr.us";
-    owner = "tstarr";
-    repo = "yuzu-mainline";
-    rev = "d3a974b64679229e77a3af921994dab82d092249";
-    hash = "sha256-sn/CfaZkS3noDH9lmEtIES6Xc7aoZ5tbHo1AJc5nxac=";
-    fetchSubmodules = true;
-  };
-
-  nativeBuildInputs = [
-    cmake
-    glslang
-    pkg-config
-    qttools
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    # vulkan-headers must come first, so the older propagated versions
-    # don't get picked up by accident
-    vulkan-headers
-
-    boost
-    catch2_3
-    cpp-jwt
-    cubeb
-    discord-rpc
-    # intentionally omitted: dynarmic - prefer vendored version for compatibility
-    enet
-
-    # vendored ffmpeg deps
-    autoconf
-    yasm
-    libva  # for accelerated video decode on non-nvidia
-    nv-codec-headers-12  # for accelerated video decode on nvidia
-    # end vendored ffmpeg deps
-
-    fmt
-    # intentionally omitted: gamemode - loaded dynamically at runtime
-    # intentionally omitted: httplib - upstream requires an older version than what we have
-    libopus
-    libusb1
-    # intentionally omitted: LLVM - heavy, only used for stack traces in the debugger
-    lz4
-    nlohmann_json
-    qtbase
-    qtmultimedia
-    qtwayland
-    qtwebengine
-    # intentionally omitted: renderdoc - heavy, developer only
-    SDL2
-    # not packaged in nixpkgs: simpleini
-    # intentionally omitted: stb - header only libraries, vendor uses git snapshot
-    # not packaged in nixpkgs: vulkan-memory-allocator
-    # intentionally omitted: xbyak - prefer vendored version for compatibility
-    zlib
-    zstd
-  ];
-
-  # This changes `ir/opt` to `ir/var/empty` in `externals/dynarmic/src/dynarmic/CMakeLists.txt`
-  # making the build fail, as that path does not exist
-  dontFixCmake = true;
-
-  cmakeFlags = [
-    # actually has a noticeable performance impact
-    "-DYUZU_ENABLE_LTO=ON"
-
-    # build with qt6
-    "-DENABLE_QT6=ON"
-    "-DENABLE_QT_TRANSLATION=ON"
-
-    # use system libraries
-    # NB: "external" here means "from the externals/ directory in the source",
-    # so "off" means "use system"
-    "-DYUZU_USE_EXTERNAL_SDL2=OFF"
-    "-DYUZU_USE_EXTERNAL_VULKAN_HEADERS=OFF"
-
-    # don't use system ffmpeg, yuzu uses internal APIs
-    "-DYUZU_USE_BUNDLED_FFMPEG=ON"
-
-    # don't check for missing submodules
-    "-DYUZU_CHECK_SUBMODULES=OFF"
-
-    # enable some optional features
-    "-DYUZU_USE_QT_WEB_ENGINE=ON"
-    "-DYUZU_USE_QT_MULTIMEDIA=ON"
-    "-DUSE_DISCORD_PRESENCE=ON"
-
-    # We dont want to bother upstream with potentially outdated compat reports
-    "-DYUZU_ENABLE_COMPATIBILITY_REPORTING=OFF"
-    "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=OFF" # We provide this deterministically
-  ];
-
-  # Does some handrolled SIMD
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isx86_64 "-msse4.1";
-
-  # Fixes vulkan detection.
-  # FIXME: patchelf --add-rpath corrupts the binary for some reason, investigate
-  qtWrapperArgs = [
-    "--prefix LD_LIBRARY_PATH : ${vulkan-loader}/lib"
-  ];
-
-  preConfigure = ''
-    # see https://github.com/NixOS/nixpkgs/issues/114044, setting this through cmakeFlags does not work.
-    cmakeFlagsArray+=(
-      "-DTITLE_BAR_FORMAT_IDLE=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) {}"
-      "-DTITLE_BAR_FORMAT_RUNNING=${finalAttrs.pname} | ${finalAttrs.version} (nixpkgs) | {}"
-    )
-
-    # provide pre-downloaded tz data
-    mkdir -p build/externals/nx_tzdb
-    ln -s ${nx_tzdb} build/externals/nx_tzdb/nx_tzdb
-  '';
-
-  postInstall = ''
-    install -Dm444 $src/dist/72-yuzu-input.rules $out/lib/udev/rules.d/72-yuzu-input.rules
-  '';
-
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version-regex" "mainline-0-(.*)" ];
-  };
-
-  meta = with lib; {
-    homepage = "https://yuzu-emu.org";
-    changelog = "https://yuzu-emu.org/entry";
-    description = "An experimental Nintendo Switch emulator written in C++";
-    longDescription = ''
-      An experimental Nintendo Switch emulator written in C++.
-      Using the mainline branch is recommended for general usage.
-      Using the early-access branch is recommended if you would like to try out experimental features, with a cost of stability.
-    '';
-    mainProgram = "yuzu";
-    platforms = [ "aarch64-linux" "x86_64-linux" ];
-    license = with licenses; [
-      gpl3Plus
-      # Icons
-      asl20 mit cc0
-    ];
-    maintainers = with maintainers; [
-      ashley
-      ivar
-      joshuafern
-      sbruder
-      k900
-    ];
-  };
-})