From dd1cf0685af67c4b77286f67d9a3bd7a04fa0931 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Wed, 29 May 2024 14:58:10 -0500 Subject: [PATCH] Use new slippi flake --- flake.lock | 17 +++++++++-------- flake.nix | 4 ++-- modules/nixos/kde-plasma.nix | 1 + nixos/dragon.nix | 1 + 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 92e98d5..8f93c48 100644 --- a/flake.lock +++ b/flake.lock @@ -464,16 +464,17 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "dirtyRev": "300f48c551e1f3942780fac97607308e641c86ef-dirty", - "dirtyShortRev": "300f48c-dirty", - "lastModified": 1717003381, - "narHash": "sha256-a4ZJuN5EG7ECmYkNrMICU/QB6v7Obbv2nAhyy87057Y=", - "type": "git", - "url": "file:///home/daniel/code/open-source/slippi-nix" + "lastModified": 1717012196, + "narHash": "sha256-Ec+rw6b09Y7TvkyJMl2aeYKAkVsMDBbpFX36M9shkJU=", + "owner": "lytedev", + "repo": "slippi-nix", + "rev": "8acf1ffff22c8fe46916e132b510f9df21a82c1b", + "type": "github" }, "original": { - "type": "git", - "url": "file:///home/daniel/code/open-source/slippi-nix" + "owner": "lytedev", + "repo": "slippi-nix", + "type": "github" } }, "sops-nix": { diff --git a/flake.nix b/flake.nix index 98a727e..5562cb3 100644 --- a/flake.nix +++ b/flake.nix @@ -31,8 +31,8 @@ # ssbm.url = "github:lytedev/ssbm-nix"; # ssbm.url = "git+file:///home/daniel/code/open-source/ssbm-nix"; - # slippi.url = "github:lytedev/slippi-nix"; - slippi.url = "git+file:///home/daniel/code/open-source/slippi-nix"; + slippi.url = "github:lytedev/slippi-nix"; + # slippi.url = "git+file:///home/daniel/code/open-source/slippi-nix"; }; outputs = { diff --git a/modules/nixos/kde-plasma.nix b/modules/nixos/kde-plasma.nix index fe59e70..d9599f6 100644 --- a/modules/nixos/kde-plasma.nix +++ b/modules/nixos/kde-plasma.nix @@ -17,6 +17,7 @@ services.desktopManager.plasma6.enable = true; services.displayManager.sddm.enable = true; services.displayManager.sddm.wayland.enable = true; + services.xserver.enable = true; qt.enable = true; programs.dconf.enable = true; services.dbus.enable = true; diff --git a/nixos/dragon.nix b/nixos/dragon.nix index f214e7d..2b35b72 100644 --- a/nixos/dragon.nix +++ b/nixos/dragon.nix @@ -64,6 +64,7 @@ slippi.launcher = { enable = true; isoPath = "${config.home-manager.users.daniel.home.homeDirectory}/../games/roms/dolphin/melee.iso"; + launchMeleeOnPlay = false; }; } hyprland