parent
f50858dfd8
commit
e00bd77988
@ -8,14 +8,13 @@ final: prev: rec {
|
|||||||
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz";
|
||||||
sha256 = "0bijwfsd9s4awqkgxd9c2cxh7y5r06vix98qjp0dkv63r6jig8ch";
|
sha256 = "0bijwfsd9s4awqkgxd9c2cxh7y5r06vix98qjp0dkv63r6jig8ch";
|
||||||
};
|
};
|
||||||
isWayland = false;
|
isWayland = true;
|
||||||
extraOptions = [
|
extraOptions = [
|
||||||
"--enable-vulkan"
|
"--enable-vulkan"
|
||||||
"--ignore-gpu-blocklist"
|
"--ignore-gpu-blocklist"
|
||||||
"--enable-gpu-rasterization"
|
"--enable-gpu-rasterization"
|
||||||
"--enable-zero-copy"
|
"--enable-zero-copy"
|
||||||
"--disable-gpu-driver-bug-workarounds"
|
"--disable-gpu-driver-bug-workarounds"
|
||||||
"--enable-gpu"
|
|
||||||
];
|
];
|
||||||
});
|
});
|
||||||
mkDiscord =
|
mkDiscord =
|
||||||
|
@ -48,7 +48,7 @@ in
|
|||||||
xserver = {
|
xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
desktopManager = {
|
desktopManager = {
|
||||||
plasma5.enable = true;
|
plasma5.enable = false;
|
||||||
gnome.enable = false;
|
gnome.enable = false;
|
||||||
xterm.enable = false;
|
xterm.enable = false;
|
||||||
};
|
};
|
||||||
@ -287,13 +287,13 @@ in
|
|||||||
extraEnv = ''
|
extraEnv = ''
|
||||||
# export SDL_VIDEODRIVER=wayland
|
# export SDL_VIDEODRIVER=wayland
|
||||||
# needs qt5.qtwayland in systemPackages
|
# needs qt5.qtwayland in systemPackages
|
||||||
# export QT_QPA_PLATFORM=wayland
|
export QT_QPA_PLATFORM=wayland
|
||||||
# export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
|
export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
|
||||||
# Fix for some Java AWT applications (e.g. Android Studio),
|
# Fix for some Java AWT applications (e.g. Android Studio),
|
||||||
# use this if they aren't displayed properly:
|
# use this if they aren't displayed properly:
|
||||||
# export _JAVA_AWT_WM_NONREPARENTING=1
|
export _JAVA_AWT_WM_NONREPARENTING=1
|
||||||
# export QT_QPA_PLATFORMTHEME=qt5ct
|
export QT_QPA_PLATFORMTHEME=qt5ct
|
||||||
# export QT_PLATFORM_PLUGIN=qt5ct
|
export QT_PLATFORM_PLUGIN=qt5ct
|
||||||
'';
|
'';
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
@ -376,7 +376,7 @@ in
|
|||||||
|
|
||||||
wayland.windowManager = {
|
wayland.windowManager = {
|
||||||
sway = {
|
sway = {
|
||||||
# enable = true;
|
enable = true;
|
||||||
extraSessionCommands = extraEnv;
|
extraSessionCommands = extraEnv;
|
||||||
wrapperFeatures.gtk = true;
|
wrapperFeatures.gtk = true;
|
||||||
config = {
|
config = {
|
||||||
@ -458,10 +458,10 @@ in
|
|||||||
alacritty = {
|
alacritty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
# shell = {
|
shell = {
|
||||||
# program = "${pkgs.tmux}/bin/tmux";
|
program = "${pkgs.tmux}/bin/tmux";
|
||||||
# args = [ "attach" ];
|
args = [ "attach" ];
|
||||||
# };
|
};
|
||||||
font = {
|
font = {
|
||||||
normal = { family = font; };
|
normal = { family = font; };
|
||||||
size = fontSize;
|
size = fontSize;
|
||||||
@ -470,7 +470,7 @@ in
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
tmux = {
|
tmux = {
|
||||||
# enable = true;
|
enable = true;
|
||||||
newSession = true;
|
newSession = true;
|
||||||
secureSocket = true;
|
secureSocket = true;
|
||||||
baseIndex = 1;
|
baseIndex = 1;
|
||||||
@ -497,7 +497,7 @@ in
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
qutebrowser = {
|
qutebrowser = {
|
||||||
# enable = true;
|
enable = false;
|
||||||
settings = {
|
settings = {
|
||||||
content.javascript.enabled = false;
|
content.javascript.enabled = false;
|
||||||
colors.webpage.darkmode.enabled = false;
|
colors.webpage.darkmode.enabled = false;
|
||||||
@ -582,7 +582,7 @@ in
|
|||||||
loginExtra =
|
loginExtra =
|
||||||
''
|
''
|
||||||
if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
|
if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
|
||||||
startx
|
exec sway
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
initExtra = ''
|
initExtra = ''
|
||||||
@ -616,7 +616,7 @@ in
|
|||||||
acc = "#${acColor}";
|
acc = "#${acColor}";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
# enable = true;
|
enable = true;
|
||||||
colors = {
|
colors = {
|
||||||
window = {
|
window = {
|
||||||
background = bgc;
|
background = bgc;
|
||||||
@ -644,7 +644,7 @@ in
|
|||||||
swayEnabled = config.wayland.windowManager.sway.enable;
|
swayEnabled = config.wayland.windowManager.sway.enable;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
enable = swayEnabled;
|
enable = swayEnabled || config.wayland.windowManager.hikari.enable;
|
||||||
settings = [{
|
settings = [{
|
||||||
layer = "top";
|
layer = "top";
|
||||||
position = "top";
|
position = "top";
|
||||||
|
Loading…
Reference in New Issue
Block a user