This commit is contained in:
dusk 2021-05-28 19:04:47 +03:00
parent e00bd77988
commit 841d1fd7cc
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA

View File

@ -18,6 +18,8 @@ in
"$6$spzqhAyJfhHy$iHgLBlhjGn1l8PnbjJdWTn1GPvcjMqYNKUzdCe/7IrX6sHNgETSr/Nfpdmq9FCXLhrAfwHOd/q/8SvfeIeNX4/"; "$6$spzqhAyJfhHy$iHgLBlhjGn1l8PnbjJdWTn1GPvcjMqYNKUzdCe/7IrX6sHNgETSr/Nfpdmq9FCXLhrAfwHOd/q/8SvfeIeNX4/";
}; };
environment.systemPackages = [ pkgs.qt5.qtwayland ];
xdg.portal = { xdg.portal = {
enable = true; enable = true;
gtkUsePortal = true; gtkUsePortal = true;
@ -49,7 +51,7 @@ in
enable = true; enable = true;
desktopManager = { desktopManager = {
plasma5.enable = false; plasma5.enable = false;
gnome.enable = false; gnome.enable = true;
xterm.enable = false; xterm.enable = false;
}; };
displayManager = { displayManager = {
@ -59,11 +61,11 @@ in
}; };
lightdm.enable = false; lightdm.enable = false;
gdm = { gdm = {
enable = false; enable = true;
wayland = true; wayland = true;
}; };
sddm.enable = false; sddm.enable = false;
startx.enable = true; startx.enable = false;
}; };
}; };
}; };
@ -291,9 +293,9 @@ in
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 +378,7 @@ in
wayland.windowManager = { wayland.windowManager = {
sway = { sway = {
enable = true; enable = false;
extraSessionCommands = extraEnv; extraSessionCommands = extraEnv;
wrapperFeatures.gtk = true; wrapperFeatures.gtk = true;
config = { config = {
@ -458,10 +460,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 +472,7 @@ in
}; };
}; };
tmux = { tmux = {
enable = true; enable = false;
newSession = true; newSession = true;
secureSocket = true; secureSocket = true;
baseIndex = 1; baseIndex = 1;
@ -579,12 +581,12 @@ in
dotDir = ".config/zsh"; dotDir = ".config/zsh";
history.path = ".local/share/zsh/history"; history.path = ".local/share/zsh/history";
envExtra = extraEnv; envExtra = extraEnv;
loginExtra = # loginExtra =
'' # ''
if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then # if [ "$(${pkgs.coreutils}/bin/tty)" = "/dev/tty1" ]; then
exec sway # exec sway
fi # fi
''; # '';
initExtra = '' initExtra = ''
export TERM=alacritty export TERM=alacritty
@ -616,7 +618,7 @@ in
acc = "#${acColor}"; acc = "#${acColor}";
in in
{ {
enable = true; enable = false;
colors = { colors = {
window = { window = {
background = bgc; background = bgc;
@ -644,7 +646,7 @@ in
swayEnabled = config.wayland.windowManager.sway.enable; swayEnabled = config.wayland.windowManager.sway.enable;
in in
{ {
enable = swayEnabled || config.wayland.windowManager.hikari.enable; enable = swayEnabled;
settings = [{ settings = [{
layer = "top"; layer = "top";
position = "top"; position = "top";