diff options
Diffstat (limited to '')
| -rw-r--r-- | modules/common/common/nix/default.nix | 61 | ||||
| -rw-r--r-- | modules/common/profiles/dev/default.nix | 4 |
2 files changed, 40 insertions, 25 deletions
diff --git a/modules/common/common/nix/default.nix b/modules/common/common/nix/default.nix index dea9358..723a2b8 100644 --- a/modules/common/common/nix/default.nix +++ b/modules/common/common/nix/default.nix @@ -99,7 +99,23 @@ with lib; { patches = [./patches/alejandra-no-ads.patch]; }); - inherit (pkgsPR "225985" "sha256-wS8vyIEH2gFt3cLvSrROTULu8N8FCUle6cy2zqHN+VI=") mangohud; + openmw = super.openmw.overrideAttrs (_: final: { + src = super.fetchFromGitHub { + owner = "OpenMW"; + repo = "openmw"; + rev = "openmw-48-rc9"; + hash = "sha256-3x+pwtZh+moLN3l1x5Q0rr9TKo3BMaul73ZgywrRBCk="; + }; + patches = []; + buildInputs = + final.buildInputs + ++ (with super; [ + yaml-cpp + luajit + ]); + }); + + inherit (pkgsPR "228852" "sha256-NKZySJ3IVMMeSmpc1zYwse52kxGg0dIrsHTMcO8a73Y=") soju; } // (with super; let np = nodePackages; @@ -129,33 +145,28 @@ with lib; { environment.systemPackages = with pkgs; optionals this.isHeadful [ - hydra-check nix-top nix-tree ]; - hm.home = { - packages = with pkgs; [nix-index]; - - file.".nix-defexpr/default.nix".text = - optionalString this.isHeadful - ( + hm.home.file.".nix-defexpr/default.nix".text = + optionalString this.isHeadful + ( + let + hostname = strings.escapeNixIdentifier this.hostname; + in '' let - hostname = strings.escapeNixIdentifier this.hostname; - in '' - let - self = builtins.getFlake "nixfiles"; - configurations = self.nixosConfigurations; - local = configurations.${hostname}; - in rec { - inherit self; - inherit (self) inputs lib; - inherit (lib) my; - this = my.configurations.${hostname}; - inherit (local) config; - inherit (local.config.system.build) toplevel vm vmWithBootLoader manual; - } // configurations // local._module.args - '' - ); - }; + self = builtins.getFlake "nixfiles"; + configurations = self.nixosConfigurations; + local = configurations.${hostname}; + in rec { + inherit self; + inherit (self) inputs lib; + inherit (lib) my; + this = my.configurations.${hostname}; + inherit (local) config; + inherit (local.config.system.build) toplevel vm vmWithBootLoader manual; + } // configurations // local._module.args + '' + ); } diff --git a/modules/common/profiles/dev/default.nix b/modules/common/profiles/dev/default.nix index 210924a..442a03a 100644 --- a/modules/common/profiles/dev/default.nix +++ b/modules/common/profiles/dev/default.nix @@ -80,7 +80,11 @@ in { packages = with pkgs; [ htmlq + hydra-check jq + nix-index + nix-update + nixpkgs-review yq ]; }; |