From d0341aa9d334e1b4dc141e81d64f0667b1e4e56d Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Fri, 26 Nov 2021 21:44:31 -0300 Subject: [PATCH] add wayvnc --- hosts/atlas/default.nix | 1 - users/misterio/features/desktop-sway/default.nix | 1 - users/misterio/features/desktop-sway/sway.nix | 14 ++++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hosts/atlas/default.nix b/hosts/atlas/default.nix index 4d8006d7..023d807b 100644 --- a/hosts/atlas/default.nix +++ b/hosts/atlas/default.nix @@ -21,7 +21,6 @@ in ]; networking.hostName = "atlas"; - networking.firewall.allowedTCPPorts = [ 80 ]; environment.persistence."/data" = { directories = [ diff --git a/users/misterio/features/desktop-sway/default.nix b/users/misterio/features/desktop-sway/default.nix index 1566c674..1ae909ff 100644 --- a/users/misterio/features/desktop-sway/default.nix +++ b/users/misterio/features/desktop-sway/default.nix @@ -21,7 +21,6 @@ ]; home.packages = with pkgs; [ - waypipe dragon-drop imv pavucontrol diff --git a/users/misterio/features/desktop-sway/sway.nix b/users/misterio/features/desktop-sway/sway.nix index e7e016bb..c1b1aaa3 100644 --- a/users/misterio/features/desktop-sway/sway.nix +++ b/users/misterio/features/desktop-sway/sway.nix @@ -1,4 +1,4 @@ -{ lib, features, pkgs, config, ... }: +{ lib, features, pkgs, config, hostname, ... }: let colorscheme = config.colorscheme; @@ -36,10 +36,12 @@ let swayidle = "${pkgs.swayidle}/bin/swayidle"; swaylock = "${pkgs.swaylock-effects}/bin/swaylock"; waybar = "${pkgs.waybar}/bin/waybar"; + wayvnc = "${pkgs.wayvnc}/bin/wayvnc"; wofi = "${pkgs.wofi}/bin/wofi"; xrandr = "${pkgs.xorg.xrandr}/bin/xrandr"; zathura = "${pkgs.zathura}/bin/zathura"; -in rec { +in +rec { home.packages = with pkgs; [ wl-clipboard wf-recorder slurp ]; home.sessionVariables = { MOZ_ENABLE_WAYLAND = true; @@ -150,12 +152,12 @@ in rec { { command = "${waybar}"; } - # Set xwayland main monitor + # Start WayVNC, only on atlas + ] ++ (if hostname == "atlas" then [ { - command = - "${xrandr} --output $(${xrandr} | grep 'XWAYLAND.*2560x1080' | awk '{printf $1}') --primary"; + command = "${wayvnc} 0.0.0.0 -o DP-1"; } - ]; + ] else [ ]); bars = [ ]; window = { border = 2;