dusk/ark
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "plasma"

Browse Source 
This reverts commit d3af3d0659.
This commit is contained in:
dusk 2021-05-28 02:08:33 +03:00
parent d3af3d0659
commit 2d2750eff6
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
2 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
overlays/discord-canary-system.nix
View File

@ -8,13 +8,12 @@ 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"
"--enable-gpu"
];
});
mkDiscord =

49
users/patriot/default.nix
View File

@ -48,7 +48,7 @@ in
xserver = {
enable = true;
desktopManager = {
plasma5.enable = true;
plasma5.enable = false;
gnome.enable = false;
xterm.enable = false;
};
@ -121,16 +121,16 @@ in
chromiumWayland =
let
flags = [
# "--enable-features=UseOzonePlatform"
# "--ozone-platform=wayland"
# "--enable-vulkan"
# "--enable-webrtc-pipewire-capturer"
"--enable-features=UseOzonePlatform"
"--ozone-platform=wayland"
"--enable-vulkan"
"--enable-webrtc-pipewire-capturer"
"--ignore-gpu-blocklist"
"--enable-gpu-rasterization"
"--enable-zero-copy"
"--enable-features=VaapiVideoDecoder"
"--use-gl=egl"
"--disable-gpu-driver-bug-workarounds"
# "--enable-features=VaapiVideoDecoder"
# "--use-gl=egl"
# "--disable-gpu-driver-bug-workarounds"
];
in
pkgs.writeScriptBin "chromium-wayland" ''
@ -148,8 +148,7 @@ in
(makeDesktopItem {
inherit name;
exec = name;
icon = "chromium";
desktopName = "Chromium";
desktopName = "Chromium Wayland";
genericName = "Web Browser";
})
];
@ -287,13 +286,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 +375,7 @@ in
wayland.windowManager = {
sway = {
# enable = true;
enable = true;
extraSessionCommands = extraEnv;
wrapperFeatures.gtk = true;
config = {
@ -458,10 +457,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 +469,7 @@ in
};
};
tmux = {
# enable = true;
enable = true;
newSession = true;
secureSocket = true;
baseIndex = 1;
@ -497,7 +496,7 @@ in
];
};
qutebrowser = {
# enable = true;
enable = false;
settings = {
content.javascript.enabled = false;
colors.webpage.darkmode.enabled = false;
@ -582,7 +581,7 @@ in
loginExtra =
''
if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
startx
exec sway
fi
'';
initExtra = ''
@ -616,7 +615,7 @@ in
acc = "#${acColor}";
in
{
# enable = true;
enable = true;
colors = {
window = {
background = bgc;
@ -644,7 +643,7 @@ in
swayEnabled = config.wayland.windowManager.sway.enable;
in
{
enable = swayEnabled;
enable = swayEnabled || config.wayland.windowManager.hikari.enable;
settings = [{
layer = "top";
position = "top";