diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2022-05-21 17:52:39 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2022-05-21 17:52:39 +0200 |
| commit | b8b9f52393a29cba011a79d20e3cc3dcac29192b (patch) | |
| tree | 609c716c876648a401cb57248d72635b1d8c8b84 /nixos | |
| parent | 77bded3c433fbd36e2d834c6416150f20de2ae2e (diff) | |
| parent | 3925da79a55c954b9bdf5ca92799210484f36832 (diff) | |
Merge branch 'master' into staging-next
Conflicts: - pkgs/applications/networking/browsers/firefox/common.nix between 318fae87c0b61eb2eabe6d96b5824cc6e282c513 and f6c57619358d51e71a5298503c84e1c1ce4f9f12.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 | ||||
| -rw-r--r-- | nixos/tests/xmonad.nix | 15 |
2 files changed, 10 insertions, 6 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 8983bc5d75821..083b12193dab0 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -291,6 +291,7 @@ in # Only install appcenter if flatpak is enabled before # https://github.com/NixOS/nixpkgs/issues/15932 is resolved. appcenter + sideload ])) config.environment.pantheon.excludePackages; # needed by screenshot diff --git a/nixos/tests/xmonad.nix b/nixos/tests/xmonad.nix index aa55f0e3ca6f2..ec48c3e112750 100644 --- a/nixos/tests/xmonad.nix +++ b/nixos/tests/xmonad.nix @@ -13,7 +13,9 @@ let import System.Environment (getArgs) import System.FilePath ((</>)) - main = launch $ def { startupHook = startup } `additionalKeysP` myKeys + main = do + dirs <- getDirectories + launch (def { startupHook = startup } `additionalKeysP` myKeys) dirs startup = isSessionStart >>= \sessInit -> spawn "touch /tmp/${name}" @@ -23,14 +25,15 @@ let compiledConfig = printf "xmonad-%s-%s" arch os - compileRestart resume = - whenX (recompile True) $ + compileRestart resume = do + dirs <- asks directories + + whenX (recompile dirs True) $ when resume writeStateToFile *> catchIO ( do - dir <- getXMonadDataDir args <- getArgs - executeFile (dir </> compiledConfig) False args Nothing + executeFile (cacheDir dirs </> compiledConfig) False args Nothing ) ''; @@ -94,7 +97,7 @@ in { # set up the new config machine.succeed("mkdir -p ${user.home}/.xmonad") - machine.copy_from_host("${newConfig}", "${user.home}/.xmonad/xmonad.hs") + machine.copy_from_host("${newConfig}", "${user.home}/.config/xmonad/xmonad.hs") # recompile xmonad using the new config machine.send_key("alt-ctrl-q") |