From 85c3c8b69f9da042fada9a94d2da82c14aa73fda Mon Sep 17 00:00:00 2001 From: Swarsel Date: Tue, 28 May 2024 23:43:11 +0200 Subject: [PATCH] fix: SwayFX and Syncthingtray Circumvents an upstream error that fails the sandbox for SwayFX due to always requiring DRM device Fix floating syncthingtray windows not showing due to recent versions not setting app_id correctly --- Nix.org | 44 +++++-- flake.lock | 250 +++++++++++++++++++++++++++---------- flake.nix | 16 ++- profiles/TEMPLATE/home.nix | 3 +- profiles/common/home.nix | 25 ++-- profiles/fourside/home.nix | 3 +- profiles/onett/home.nix | 3 +- profiles/stand/home.nix | 3 +- profiles/threed/home.nix | 3 +- profiles/twoson/home.nix | 3 +- 10 files changed, 259 insertions(+), 94 deletions(-) diff --git a/Nix.org b/Nix.org index fc1024d..7341724 100644 --- a/Nix.org +++ b/Nix.org @@ -120,7 +120,8 @@ This is where the theme for the whole OS is defined. This noweb-ref section cann { command = "nextcloud --background";} # { command = "spotify";} { command = "discord --start-minimized";} - { command = "element-desktop --hidden";} + # { command = "element-desktop --hidden";} + { command = "element-desktop --hidden -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";} { command = "ANKI_WAYLAND=1 anki";} { command = "OBSIDIAN_USE_WAYLAND=1 obsidian";} { command = "nm-applet";} @@ -220,6 +221,7 @@ This is where the theme for the whole OS is defined. This noweb-ref section cann nixpkgs-mautrix-signal, nix-gaming, nixos-hardware, + nix-alien, #+end_src @@ -290,6 +292,11 @@ This is where the theme for the whole OS is defined. This noweb-ref section cann url = github:NixOS/nixos-hardware/master; }; + # dynamic library loading + nix-alien = { + url = github:thiagokokada/nix-alien; + }; + #+end_src *** let @@ -320,7 +327,15 @@ This is where the theme for the whole OS is defined. This noweb-ref section cann # NixOS modules that can only be used on NixOS systems nixModules = [ stylix.nixosModules.stylix ./profiles/common/nixos.nix - ]; + # dynamic library loading + ({ self, system, ... }: { + environment.systemPackages = with self.inputs.nix-alien.packages.${system}; [ + nix-alien + ]; + # needed for `nix-alien-ld` + programs.nix-ld.enable = true; + }) + ]; # Home-Manager modules wanted on non-NixOS systems homeModules = [ stylix.homeManagerModules.stylix @@ -4705,6 +4720,7 @@ Also, I define some useful shell scripts here. transmission mktorrent hexchat + hugo # kyria qmk @@ -5183,7 +5199,7 @@ TODO: Non-NixOS machines (=sp3) should not use these by default, but instead the element = { name = "Element Matrix Client"; genericName = "Element"; - exec = "element-desktop"; + exec = "element-desktop -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; terminal = false; categories = [ "Application"]; }; @@ -6323,8 +6339,9 @@ I am currently using SwayFX, which adds some nice effects to sway, like rounded wayland.windowManager.sway = { enable = true; - # package = pkgs.swayfx; - package = pkgs.sway; + checkConfig = false; # delete this line once SwayFX is fixed upstream + package = pkgs.swayfx; + # package = pkgs.sway; systemd.enable = true; systemd.xdgAutostart = true; wrapperFeatures.gtk = true; @@ -6452,6 +6469,7 @@ I am currently using SwayFX, which adds some nice effects to sway, like rounded {app_id = "blueman";} {app_id = "pavucontrol";} {app_id = "syncthingtray";} + {title = "Syncthing Tray";} {app_id = "SchildiChat";} {app_id = "Element";} {app_id = "com.nextcloud.desktopclient.nextcloud";} @@ -6513,13 +6531,13 @@ I am currently using SwayFX, which adds some nice effects to sway, like rounded title="spotifytui"; }; } - { - command = "resize set width 60 ppt height 60 ppt, sticky enable, move container to scratchpad"; - criteria = { - app_id="^$"; - class="^$"; - }; - } + # { + # command = "resize set width 60 ppt height 60 ppt, sticky enable, move container to scratchpad"; + # criteria = { + # app_id="^$"; + # class="^$"; + # }; + # } { command = "resize set width 60 ppt height 60 ppt, sticky enable, move container to scratchpad"; @@ -6598,7 +6616,7 @@ I am currently using SwayFX, which adds some nice effects to sway, like rounded exec systemctl --user import-environment - ${swayfxSettingsOff} + ${swayfxSettings} "; }; diff --git a/flake.lock b/flake.lock index 8b1a1c3..e2af851 100644 --- a/flake.lock +++ b/flake.lock @@ -144,11 +144,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1715101438, - "narHash": "sha256-xd5lymHwykYlqCPap6m7QG71Xuv0ShMjulQOLT8Hg6A=", + "lastModified": 1716342612, + "narHash": "sha256-D8Zj8ftu5Zpgkb3wbQoxsRfJ9cGJxDdauFtuPHenD8E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2fd9e33a0e73cd390f35ecefe89ec9e271e4c2cb", + "rev": "6eb679f5e75b80580e8d3fa1594369e128b37911", "type": "github" }, "original": { @@ -174,6 +174,21 @@ } }, "flake-compat_2": { + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -215,11 +230,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -265,6 +280,24 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -320,16 +353,16 @@ "gnome-shell": { "flake": false, "locked": { - "lastModified": 1698794309, - "narHash": "sha256-/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=", + "lastModified": 1713702291, + "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "a7c169c6c29cf02a4c392fa0acbbc5f5072823e7", + "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934", "type": "github" }, "original": { "owner": "GNOME", - "ref": "45.1", + "ref": "46.1", "repo": "gnome-shell", "type": "github" } @@ -341,11 +374,11 @@ ] }, "locked": { - "lastModified": 1715077503, - "narHash": "sha256-AfHQshzLQfUqk/efMtdebHaQHqVntCMjhymQzVFLes0=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e277d9566de9976f47228dd8c580b97488734d4", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -384,11 +417,11 @@ ] }, "locked": { - "lastModified": 1711915616, - "narHash": "sha256-co6LoFA+j6BZEeJNSR8nZ4oOort5qYPskjrDHBaJgmo=", + "lastModified": 1714981474, + "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "820be197ccf3adaad9a8856ef255c13b6cc561a6", + "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f", "type": "github" }, "original": { @@ -421,6 +454,47 @@ "type": "github" } }, + "nix-alien": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", + "nix-filter": "nix-filter", + "nix-index-database": "nix-index-database", + "nixpkgs": [ + "nix-alien", + "nix-index-database", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1715754082, + "narHash": "sha256-2hAydsdMk6QmDar+16ryyn+pVksxudwC5vRiatJbysM=", + "owner": "thiagokokada", + "repo": "nix-alien", + "rev": "ea6ebda03c5537eebbb93af57ca6f2c2979981be", + "type": "github" + }, + "original": { + "owner": "thiagokokada", + "repo": "nix-alien", + "type": "github" + } + }, + "nix-filter": { + "locked": { + "lastModified": 1710156097, + "narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=", + "owner": "numtide", + "repo": "nix-filter", + "rev": "3342559a24e85fc164b295c3444e8a139924675b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "nix-filter", + "type": "github" + } + }, "nix-formatter-pack": { "inputs": { "nixpkgs": [ @@ -447,14 +521,14 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1714872073, - "narHash": "sha256-Gybo6MqJ2tva9vMaSxOgie8uVObiP0LxD2FMokiR0X4=", + "lastModified": 1716340597, + "narHash": "sha256-OlN/h6w4Hf5YP4ZPdqzxix3eSPCwYqInUMvsTIERB8M=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "b85b9c3afa1bfee0150580eb76c52e572a85a6a9", + "rev": "36d3115d7707e0f99b42e89ed7bb9ad88ad102e8", "type": "github" }, "original": { @@ -463,6 +537,24 @@ "type": "github" } }, + "nix-index-database": { + "inputs": { + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1715483403, + "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "f9027322f48b427da23746aa359a6510dfcd0228", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-index-database", + "type": "github" + } + }, "nix-on-droid": { "inputs": { "home-manager": "home-manager_2", @@ -490,8 +582,8 @@ }, "nixgl": { "inputs": { - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_3" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1713543440, @@ -530,11 +622,11 @@ ] }, "locked": { - "lastModified": 1713783234, - "narHash": "sha256-3yh0nqI1avYUmmtqqTW3EVfwaLE+9ytRWxsA5aWtmyI=", + "lastModified": 1716210724, + "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "722b512eb7e6915882f39fff0e4c9dd44f42b77e", + "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", "type": "github" }, "original": { @@ -545,11 +637,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1715010655, - "narHash": "sha256-FmdhvR/hgBkPDvIv/HOEIQsSMaVXh8wvTrnep8dF3Jc=", + "lastModified": 1716173274, + "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d1659c9eb8af718118fb4bbe2c86797c8b8623eb", + "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", "type": "github" }, "original": { @@ -621,11 +713,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1714971268, - "narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=", + "lastModified": 1716218643, + "narHash": "sha256-i/E7gzQybvcGAYDRGDl39WL6yVk30Je/NXypBz6/nmM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c", + "rev": "a8695cbd09a7ecf3376bd62c798b9864d20f86ee", "type": "github" }, "original": { @@ -653,11 +745,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1714858427, - "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=", + "lastModified": 1716061101, + "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76", + "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", "type": "github" }, "original": { @@ -669,11 +761,27 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714809261, - "narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1716062047, + "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d32560238207b8e26d88b265207b216ee46b8450", + "rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016", "type": "github" }, "original": { @@ -683,7 +791,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1660551188, "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=", @@ -698,13 +806,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { - "lastModified": 1714906307, - "narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=", + "lastModified": 1716293225, + "narHash": "sha256-pU9ViBVE3XYb70xZx+jK6SEVphvt7xMTbm6yDIF4xPs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588", + "rev": "3eaeaeb6b1e08a016380c279f8846e0bd8808916", "type": "github" }, "original": { @@ -714,13 +822,13 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { - "lastModified": 1714809261, - "narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", + "lastModified": 1716062047, + "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d32560238207b8e26d88b265207b216ee46b8450", + "rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016", "type": "github" }, "original": { @@ -730,13 +838,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { - "lastModified": 1713596654, - "narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", + "lastModified": 1714912032, + "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be", + "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d", "type": "github" }, "original": { @@ -796,11 +904,11 @@ }, "nur": { "locked": { - "lastModified": 1715119845, - "narHash": "sha256-F95GvBNyRS0FBiSO/y9MrFJ8Xbwl4D88/iyLgaAfa2M=", + "lastModified": 1716346130, + "narHash": "sha256-o4Tk7LpBgtJxf4eZQojpd0FR1mWNyy+mlzrouAvIzQ0=", "owner": "nix-community", "repo": "NUR", - "rev": "e771528ea78a7dd751904f909790956f2b0fde66", + "rev": "d69724e2c7a808d107407f38f99c56fa50394df4", "type": "github" }, "original": { @@ -866,12 +974,13 @@ "emacs-overlay": "emacs-overlay", "home-manager": "home-manager", "lanzaboote": "lanzaboote", + "nix-alien": "nix-alien", "nix-gaming": "nix-gaming", "nix-on-droid": "nix-on-droid", "nixgl": "nixgl", "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixpkgs-mautrix-signal": "nixpkgs-mautrix-signal", "nur": "nur", "pia": "pia", @@ -906,15 +1015,15 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1715035358, - "narHash": "sha256-RY6kqhpCPa/q3vbqt3iYRyjO3hJz9KZnshMjbpPon8o=", + "lastModified": 1716244104, + "narHash": "sha256-XXbqfkyWe0d0O+zqRQWi2oXi6wYDmTzXedFkBRwx1VI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "893e3df091f6838f4f9d71c61ab079d5c5dedbd1", + "rev": "fddd52460e3332eedd8a0043af5675338a5b3e0b", "type": "github" }, "original": { @@ -932,17 +1041,17 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1715108364, - "narHash": "sha256-6AlOCZCSEpdHEpRQ8pwaGkbfSHVx11+e1+1CMp8+Huc=", + "lastModified": 1716206302, + "narHash": "sha256-5Qc3aQGVyPEOuN82zVamStaV81HebHvLjk3fGfpyCPY=", "owner": "danth", "repo": "stylix", - "rev": "8f7abd2252d0d773ca202cf2c190b47d439f045d", + "rev": "81df8443556335016d6f0bc22630a95776a56d8b", "type": "github" }, "original": { @@ -981,6 +1090,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1659877975, diff --git a/flake.nix b/flake.nix index 3be2a8f..f9269b0 100644 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,11 @@ url = github:NixOS/nixos-hardware/master; }; + # dynamic library loading + nix-alien = { + url = github:thiagokokada/nix-alien; + }; + }; outputs = inputs@{ @@ -87,6 +92,7 @@ nixpkgs-mautrix-signal, nix-gaming, nixos-hardware, + nix-alien, ... }: let @@ -116,7 +122,15 @@ # NixOS modules that can only be used on NixOS systems nixModules = [ stylix.nixosModules.stylix ./profiles/common/nixos.nix - ]; + # dynamic library loading + ({ self, system, ... }: { + environment.systemPackages = with self.inputs.nix-alien.packages.${system}; [ + nix-alien + ]; + # needed for `nix-alien-ld` + programs.nix-ld.enable = true; + }) + ]; # Home-Manager modules wanted on non-NixOS systems homeModules = [ stylix.homeManagerModules.stylix diff --git a/profiles/TEMPLATE/home.nix b/profiles/TEMPLATE/home.nix index 100f247..a1c5495 100644 --- a/profiles/TEMPLATE/home.nix +++ b/profiles/TEMPLATE/home.nix @@ -128,7 +128,8 @@ { command = "nextcloud --background";} # { command = "spotify";} { command = "discord --start-minimized";} - { command = "element-desktop --hidden";} + # { command = "element-desktop --hidden";} + { command = "element-desktop --hidden -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";} { command = "ANKI_WAYLAND=1 anki";} { command = "OBSIDIAN_USE_WAYLAND=1 obsidian";} { command = "nm-applet";} diff --git a/profiles/common/home.nix b/profiles/common/home.nix index 303db04..16aa1ed 100644 --- a/profiles/common/home.nix +++ b/profiles/common/home.nix @@ -44,6 +44,7 @@ transmission mktorrent hexchat + hugo # kyria qmk @@ -483,7 +484,7 @@ xdg.desktopEntries = { element = { name = "Element Matrix Client"; genericName = "Element"; - exec = "element-desktop"; + exec = "element-desktop -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds"; terminal = false; categories = [ "Application"]; }; @@ -1518,8 +1519,9 @@ group-by=category wayland.windowManager.sway = { enable = true; - # package = pkgs.swayfx; - package = pkgs.sway; + checkConfig = false; # delete this line once SwayFX is fixed upstream + package = pkgs.swayfx; + # package = pkgs.sway; systemd.enable = true; systemd.xdgAutostart = true; wrapperFeatures.gtk = true; @@ -1647,6 +1649,7 @@ wayland.windowManager.sway = { {app_id = "blueman";} {app_id = "pavucontrol";} {app_id = "syncthingtray";} + {title = "Syncthing Tray";} {app_id = "SchildiChat";} {app_id = "Element";} {app_id = "com.nextcloud.desktopclient.nextcloud";} @@ -1708,13 +1711,13 @@ wayland.windowManager.sway = { title="spotifytui"; }; } - { - command = "resize set width 60 ppt height 60 ppt, sticky enable, move container to scratchpad"; - criteria = { - app_id="^$"; - class="^$"; - }; - } + # { + # command = "resize set width 60 ppt height 60 ppt, sticky enable, move container to scratchpad"; + # criteria = { + # app_id="^$"; + # class="^$"; + # }; + # } { command = "resize set width 60 ppt height 60 ppt, sticky enable, move container to scratchpad"; @@ -1793,7 +1796,7 @@ wayland.windowManager.sway = { exec systemctl --user import-environment - ${swayfxSettingsOff} + ${swayfxSettings} "; }; diff --git a/profiles/fourside/home.nix b/profiles/fourside/home.nix index c9d9cca..9b2cb3a 100644 --- a/profiles/fourside/home.nix +++ b/profiles/fourside/home.nix @@ -104,7 +104,8 @@ { command = "nextcloud --background";} # { command = "spotify";} { command = "discord --start-minimized";} - { command = "element-desktop --hidden";} + # { command = "element-desktop --hidden";} + { command = "element-desktop --hidden -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";} { command = "ANKI_WAYLAND=1 anki";} { command = "OBSIDIAN_USE_WAYLAND=1 obsidian";} { command = "nm-applet";} diff --git a/profiles/onett/home.nix b/profiles/onett/home.nix index 92fed89..bd0e950 100644 --- a/profiles/onett/home.nix +++ b/profiles/onett/home.nix @@ -117,7 +117,8 @@ { command = "nextcloud --background";} # { command = "spotify";} { command = "discord --start-minimized";} - { command = "element-desktop --hidden";} + # { command = "element-desktop --hidden";} + { command = "element-desktop --hidden -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";} { command = "ANKI_WAYLAND=1 anki";} { command = "OBSIDIAN_USE_WAYLAND=1 obsidian";} { command = "nm-applet";} diff --git a/profiles/stand/home.nix b/profiles/stand/home.nix index 766bcab..a5194a0 100644 --- a/profiles/stand/home.nix +++ b/profiles/stand/home.nix @@ -84,7 +84,8 @@ { command = "nextcloud --background";} # { command = "spotify";} { command = "discord --start-minimized";} - { command = "element-desktop --hidden";} + # { command = "element-desktop --hidden";} + { command = "element-desktop --hidden -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";} { command = "ANKI_WAYLAND=1 anki";} { command = "OBSIDIAN_USE_WAYLAND=1 obsidian";} { command = "nm-applet";} diff --git a/profiles/threed/home.nix b/profiles/threed/home.nix index f4c0be6..f65aa24 100644 --- a/profiles/threed/home.nix +++ b/profiles/threed/home.nix @@ -91,7 +91,8 @@ { command = "nextcloud --background";} # { command = "spotify";} { command = "discord --start-minimized";} - { command = "element-desktop --hidden";} + # { command = "element-desktop --hidden";} + { command = "element-desktop --hidden -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";} { command = "ANKI_WAYLAND=1 anki";} { command = "OBSIDIAN_USE_WAYLAND=1 obsidian";} { command = "nm-applet";} diff --git a/profiles/twoson/home.nix b/profiles/twoson/home.nix index 63733e5..9f21c26 100644 --- a/profiles/twoson/home.nix +++ b/profiles/twoson/home.nix @@ -117,7 +117,8 @@ { command = "nextcloud --background";} # { command = "spotify";} { command = "discord --start-minimized";} - { command = "element-desktop --hidden";} + # { command = "element-desktop --hidden";} + { command = "element-desktop --hidden -enable-features=UseOzonePlatform -ozone-platform=wayland --disable-gpu-driver-bug-workarounds";} { command = "ANKI_WAYLAND=1 anki";} { command = "OBSIDIAN_USE_WAYLAND=1 obsidian";} { command = "nm-applet";}