Some changes to make kde happy with our x11 config
This commit is contained in:
parent
d95d41088d
commit
f8b52f9140
|
@ -28,8 +28,6 @@ in
|
||||||
pkgs.unstable.vscode
|
pkgs.unstable.vscode
|
||||||
feh
|
feh
|
||||||
deluge # Torrent client
|
deluge # Torrent client
|
||||||
mailspring
|
|
||||||
unstable.discord
|
|
||||||
pavucontrol # PulseAudio control panel
|
pavucontrol # PulseAudio control panel
|
||||||
unstable.slack
|
unstable.slack
|
||||||
|
|
||||||
|
@ -37,7 +35,10 @@ in
|
||||||
dex # .desktop file management, startup
|
dex # .desktop file management, startup
|
||||||
sct # Display color temperature
|
sct # Display color temperature
|
||||||
xdg-utils # Open stuff
|
xdg-utils # Open stuff
|
||||||
]);
|
] ++ (if pkgs.stdenv.isAarch64 then [ ] else [
|
||||||
|
mailspring
|
||||||
|
unstable.discord
|
||||||
|
]));
|
||||||
|
|
||||||
# Cursor
|
# Cursor
|
||||||
home.pointerCursor = {
|
home.pointerCursor = {
|
||||||
|
|
|
@ -1,8 +1,16 @@
|
||||||
{ pkgs, config, lib, ... }:
|
{ pkgs, config, lib, ... }:
|
||||||
|
let
|
||||||
|
cfg = config.linux.graphical;
|
||||||
|
in
|
||||||
with lib;
|
with lib;
|
||||||
{
|
{
|
||||||
imports = [ ./x11/hidpi.nix ./x11/i3.nix ];
|
imports = [ ./x11/hidpi.nix ./x11/i3.nix ];
|
||||||
config = mkIf (config.linux.graphical.type == "x11") {
|
options.linux.graphical.hasDE = mkOption {
|
||||||
|
type = types.bool;
|
||||||
|
description = "When enabled, disable stuff that already comes with a DE";
|
||||||
|
default = true;
|
||||||
|
};
|
||||||
|
config = mkIf (cfg.type == "x11") {
|
||||||
# X Session settings
|
# X Session settings
|
||||||
xsession.enable = true;
|
xsession.enable = true;
|
||||||
|
|
||||||
|
@ -23,10 +31,10 @@ with lib;
|
||||||
home.pointerCursor.x11.enable = true;
|
home.pointerCursor.x11.enable = true;
|
||||||
|
|
||||||
# Notification system
|
# Notification system
|
||||||
services.X11.xfce4-notifyd.enable = true;
|
services.X11.xfce4-notifyd.enable = !cfg.hasDE;
|
||||||
|
|
||||||
# Picom: X Compositor
|
# Picom: X Compositor
|
||||||
services.picom = {
|
services.picom = mkIf (!cfg.hasDE) {
|
||||||
enable = true;
|
enable = true;
|
||||||
blur = true;
|
blur = true;
|
||||||
fade = true;
|
fade = true;
|
||||||
|
|
Loading…
Reference in a new issue