diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/Xresources.nix | 2 | ||||
| -rw-r--r-- | modules/backup.nix | 2 | ||||
| -rw-r--r-- | modules/lid-handler.nix | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/modules/Xresources.nix b/modules/Xresources.nix index 3f9bc11..afba48e 100644 --- a/modules/Xresources.nix +++ b/modules/Xresources.nix @@ -32,7 +32,7 @@ in { DISPLAY = ":${toString config.services.xserver.display}"; }; serviceConfig = { - ExecStart = "${pkgs.xorg.xrdb}/bin/xrdb ${pkgs.tv.Xresources}"; + ExecStart = "${pkgs.xrdb}/bin/xrdb ${pkgs.tv.Xresources}"; RemainAfterExit = true; SyslogIdentifier = "Xresources"; Type = "oneshot"; diff --git a/modules/backup.nix b/modules/backup.nix index 37f8e67..de1fcdd 100644 --- a/modules/backup.nix +++ b/modules/backup.nix @@ -159,6 +159,7 @@ let ${local.rsync} >&2 \ -aAX --delete \ --filter='dir-merge /.backup-filter' \ + --filter='dir-merge /.backup-filter.'${shell.escape plan.dst.host.name} \ --rsh=${shell.escape ssh} \ --rsync-path=${shell.escape remote.rsync} \ --link-dest=${shell.escape plan.dst.path}/current \ @@ -194,6 +195,7 @@ let rsync >&2 \ -aAX --delete \ --filter='dir-merge /.backup-filter' \ + --filter='dir-merge /.backup-filter.'${shell.escape plan.dst.host.name} \ --link-dest="$dst_path/current" \ "$dst_path/current/" \ "$dst_path/$ns/.partial.$name" diff --git a/modules/lid-handler.nix b/modules/lid-handler.nix index d89aced..51f57f0 100644 --- a/modules/lid-handler.nix +++ b/modules/lid-handler.nix @@ -29,10 +29,10 @@ } case $lid_state in open) - run_on_display ${pkgs.xorg.xset}/bin/xset dpms force on + run_on_display ${pkgs.xset}/bin/xset dpms force on ;; closed) - run_on_display ${pkgs.xorg.xset}/bin/xset dpms force off + run_on_display ${pkgs.xset}/bin/xset dpms force off ;; esac else |