meep

flake.lock

@@ -1213,7 +1213,7 @@
     },
     "naersk": {
       "inputs": {
-        "nixpkgs": "nixpkgs_13"
+        "nixpkgs": "nixpkgs_12"
       },
       "locked": {
         "lastModified": 1717067539,
@@ -1362,24 +1362,6 @@
         "type": "github"
       }
     },
-    "nix-proton-cachyos": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_9"
-      },
-      "locked": {
-        "lastModified": 1749595577,
-        "narHash": "sha256-0unQxKcv581jRN9yQHTRpzN//veQdwsRiTCBaHKf+Ck=",
-        "owner": "kittywitch",
-        "repo": "nix-proton-cachyos",
-        "rev": "77c30b128c6290ec41a9834aea6c2539884c95ba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kittywitch",
-        "repo": "nix-proton-cachyos",
-        "type": "github"
-      }
-    },
     "nix-std": {
       "locked": {
         "lastModified": 1701658249,
@@ -1490,7 +1472,7 @@
       "inputs": {
         "flake-compat": "flake-compat_5",
         "flake-utils": "flake-utils_4",
-        "nixpkgs": "nixpkgs_11",
+        "nixpkgs": "nixpkgs_10",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
@@ -1511,13 +1493,13 @@
       "locked": {
         "lastModified": 1749794982,
         "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
-        "owner": "nixos",
+        "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
+        "owner": "NixOS",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
@@ -1527,35 +1509,19 @@
       "locked": {
         "lastModified": 1749794982,
         "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
-        "owner": "NixOS",
+        "owner": "nixos",
         "repo": "nixpkgs",
         "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "nixos",
         "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs_12": {
-      "locked": {
-        "lastModified": 1749794982,
-        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_13": {
       "locked": {
         "lastModified": 0,
         "narHash": "sha256-9YrUjdztqi4Gz8n3mBuqvCkMo4ojrA6nASwyIKWMpus=",
@@ -1567,7 +1533,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_14": {
+    "nixpkgs_13": {
       "locked": {
         "lastModified": 1724517639,
         "narHash": "sha256-3eTrclsS5OYShbw0MRiiF3GJ8emUTwVzAZo96pdD7hM=",
@@ -1581,7 +1547,7 @@
         "type": "indirect"
       }
     },
-    "nixpkgs_15": {
+    "nixpkgs_14": {
       "locked": {
         "lastModified": 1749794982,
         "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
@@ -1711,16 +1677,16 @@
     },
     "nixpkgs_9": {
       "locked": {
-        "lastModified": 1730272153,
+        "lastModified": 1749794982,
-        "narHash": "sha256-B5WRZYsRlJgwVHIV6DvidFN7VX7Fg9uuwkRW9Ha8z+w=",
+        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2d2a9ddbe3f2c00747398f3dc9b05f7f2ebb0f53",
+        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixpkgs-unstable",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -1769,7 +1735,7 @@
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts_3",
-        "nixpkgs": "nixpkgs_12",
+        "nixpkgs": "nixpkgs_11",
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
@@ -1887,7 +1853,7 @@
     "rbw-bitw": {
       "inputs": {
         "flakelib": "flakelib_2",
-        "nixpkgs": "nixpkgs_14",
+        "nixpkgs": "nixpkgs_13",
         "rust": "rust_2"
       },
       "locked": {
@@ -1929,9 +1895,8 @@
         "neorg-overlay": "neorg-overlay",
         "nix-gaming": "nix-gaming",
         "nix-index-database": "nix-index-database",
-        "nix-proton-cachyos": "nix-proton-cachyos",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_10",
+        "nixpkgs": "nixpkgs_9",
         "nixpkgs-xr": "nixpkgs-xr",
         "nur": "nur",
         "plasma-manager": "plasma-manager",
@@ -2170,7 +2135,7 @@
     },
     "spicetify-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_15",
+        "nixpkgs": "nixpkgs_14",
         "systems": "systems_5"
       },
       "locked": {

flake.nix

@@ -25,7 +25,6 @@
       url = "github:Duckonaut/split-monitor-workspaces";
       inputs.hyprland.follows = "hyprland"; # <- make sure this line is present for the plugin to work as intended
     };
-    nix-proton-cachyos.url = "github:kittywitch/nix-proton-cachyos";
     # used for overriding unwanted flake inputs
     empty.url = "github:input-output-hk/empty-flake";
     # self-explanatory

home/profiles/graphical/packages.nix

@@ -8,7 +8,7 @@
     htop
 
     # Mail
-    thunderbird
+    #thunderbird
 
     # Chat
     tdesktop # Telegram

nixos/profiles/gaming/lutris.nix

@@ -15,9 +15,6 @@ programs.gamescope = {
   };
   environment.systemPackages = with pkgs; [
     (lutris.override {
-      extraLinkLines = let
-      proton-cachyos = inputs.nix-proton-cachyos.packages.${pkgs.system}.proton-cachyos;
-        in ''ln -sf ${proton-cachyos}/share/steam $out/share'';
       extraPkgs = pkgs: [
         pkgs.gamescope
         pkgs.libnghttp2
@@ -29,7 +26,6 @@ programs.gamescope = {
         pkgs.vkbasalt
         pkgs.umu-launcher
         pkgs.xdg-desktop-portal
-        inputs.nix-proton-cachyos.packages.${pkgs.system}.proton-cachyos
       ];
       extraLibraries = pkgs: [
         pkgs.libunwind
@@ -38,7 +34,6 @@ programs.gamescope = {
         pkgs.jansson
         pkgs.samba
         pkgs.xz
-        inputs.nix-proton-cachyos.packages.x86_64-linux.proton-cachyos
       ];
     })
 

nixos/profiles/gaming/steam.nix

@@ -4,7 +4,6 @@
     remotePlay.openFirewall = true;
     platformOptimizations.enable = true;
     extraCompatPackages = [
-        inputs.nix-proton-cachyos.packages.${pkgs.system}.proton-cachyos
     ];
   };
 }

packages/lutris.nix

@@ -1,324 +0,0 @@
-{
-  lib,
-  buildFHSEnv,
-  lutris-unwrapped,
-  extraLinkLines ? '''',
-  extraPkgs ? pkgs: [ ],
-  extraLibraries ? pkgs: [ ],
-  steamSupport ? true,
-}:
-
-let
-
-  qt5Deps =
-    pkgs: with pkgs.qt5; [
-      qtbase
-      qtmultimedia
-    ];
-  qt6Deps = pkgs: with pkgs.qt6; [ qtbase ];
-  gnomeDeps =
-    pkgs: with pkgs; [
-      zenity
-      gtksourceview
-      gnome-desktop
-      libgnome-keyring
-      webkitgtk_4_1
-    ];
-  xorgDeps =
-    pkgs: with pkgs.xorg; [
-      libX11
-      libXrender
-      libXrandr
-      libxcb
-      libXmu
-      libpthreadstubs
-      libXext
-      libXdmcp
-      libXxf86vm
-      libXinerama
-      libSM
-      libXv
-      libXaw
-      libXi
-      libXcursor
-      libXcomposite
-      libXfixes
-      libXtst
-      libXScrnSaver
-      libICE
-      libXt
-    ];
-  gstreamerDeps =
-    pkgs: with pkgs.gst_all_1; [
-      gstreamer
-      gst-plugins-base
-      gst-plugins-good
-      gst-plugins-ugly
-      gst-plugins-bad
-      gst-libav
-    ];
-
-in
-buildFHSEnv {
-  pname = "lutris";
-  inherit (lutris-unwrapped) version;
-
-  runScript = "lutris";
-
-  # Many native and WINE games need 32bit
-  multiArch = true;
-
-  targetPkgs =
-    pkgs:
-    with pkgs;
-    [
-      lutris-unwrapped
-
-      # Appimages
-      fuse
-
-      # Adventure Game Studio
-      allegro
-      dumb
-
-      # Battle.net
-      jansson
-
-      # Curl
-      libnghttp2
-
-      # Desmume
-      lua
-      agg
-      soundtouch
-      openal
-      desktop-file-utils
-      atk
-
-      # DGen // TODO: libarchive is broken
-
-      # Dolphin
-      bluez
-      ffmpeg_6
-      gettext
-      portaudio
-      miniupnpc
-      mbedtls_2
-      lzo
-      sfml
-      gsm
-      wavpack
-      orc
-      nettle
-      gmp
-      pcre
-      vulkan-loader
-      zstd
-
-      # DOSBox
-      SDL_net
-      SDL_sound
-
-      # GOG
-      glib-networking
-
-      # Higan // TODO: "higan is not available for the x86_64 architecture"
-
-      # Libretro
-      fluidsynth
-      hidapi
-      libgbm
-      libdrm
-
-      # MAME
-      fontconfig
-      SDL2_ttf
-
-      # Mednafen
-      libglut
-      mesa_glu
-
-      # MESS
-      expat
-
-      # Minecraft
-      nss
-
-      # Mupen64Plus
-      boost
-      dash
-
-      # Overwatch 2
-      libunwind
-
-      # PPSSPP
-      glew
-      snappy
-
-      # Redream // "redream is not available for the x86_64 architecture"
-
-      # RPCS3
-      llvm
-      e2fsprogs
-      libgpg-error
-
-      # ScummVM
-      nasm
-      sndio
-
-      # ResidualVM is now merged with ScummVM and therefore does not exist anymore
-      flac
-
-      # Snes9x
-      libepoxy
-      minizip
-
-      # Vice
-      bison
-      flex
-
-      # WINE
-      xorg.xrandr
-      perl
-      which
-      p7zip
-      gnused
-      gnugrep
-      psmisc
-      opencl-headers
-
-      # ZDOOM
-      soundfont-fluid
-      bzip2
-      game-music-emu
-    ]
-    ++ qt5Deps pkgs
-    ++ qt6Deps pkgs
-    ++ gnomeDeps pkgs
-    ++ lib.optional steamSupport pkgs.steam
-    ++ extraPkgs pkgs;
-
-  multiPkgs =
-    pkgs:
-    with pkgs;
-    [
-      # Common
-      libsndfile
-      libtheora
-      libogg
-      libvorbis
-      libopus
-      libGLU
-      libpcap
-      libpulseaudio
-      libao
-      libevdev
-      udev
-      libgcrypt
-      libxml2
-      libusb1
-      libpng
-      libmpeg2
-      libv4l
-      libjpeg
-      libxkbcommon
-      libass
-      libcdio
-      libjack2
-      libsamplerate
-      libzip
-      libmad
-      libaio
-      libcap
-      libtiff
-      libva
-      libgphoto2
-      libxslt
-      libsndfile
-      giflib
-      zlib
-      glib
-      alsa-lib
-      zziplib
-      bash
-      dbus
-      keyutils
-      zip
-      cabextract
-      freetype
-      unzip
-      coreutils
-      readline
-      gcc
-      SDL
-      SDL2
-      curl
-      graphite2
-      gtk2
-      gtk3
-      udev
-      ncurses
-      wayland
-      libglvnd
-      vulkan-loader
-      xdg-utils
-      sqlite
-      gnutls
-      p11-kit
-      libbsd
-      harfbuzz
-
-      # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64"
-
-      # WINE
-      cups
-      lcms2
-      mpg123
-      cairo
-      unixODBC
-      samba4
-      sane-backends
-      openldap
-      ocl-icd
-      util-linux
-      libkrb5
-
-      # Proton
-      libselinux
-
-      # Winetricks
-      fribidi
-      pango
-    ]
-    ++ xorgDeps pkgs
-    ++ gstreamerDeps pkgs
-    ++ extraLibraries pkgs;
-
-  extraInstallCommands = ''
-    mkdir -p $out/share
-    ln -sf ${lutris-unwrapped}/share/applications $out/share
-    ln -sf ${lutris-unwrapped}/share/icons $out/share
-    '' + extraLinkLines;
-
-  # allows for some gui applications to share IPC
-  # this fixes certain issues where they don't render correctly
-  unshareIpc = false;
-
-  # Some applications such as Natron need access to MIT-SHM or other
-  # shared memory mechanisms. Unsharing the pid namespace
-  # breaks the ability for application to reference shared memory.
-  unsharePid = false;
-
-  meta = {
-    inherit (lutris-unwrapped.meta)
-      homepage
-      description
-      platforms
-      license
-      maintainers
-      broken
-      ;
-
-    mainProgram = "lutris";
-  };
-}

packages/umu-launcher-unwrapped.nix

@@ -1,106 +0,0 @@
-{
-  bash,
-  cargo,
-  fetchFromGitHub,
-  hatch,
-  lib,
-  nix-update-script,
-  python3Packages,
-  rustPlatform,
-  scdoc,
-  writableTmpDirAsHomeHook,
-  withTruststore ? true,
-  withDeltaUpdates ? true,
-}:
-python3Packages.buildPythonPackage rec {
-  pname = "umu-launcher-unwrapped";
-  version = "1.2.6";
-
-  src = fetchFromGitHub {
-    owner = "Open-Wine-Components";
-    repo = "umu-launcher";
-    tag = version;
-    hash = "sha256-DkfB78XhK9CXgN/OpJZTjwHB7IcLC4h2HM/1JW42ZO0=";
-  };
-
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
-    hash = "sha256-JhNErFDJsM20BhgIgJSUBeNzAst8f+s1NzpLfl2m2es=";
-  };
-
-  nativeCheckInputs = [
-    writableTmpDirAsHomeHook
-    python3Packages.pytestCheckHook
-  ];
-
-  nativeBuildInputs = [
-    cargo
-    hatch
-    python3Packages.build
-    python3Packages.installer
-    rustPlatform.cargoSetupHook
-    scdoc
-  ];
-
-  patches = [
-    ./umu-proton-cachyos.patch
-  ];
-
-  pythonPath =
-    with python3Packages;
-    [
-      pyzstd
-      urllib3
-      xlib
-    ]
-    ++ lib.optionals withTruststore [
-      truststore
-    ]
-    ++ lib.optionals withDeltaUpdates [
-      cbor2
-      xxhash
-    ];
-
-  pyproject = false;
-  configureScript = "./configure.sh";
-
-  configureFlags = [
-    "--use-system-pyzstd"
-    "--use-system-urllib"
-  ];
-
-  makeFlags = [
-    "PYTHONDIR=$(PREFIX)/${python3Packages.python.sitePackages}"
-    "PYTHON_INTERPRETER=${lib.getExe python3Packages.python}"
-    # Override RELEASEDIR to avoid running `git describe`
-    "RELEASEDIR=${pname}-${version}"
-    "SHELL_INTERPRETER=${lib.getExe bash}"
-  ];
-
-  disabledTests = [
-    # Broken? Asserts that $STEAM_RUNTIME_LIBRARY_PATH is non-empty
-    # Fails with AssertionError: '' is not true : Expected two elements in STEAM_RUNTIME_LIBRARY_PATHS
-    "test_game_drive_empty"
-    "test_game_drive_libpath_empty"
-
-    # Broken? Tests parse_args with no options (./umu_run.py)
-    # Fails with AssertionError: SystemExit not raised
-    "test_parse_args_noopts"
-  ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Unified launcher for Windows games on Linux using the Steam Linux Runtime and Tools";
-    changelog = "https://github.com/Open-Wine-Components/umu-launcher/releases/tag/${version}";
-    homepage = "https://github.com/Open-Wine-Components/umu-launcher";
-    license = lib.licenses.gpl3;
-    mainProgram = "umu-run";
-    maintainers = with lib.maintainers; [
-      diniamo
-      MattSturgeon
-      fuzen
-    ];
-    platforms = lib.platforms.linux;
-  };
-}

systems/koishi.nix

@@ -47,6 +47,7 @@ _: let
         graphical
         wireless
         laptop
+          gaming
           sdr
           #virtualisation
           #secureboot