diff --git a/configuration.nix b/configuration.nix index 1f2634d..2c8e0b8 100644 --- a/configuration.nix +++ b/configuration.nix @@ -10,7 +10,7 @@ ./packages/hardwarepkgs.nix ./packages/miscpkgs.nix ./packages/plasmapkgs.nix - #./packages/steampkgs.nix + ./packages/steampkgs.nix ./packages/systempkgs.nix # Settings ./system/boot.nix diff --git a/flake.lock b/flake.lock index 8a68488..9a41173 100644 --- a/flake.lock +++ b/flake.lock @@ -24,9 +24,7 @@ "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1722666143, @@ -66,6 +64,37 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1722185531, + "narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1722791413, + "narHash": "sha256-rCTrlCWvHzMCNcKxPE3Z/mMK2gDZ+BvvpEVyRM4tKmU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "8b5b6723aca5a51edf075936439d9cd3947b7b2c", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "release-24.05", + "type": "indirect" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1722630782, "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", @@ -80,21 +109,6 @@ "type": "indirect" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1722774551, - "narHash": "sha256-Fzix9HqVjzaOZLMkjhgLkb7l32GpK3GY7Xvb9wFKb+E=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "bda052c9d934a49b30274b140dcd500624687f7d", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "release-24.05", - "type": "indirect" - } - }, "plasma-manager": { "inputs": { "home-manager": [ @@ -123,7 +137,7 @@ "inputs": { "home-manager": "home-manager", "jovian": "jovian", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixpkgs-stable": "nixpkgs-stable", "plasma-manager": "plasma-manager" } diff --git a/flake.nix b/flake.nix index c9364db..26e5c7c 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,6 @@ nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs-stable.url = "nixpkgs/release-24.05"; jovian.url = "github:Jovian-Experiments/Jovian-NixOS/development"; - jovian.inputs.nixpkgs.follows = "nixpkgs"; home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; plasma-manager.url = "github:nix-community/plasma-manager/trunk"; @@ -24,7 +23,7 @@ specialArgs = { inherit pkgs pkgs-stable; }; modules = [ ./configuration.nix - #jovian.nixosModules.default + jovian.nixosModules.default home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/packages/steampkgs.nix b/packages/steampkgs.nix index 8c9132f..2a23c14 100644 --- a/packages/steampkgs.nix +++ b/packages/steampkgs.nix @@ -1,4 +1,4 @@ -{ ... }: +{ jovian, ... }: { jovian.steam = { enable = true;