mirror of
https://github.com/donovanglover/nix-config.git
synced 2024-11-25 01:33:17 +01:00
meta: Merge dwm specialization with desktop
Long-term this could be an optional separate module but for now having dwm as a backup to Hyprland is reassuring.
This commit is contained in:
parent
6116425dea
commit
b3c8f55c69
@ -21,7 +21,6 @@ let
|
||||
|
||||
inherit (cfg)
|
||||
bloat
|
||||
dwm
|
||||
container
|
||||
opacity
|
||||
fontSize
|
||||
@ -58,7 +57,6 @@ in
|
||||
};
|
||||
|
||||
bloat = mkEnableOption "GUI applications";
|
||||
dwm = mkEnableOption "dwm specialization";
|
||||
container = mkEnableOption "disable some options for container performance";
|
||||
graphical = mkEnableOption "xserver for graphical containers";
|
||||
};
|
||||
@ -93,9 +91,33 @@ in
|
||||
mountOnMedia = true;
|
||||
};
|
||||
|
||||
libinput = {
|
||||
touchpad = {
|
||||
naturalScrolling = true;
|
||||
accelProfile = "flat";
|
||||
accelSpeed = "0.75";
|
||||
};
|
||||
|
||||
mouse = {
|
||||
accelProfile = "flat";
|
||||
};
|
||||
};
|
||||
|
||||
xserver = mkIf (!container || graphical) {
|
||||
enable = true;
|
||||
excludePackages = with pkgs; [ xterm ];
|
||||
|
||||
displayManager.startx.enable = mkIf (!container) true;
|
||||
|
||||
windowManager.dwm = mkIf (!container) {
|
||||
enable = true;
|
||||
|
||||
package = pkgs.callPackage ../packages/xland.nix (with config.lib.stylix.colors.withHashtag; {
|
||||
colorBackground = base00;
|
||||
colorText = base03;
|
||||
colorSelected = base05;
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
pipewire = {
|
||||
@ -276,9 +298,5 @@ in
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
specialisation = {
|
||||
dwm = mkIf dwm { configuration.imports = [ ../specializations/dwm.nix ]; };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
@ -1,41 +0,0 @@
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
|
||||
{
|
||||
services = {
|
||||
xserver = {
|
||||
displayManager.startx.enable = true;
|
||||
|
||||
windowManager.dwm = {
|
||||
enable = true;
|
||||
|
||||
package = pkgs.callPackage ../packages/xland.nix (with config.lib.stylix.colors.withHashtag; {
|
||||
colorBackground = base00;
|
||||
colorText = base03;
|
||||
colorSelected = base05;
|
||||
});
|
||||
};
|
||||
};
|
||||
|
||||
libinput = {
|
||||
touchpad = {
|
||||
naturalScrolling = true;
|
||||
accelProfile = "flat";
|
||||
accelSpeed = "0.75";
|
||||
};
|
||||
|
||||
mouse = {
|
||||
accelProfile = "flat";
|
||||
};
|
||||
};
|
||||
|
||||
greetd.settings = {
|
||||
default_session.command = lib.mkForce "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd startx --time-format '%F %R'";
|
||||
initial_session.command = lib.mkForce "${pkgs.xorg.xinit}/bin/startx";
|
||||
};
|
||||
};
|
||||
}
|
Loading…
Reference in New Issue
Block a user