Revert "Revert "Revert "plasma"""

This reverts commit f50858dfd8.
This commit is contained in:
dusk 2021-05-28 18:40:25 +03:00
parent f50858dfd8
commit e00bd77988
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
2 changed files with 17 additions and 18 deletions

View File

@ -8,14 +8,13 @@ final: prev: rec {
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
sha256 = "0bijwfsd9s4awqkgxd9c2cxh7y5r06vix98qjp0dkv63r6jig8ch";
};
isWayland = false;
isWayland = true;
extraOptions = [
"--enable-vulkan"
"--ignore-gpu-blocklist"
"--enable-gpu-rasterization"
"--enable-zero-copy"
"--disable-gpu-driver-bug-workarounds"
"--enable-gpu"
];
});
mkDiscord =

View File

@ -48,7 +48,7 @@ in
xserver = {
enable = true;
desktopManager = {
plasma5.enable = true;
plasma5.enable = false;
gnome.enable = false;
xterm.enable = false;
};
@ -287,13 +287,13 @@ in
extraEnv = ''
# export SDL_VIDEODRIVER=wayland
# needs qt5.qtwayland in systemPackages
# export QT_QPA_PLATFORM=wayland
# export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
export QT_QPA_PLATFORM=wayland
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
# Fix for some Java AWT applications (e.g. Android Studio),
# use this if they aren't displayed properly:
# export _JAVA_AWT_WM_NONREPARENTING=1
# export QT_QPA_PLATFORMTHEME=qt5ct
# export QT_PLATFORM_PLUGIN=qt5ct
export _JAVA_AWT_WM_NONREPARENTING=1
export QT_QPA_PLATFORMTHEME=qt5ct
export QT_PLATFORM_PLUGIN=qt5ct
'';
in
{
@ -376,7 +376,7 @@ in
wayland.windowManager = {
sway = {
# enable = true;
enable = true;
extraSessionCommands = extraEnv;
wrapperFeatures.gtk = true;
config = {
@ -458,10 +458,10 @@ in
alacritty = {
enable = true;
settings = {
# shell = {
# program = "${pkgs.tmux}/bin/tmux";
# args = [ "attach" ];
# };
shell = {
program = "${pkgs.tmux}/bin/tmux";
args = [ "attach" ];
};
font = {
normal = { family = font; };
size = fontSize;
@ -470,7 +470,7 @@ in
};
};
tmux = {
# enable = true;
enable = true;
newSession = true;
secureSocket = true;
baseIndex = 1;
@ -497,7 +497,7 @@ in
];
};
qutebrowser = {
# enable = true;
enable = false;
settings = {
content.javascript.enabled = false;
colors.webpage.darkmode.enabled = false;
@ -582,7 +582,7 @@ in
loginExtra =
''
if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
startx
exec sway
fi
'';
initExtra = ''
@ -616,7 +616,7 @@ in
acc = "#${acColor}";
in
{
# enable = true;
enable = true;
colors = {
window = {
background = bgc;
@ -644,7 +644,7 @@ in
swayEnabled = config.wayland.windowManager.sway.enable;
in
{
enable = swayEnabled;
enable = swayEnabled || config.wayland.windowManager.hikari.enable;
settings = [{
layer = "top";
position = "top";