switching back to nixpackages for now, try to setup proton ge

This commit is contained in:
Christoph Hollizeck 2024-05-17 22:26:15 +02:00
parent 4a4c55b6e5
commit 5dd9aaa958
No known key found for this signature in database
5 changed files with 47 additions and 38 deletions

View file

@ -437,11 +437,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1715077503, "lastModified": 1715930644,
"narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6e277d9566de9976f47228dd8c580b97488734d4", "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -539,11 +539,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1715148395, "lastModified": 1715881912,
"narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", "narHash": "sha256-e4LJk5uV1wvrRkffGFZekPWvFUx29NnnOahBlLaq8Ek=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", "rev": "ff1be1e3cdf884df0935ab28745ab13c3c26d828",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -604,11 +604,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1714858427, "lastModified": 1715458492,
"narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=", "narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76", "rev": "8e47858badee5594292921c2668c11004c3b0142",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -620,15 +620,15 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1715204685, "lastModified": 1715787315,
"narHash": "sha256-ijYRDcFw9YARgkMgAAlsrCqwaw0DmW//gtjtsNvt9iQ=", "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
"owner": "auxolotl", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f7d8c0901f09d32806f205bbc1f95af55b0b1955", "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "auxolotl", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -636,11 +636,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1714809261, "lastModified": 1715413075,
"narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d32560238207b8e26d88b265207b216ee46b8450", "rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -867,11 +867,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1715035358, "lastModified": 1715482972,
"narHash": "sha256-RY6kqhpCPa/q3vbqt3iYRyjO3hJz9KZnshMjbpPon8o=", "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "893e3df091f6838f4f9d71c61ab079d5c5dedbd1", "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -988,15 +988,15 @@
}, },
"unstable_2": { "unstable_2": {
"locked": { "locked": {
"lastModified": 1715204685, "lastModified": 1715787315,
"narHash": "sha256-ijYRDcFw9YARgkMgAAlsrCqwaw0DmW//gtjtsNvt9iQ=", "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
"owner": "auxolotl", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f7d8c0901f09d32806f205bbc1f95af55b0b1955", "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "auxolotl", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"

View file

@ -3,8 +3,8 @@
inputs = { inputs = {
# nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11"; # nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs.url = "github:auxolotl/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
unstable.url = "github:auxolotl/nixpkgs/nixos-unstable"; unstable.url = "github:nixos/nixpkgs/nixos-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/master";

View file

@ -19,9 +19,15 @@ in
environment.systemPackages = with pkgs; [ factorio-headless ]; environment.systemPackages = with pkgs; [ factorio-headless ];
sops = { sops = {
secrets = { secrets = {
factorio_token = { restartUnits = ["factorio.service"]; }; factorio_token = {
factorio_username = { restartUnits = ["factorio.service"]; }; restartUnits = [ "factorio.service" ];
factorio_game_password = { restartUnits = ["factorio.service"]; }; };
factorio_username = {
restartUnits = [ "factorio.service" ];
};
factorio_game_password = {
restartUnits = [ "factorio.service" ];
};
}; };
templates."extraSettingsFile.json".content = '' templates."extraSettingsFile.json".content = ''
{ {

View file

@ -16,9 +16,16 @@ in
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
programs.steam.enable = true; programs.steam = {
programs.steam.remotePlay.openFirewall = true; enable = true;
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true;
extraCompatPackages = with pkgs; [ proton-ge-bin ];
};
environment.systemPackages = with pkgs; [ steam ]; environment.systemPackages = with pkgs; [
steam
protontricks
];
}; };
} }

View file

@ -1,8 +1,4 @@
{ { config, lib, ... }:
config,
lib,
...
}:
with lib; with lib;
with lib.wyrdgard; with lib.wyrdgard;
let let