diff options
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/man.nix | 2 | ||||
| -rw-r--r-- | configs/ssh.nix | 2 | ||||
| -rw-r--r-- | configs/xserver/default.nix | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/configs/man.nix b/configs/man.nix index 8839476..67b2992 100644 --- a/configs/man.nix +++ b/configs/man.nix @@ -8,6 +8,6 @@ environment.systemPackages = [ pkgs.man-pages pkgs.man-pages-posix - pkgs.xorg.xorgdocs + pkgs.xorgdocs ]; } diff --git a/configs/ssh.nix b/configs/ssh.nix index 0dda6e5..031b285 100644 --- a/configs/ssh.nix +++ b/configs/ssh.nix @@ -4,7 +4,7 @@ AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"} ${lib.optionalString config.programs.ssh.setXAuthLocation '' - XAuthLocation ${pkgs.xorg.xauth}/bin/xauth + XAuthLocation ${pkgs.xauth}/bin/xauth ''} ForwardX11 ${if config.programs.ssh.forwardX11 then "yes" else "no"} diff --git a/configs/xserver/default.nix b/configs/xserver/default.nix index 88c1afb..a346c2f 100644 --- a/configs/xserver/default.nix +++ b/configs/xserver/default.nix @@ -34,7 +34,7 @@ in { ]; fonts.packages = [ - pkgs.xorg.fontschumachermisc + pkgs.fontschumachermisc ]; services.xserver = { @@ -77,11 +77,11 @@ in { xmonad-ready = pkgs.writeDash "xmonad-ready" '' ${pkgs.systemd}/bin/systemd-notify --ready { - ${pkgs.xorg.xhost}/bin/xhost +SI:localuser:${cfg.user.name} - ${pkgs.xorg.xhost}/bin/xhost -LOCAL: + ${pkgs.xhost}/bin/xhost +SI:localuser:${cfg.user.name} + ${pkgs.xhost}/bin/xhost -LOCAL: } & - ${pkgs.xorg.xmodmap}/bin/xmodmap ${import ./Xmodmap.nix args} & - ${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c' & + ${pkgs.xmodmap}/bin/xmodmap ${import ./Xmodmap.nix args} & + ${pkgs.xsetroot}/bin/xsetroot -solid '#1c1c1c' & wait ''; in { @@ -146,7 +146,7 @@ in { serviceConfig = { SyslogIdentifier = "xserver"; ExecStart = toString [ - "${pkgs.xorg.xorgserver}/bin/X" + "${pkgs.xorgserver}/bin/X" ":${toString config.services.xserver.display}" "vt${toString config.services.xserver.tty}" "-config ${import ./xserver.conf.nix args}" |