From 0203b7375703df960c8a0eb17deadfe37ca00112 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Fri, 21 Apr 2023 14:24:53 +0100 Subject: [PATCH] Add wayland clipboard, remove X11 forwarding from SSH --- home/H0615-elitherl.nix | 5 +---- home/J0162-elitherl.nix | 5 +---- home/Northstar-xenia.nix | 1 + home/Vanguard-xenia.nix | 1 + home/common/work.nix | 2 ++ home/desktop/wayland.nix | 4 ++++ ssh/config.d/ukaea.conf | 3 --- ssh/config.d/xenia.conf | 1 - 8 files changed, 10 insertions(+), 12 deletions(-) create mode 100644 home/desktop/wayland.nix diff --git a/home/H0615-elitherl.nix b/home/H0615-elitherl.nix index 18953dea..91e4610d 100644 --- a/home/H0615-elitherl.nix +++ b/home/H0615-elitherl.nix @@ -1,7 +1,4 @@ { ... }: { - imports = [ - ./common/work.nix - ./desktop/gtk.nix - ]; + imports = [ ./common/work.nix ]; home.stateVersion = "22.11"; } diff --git a/home/J0162-elitherl.nix b/home/J0162-elitherl.nix index 18953dea..91e4610d 100644 --- a/home/J0162-elitherl.nix +++ b/home/J0162-elitherl.nix @@ -1,7 +1,4 @@ { ... }: { - imports = [ - ./common/work.nix - ./desktop/gtk.nix - ]; + imports = [ ./common/work.nix ]; home.stateVersion = "22.11"; } diff --git a/home/Northstar-xenia.nix b/home/Northstar-xenia.nix index 97796cc2..b2735fde 100644 --- a/home/Northstar-xenia.nix +++ b/home/Northstar-xenia.nix @@ -2,6 +2,7 @@ imports = [ ./common/personal.nix ./desktop/gtk.nix + ./desktop/wayland.nix ./env ./tui ./gui/firefox diff --git a/home/Vanguard-xenia.nix b/home/Vanguard-xenia.nix index 3bdba3b8..81a03345 100644 --- a/home/Vanguard-xenia.nix +++ b/home/Vanguard-xenia.nix @@ -2,6 +2,7 @@ imports = [ ./common/personal.nix ./desktop/gtk.nix + ./desktop/wayland.nix ./env ./tui ./gui/firefox.nix diff --git a/home/common/work.nix b/home/common/work.nix index 028c8601..f520d675 100644 --- a/home/common/work.nix +++ b/home/common/work.nix @@ -1,6 +1,8 @@ { ... }: { imports = [ + ../desktop/gtk.nix + ../desktop/wayland.nix ../env ../tui ../gui/chromium-wayland.nix diff --git a/home/desktop/wayland.nix b/home/desktop/wayland.nix new file mode 100644 index 00000000..fc8fff9c --- /dev/null +++ b/home/desktop/wayland.nix @@ -0,0 +1,4 @@ +{ pkgs, ... }: +{ + home.packages = with pkgs; [ wl-clipboard ]; +} diff --git a/ssh/config.d/ukaea.conf b/ssh/config.d/ukaea.conf index c11ca55e..e1ed1ab0 100644 --- a/ssh/config.d/ukaea.conf +++ b/ssh/config.d/ukaea.conf @@ -21,6 +21,3 @@ Host freia??? Host heimdall* jdc* freia* batch User elitherl - ForwardX11 yes - ForwardX11Timeout 0 - Compression yes diff --git a/ssh/config.d/xenia.conf b/ssh/config.d/xenia.conf index ec202b46..1ea1ec75 100644 --- a/ssh/config.d/xenia.conf +++ b/ssh/config.d/xenia.conf @@ -4,5 +4,4 @@ Host legion xenia xenia.me.uk User xenia HostName xenia.me.uk Port 30 - ForwardX11 no ForwardAgent yes