diff options
| author | tv <tv@krebsco.de> | 2024-06-05 14:33:00 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2024-06-05 14:33:00 +0200 |
| commit | af6f1de6d1c1eb4f4cd9510e1826042ed265b776 (patch) | |
| tree | 59a8557047979d7e8f7d93eb8abd71fe20a57fb4 | |
| parent | ae0418299ec94648520da96c59ea7d85cfb8016d (diff) | |
xmonad shell: stockholm -> hrm
| -rw-r--r-- | pkgs/haskell/xmonad-tv/shell.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/haskell/xmonad-tv/shell.nix b/pkgs/haskell/xmonad-tv/shell.nix index 6ca00bc..c50bdd9 100644 --- a/pkgs/haskell/xmonad-tv/shell.nix +++ b/pkgs/haskell/xmonad-tv/shell.nix @@ -1,9 +1,13 @@ { compiler ? "default" }: let - stockholm = import <stockholm>; + inherit (import ~/sync/src/hrm) lib mylib; + krops.lib = import ~/sync/src/krops/lib; - inherit (stockholm.systems.${lib.krops.getHostName}) config pkgs; - inherit (stockholm) lib; + hrm = import ~/sync/src/hrm/legacy.nix {}; + + hostName = krops.lib.maybeHostName (builtins.throw "no hostname found"); + + inherit (hrm.nixosConfigurations.${hostName}) config pkgs; haskellPackages = if compiler == "default" @@ -16,7 +20,7 @@ in lib.overrideDerivation xmonadDrv.env (oldAttrs: { shellHook = '' - pkg_name=${lib.shell.escape (lib.baseNameOf (toString ./.))} + pkg_name=${mylib.shell.escape (builtins.baseNameOf (toString ./.))} WORKDIR=${toString ./src} CACHEDIR=$HOME/tmp/$pkg_name @@ -24,11 +28,11 @@ in mkdir -p "$CACHEDIR" - config_XMONAD_CACHE_DIR=${lib.shell.escape + config_XMONAD_CACHE_DIR=${mylib.shell.escape config.systemd.services.xmonad.environment.XMONAD_CACHE_DIR } - xmonad=$CACHEDIR/xmonad-${lib.currentSystem} + xmonad=$CACHEDIR/xmonad-${builtins.currentSystem} xmonad_build() {( set -efu |