roles/graphical: switch basic to Plasma 6, add basic GUI pkgs to both

Signed-off-by: Ivan Bushchik <ivabus@ivabus.dev>
This commit is contained in:
Ivan Bushchik 2024-03-03 13:21:55 +03:00
parent f87064aa28
commit d8c8a548ac
No known key found for this signature in database
GPG key ID: 2F16FBF3262E090C

View file

@ -4,7 +4,7 @@ let cfg = config.my.roles.graphical;
in { in {
options.my.roles.graphical.enable = lib.mkEnableOption "Enable GUI (sway)"; options.my.roles.graphical.enable = lib.mkEnableOption "Enable GUI (sway)";
options.my.roles.graphical.basic.enable = options.my.roles.graphical.basic.enable =
lib.mkEnableOption "Enable GUI (MATE)"; lib.mkEnableOption "Enable GUI (Plasma 6)";
config = lib.mkMerge [ config = lib.mkMerge [
(lib.mkIf (cfg.enable) { (lib.mkIf (cfg.enable) {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -70,6 +70,8 @@ in {
XDG_CURRENT_DESKTOP = "sway"; XDG_CURRENT_DESKTOP = "sway";
}; };
})
(lib.mkIf (cfg.enable && config.my.users.ivabus.enable) {
home-manager.users.ivabus = { home-manager.users.ivabus = {
gtk = { gtk = {
enable = true; enable = true;
@ -104,13 +106,15 @@ in {
}; };
}) })
(lib.mkIf (cfg.basic.enable) { (lib.mkIf (cfg.basic.enable) {
environment.systemPackages = with pkgs; [ ubuntu-themes ]; services.xserver.desktopManager.plasma6.enable = true;
services.xserver.desktopManager.mate.enable = true;
networking.networkmanager.enable = lib.mkForce true; networking.networkmanager.enable = lib.mkForce true;
networking.networkmanager.wifi.backend = "iwd"; networking.networkmanager.wifi.backend = "iwd";
programs.nm-applet.enable = true; programs.nm-applet.enable = true;
services.xserver = { services.xserver = {
displayManager.sddm.enable = true; displayManager.sddm = {
enable = true;
wayland.enable = true;
};
enable = true; enable = true;
layout = "us,ru"; layout = "us,ru";
xkbOptions = "grp:alt_shift_toggle"; xkbOptions = "grp:alt_shift_toggle";
@ -125,17 +129,17 @@ in {
pulse.enable = true; pulse.enable = true;
alsa.support32Bit = true; alsa.support32Bit = true;
}; };
qt = { /*qt = {
enable = true; enable = true;
platformTheme = "gtk2"; platformTheme = "gtk2";
style = "gtk2"; style = "gtk2";
}; };*/
services.dbus.enable = true; services.dbus.enable = true;
environment.systemPackages = [ environment.systemPackages = with pkgs; [
# With this (wrapFirefox
(pkgs.wrapFirefox (firefox-unwrapped.override { pipewireSupport = true; }) { })
(pkgs.firefox-unwrapped.override { pipewireSupport = true; }) { }) libreoffice
]; ];
environment.sessionVariables = { MOZ_USE_XINPUT2 = "1"; }; environment.sessionVariables = { MOZ_USE_XINPUT2 = "1"; };
@ -147,7 +151,6 @@ in {
noto-fonts-emoji noto-fonts-emoji
jetbrains-mono jetbrains-mono
font-awesome font-awesome
#google-fonts
liberation_ttf liberation_ttf
open-sans open-sans
roboto roboto