diff --git a/flake.lock b/flake.lock index 395e3bf..f33a623 100644 --- a/flake.lock +++ b/flake.lock @@ -144,15 +144,17 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-unstable": [ + "nixpkgs-unstable" + ], "utils": "utils" }, "locked": { - "lastModified": 1658887125, - "narHash": "sha256-evUl+58qvhEYA/A55hd8Y/bQMwS7i1GuUlVeTHg9IDk=", + "lastModified": 1665632996, + "narHash": "sha256-v5Zg5nPuIFtzk4wJQu74vQzZ4H/gLIDjbrqMUNdNzNI=", "owner": "nathans-flakes", "repo": "gamescope", - "rev": "019dfcc926a31dd399940befe1ac67c17a442db8", + "rev": "47b1930844af94f2bdbd619ae62beecb805960b1", "type": "github" }, "original": { @@ -164,11 +166,11 @@ "gamescope-src": { "flake": false, "locked": { - "lastModified": 1658761788, - "narHash": "sha256-tyzRnyB4MZ3e30pn/mPxE5E0VOBeKgcnFmhB8iM0IJA=", + "lastModified": 1665507944, + "narHash": "sha256-+0ekpjSb/1PRX84uGY8fDN2r4N+zn1xnbvG++QSvRb4=", "ref": "master", - "rev": "cce6a29a2494eaf8f99e299a39b957fda3fcdb2a", - "revCount": 1140, + "rev": "f51b7229ae80794e514be20e6080ba4e93864a57", + "revCount": 1234, "submodules": true, "type": "git", "url": "https://github.com/Plagman/gamescope.git" @@ -383,22 +385,6 @@ } }, "nixpkgs-unstable": { - "locked": { - "lastModified": 1658644204, - "narHash": "sha256-MWyfCH9K3eVTXJUxBi67OQSAh9jJAnvWklM6qm4j8w8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2f0c3be57c348f4cfd8820f2d189e29a685d9c41", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable_2": { "locked": { "lastModified": 1665259268, "narHash": "sha256-ONFhHBLv5nZKhwV/F2GOH16197PbvpyWhoO0AOyktkU=", @@ -487,7 +473,7 @@ "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", - "nixpkgs-unstable": "nixpkgs-unstable_2", + "nixpkgs-unstable": "nixpkgs-unstable", "polymc": "polymc", "quilt-server": "quilt-server", "sops-nix": "sops-nix", @@ -550,11 +536,11 @@ }, "utils": { "locked": { - "lastModified": 1656928814, - "narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=", + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "owner": "numtide", "repo": "flake-utils", - "rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e9f1403..78203c6 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,11 @@ }; gamescope = { url = "github:nathans-flakes/gamescope"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + nixpkgs-unstable.follows = "nixpkgs-unstable"; + }; + }; nix-on-droid = { url = "github:t184256/nix-on-droid"; diff --git a/home-manager/linux/default.nix b/home-manager/linux/default.nix index b8e28e3..085ac04 100644 --- a/home-manager/linux/default.nix +++ b/home-manager/linux/default.nix @@ -15,6 +15,7 @@ with lib; with nLib; { ./programs/media.nix ./programs/wine.nix ./programs/gpg.nix + ./programs/games.nix ./services/syncthing.nix ./services/email.nix ]; @@ -43,6 +44,10 @@ with lib; with nLib; { devel = { jvm = mkDefaultOption "JVM Development Utilites" config.nathan.config.isDesktop; }; + # Install games + games = { + launcher = mkEnableOption "Game launcher"; + }; # Swaywm and supoorting application configuration swaywm = { enable = mkDefaultOption "swaywm" config.nathan.config.isDesktop; diff --git a/home-manager/linux/programs/games.nix b/home-manager/linux/programs/games.nix new file mode 100644 index 0000000..2f8070d --- /dev/null +++ b/home-manager/linux/programs/games.nix @@ -0,0 +1,13 @@ +{ config, lib, pkgs, ... }: + +with lib; { + config = mkMerge [ + # eidolon game launcher + (mkIf config.nathan.programs.games.launcher { + # Install the launcher + home.packages = with pkgs; [ + eidolon + ]; + }) + ]; +} diff --git a/machines/levitation/home.nix b/machines/levitation/home.nix index 763dad9..0fb695b 100644 --- a/machines/levitation/home.nix +++ b/machines/levitation/home.nix @@ -14,6 +14,9 @@ util = { wine = true; }; + games = { + launcher = true; + }; }; };