diff --git a/flake.lock b/flake.lock index e22fe2c..c5b948c 100644 --- a/flake.lock +++ b/flake.lock @@ -54,11 +54,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1723362943, + "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "a58bc8ad779655e790115244571758e8de055e3d", "type": "github" }, "original": { diff --git a/general/networking.nix b/general/networking.nix index 882758f..b186bd7 100644 --- a/general/networking.nix +++ b/general/networking.nix @@ -43,4 +43,8 @@ # port = 8998; # extraArgs = [ "--password pouicbarilstepson123cassoulet" ]; #}; + + # Bluetooth + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; } diff --git a/general/user/packages.nix b/general/user/packages.nix index 64e306d..7d4a669 100644 --- a/general/user/packages.nix +++ b/general/user/packages.nix @@ -83,6 +83,7 @@ in { (prismlauncher.override { withWaylandGLFW = true; }) vvvvvv ryujinx + dolphin-emu # Nix home-manager @@ -189,7 +190,6 @@ in { "dev.tchx84.Gameeky.ThematicPack.FreedomValley" "dev.tchx84.Gameeky.ThematicPack.Blasterman" "dev.tchx84.Gameeky.ThematicPack.Wackman" - { appId = "org.DolphinEmu.dolphin-emu"; commit = "187e367202f4ec0a50b94d700aa50c04142d13561e3054fcf1030380d3ae86a6"; } # Programming { appId = "org.gnome.Builder.Devel"; origin = "gnome-nightly"; } @@ -200,4 +200,27 @@ in { update.onActivation = true; update.auto.enable = true; }; + + # Version pins + nixpkgs.overlays = [ (final: prev: { + dolphin-emu = prev.dolphin-emu.overrideAttrs (super: { + version = "2407"; + commit = "b92e354389bb7c0bd114a8631b8af110d3cb3a14"; + + src = pkgs.fetchFromGitHub { + owner = "dolphin-emu"; + repo = "dolphin"; + rev = "heads/refs/tags/${final.dolphin-emu.version}"; + hash = "sha256-8W4KyIj+rhDkWnQogjpzlEJVo3HJenfpWKimSyMGN7c="; + fetchSubmodules = true; + }; + + cmakeFlags = [ + "-DDISTRIBUTOR=NixOS" + "-DDOLPHIN_WC_BRANCH=${final.dolphin-emu.src.rev}" + "-DDOLPHIN_WC_DESCRIBE=${final.dolphin-emu.version}" + "-DDOLPHIN_WC_REVISION=${final.dolphin-emu.commit}" + ]; + }); + }) ]; }