diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/common/common/nix/default.nix | 34 | ||||
| -rw-r--r-- | modules/common/mpv.nix | 3 | ||||
| -rw-r--r-- | modules/nixos/games/steam-run.nix | 4 | ||||
| -rw-r--r-- | modules/nixos/games/steam.nix | 5 |
4 files changed, 23 insertions, 23 deletions
diff --git a/modules/common/common/nix/default.nix b/modules/common/common/nix/default.nix index fa1c85e..5dda142 100644 --- a/modules/common/common/nix/default.nix +++ b/modules/common/common/nix/default.nix @@ -29,17 +29,17 @@ with lib; { }; nix = let - filteredInputs = filterAttrs (n: _: n != "self") inputs; + notSelfInputs = filterAttrs (n: _: n != "self") inputs; in { settings = { + # https://nixos.org/manual/nix/unstable/contributing/experimental-features.html#currently-available-experimental-features # https://github.com/NixOS/nix/blob/master/src/libutil/experimental-features.cc experimental-features = concatStringsSep " " [ - "ca-derivations" "flakes" "nix-command" - "recursive-nix" "repl-flake" ]; + keep-derivations = if this.isHeadful then "true" @@ -48,20 +48,10 @@ with lib; { if this.isHeadful then "true" else "false"; - flake-registry = "${inputs.flake-registry}/flake-registry.json"; - warn-dirty = false; - }; - nixPath = - mapAttrsToList (n: v: "${n}=${v}") filteredInputs - ++ ["nixfiles=${config.my.home}/src/nixfiles"]; - - registry = - mapAttrs (_: flake: {inherit flake;}) filteredInputs - // {nixfiles.flake = inputs.self;}; + flake-registry = "${inputs.flake-registry}/flake-registry.json"; - settings = { - trusted-users = ["root" localUsername]; + warn-dirty = false; substituters = [ "https://azahi.cachix.org" @@ -77,7 +67,17 @@ with lib; { "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "pre-commit-hooks.cachix.org-1:Pkk3Panw5AW24TOv6kz3PvLhlH8puAsJTBbOPmBo7Rc=" ]; + + trusted-users = ["root" localUsername]; }; + + nixPath = + mapAttrsToList (n: v: "${n}=${v}") notSelfInputs + ++ ["nixfiles=${config.my.home}/src/nixfiles"]; + + registry = + mapAttrs (_: flake: {inherit flake;}) notSelfInputs + // {nixfiles.flake = inputs.self;}; }; nixpkgs.overlays = with inputs; [ @@ -104,8 +104,8 @@ with lib; { src = super.fetchFromGitHub { owner = "OpenMW"; repo = "openmw"; - rev = "openmw-48-rc9"; - hash = "sha256-3x+pwtZh+moLN3l1x5Q0rr9TKo3BMaul73ZgywrRBCk="; + rev = "openmw-48-rc10"; + hash = "sha256-BIeCVM2O/YBgRjAedxe5/NqXpYeHggn3eSnHLgZtX80="; }; patches = []; buildInputs = diff --git a/modules/common/mpv.nix b/modules/common/mpv.nix index 0421d62..97f406c 100644 --- a/modules/common/mpv.nix +++ b/modules/common/mpv.nix @@ -34,6 +34,9 @@ in { "Shift+UP" = "no-osd seek 5 exact"; "Shift+DOWN" = "no-osd seek -5 exact"; + "Alt+h" = "add sub-delay +1"; + "Alt+l" = "add sub-delay -1"; + "Alt+k" = "add sub-scale +0.1"; "Alt+j" = "add sub-scale -0.1"; diff --git a/modules/nixos/games/steam-run.nix b/modules/nixos/games/steam-run.nix index 37a20e0..f2bce67 100644 --- a/modules/nixos/games/steam-run.nix +++ b/modules/nixos/games/steam-run.nix @@ -42,7 +42,7 @@ in { (glew.overrideAttrs (_: super: let opname = super.pname; in rec { - pname = "${opname}-runfix"; + pname = "${opname}-steam-run-fix"; inherit (super) version; src = fetchurl { url = "mirror://sourceforge/${opname}/${opname}-${version}.tgz"; @@ -52,7 +52,7 @@ in { (fmodex.overrideAttrs (_: super: let opname = super.pname; in rec { - pname = "${opname}-runfix"; + pname = "${opname}-steam-run-fix"; inherit (super) version; installPhase = let libPath = makeLibraryPath [ diff --git a/modules/nixos/games/steam.nix b/modules/nixos/games/steam.nix index 679ce0e..8dfa72c 100644 --- a/modules/nixos/games/steam.nix +++ b/modules/nixos/games/steam.nix @@ -20,9 +20,6 @@ in { }; }; - programs.steam = { - enable = true; - package = with pkgs; steam.override {extraPkgs = _pkgs: [attr];}; - }; + hm.home.packages = with pkgs; [steam]; }; } |