materus
/
nixos-config
mirror of https://github.com/materusPL/nixos-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

materusPC: use wayland sddm

This commit is contained in:
Mateusz Słodkowicz 2024-03-29 14:51:39 +01:00
parent 8fda1956a1
commit 20683564ce
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
3 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
configurations/host/materusPC/kde.nix
View File

@ -1,13 +1,20 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
westonSddm = pkgs.writeText "weston.ini" westonSddm = let xcfg = config.services.xserver; in pkgs.writeText "weston.ini"
'' ''
[core] [core]
xwayland=true xwayland=false
shell=fullscreen-shell.so shell=fullscreen-shell.so
[keyboard] [keyboard]
keymap_layout=pl keymap_model = ${builtins.toString xcfg.xkb.model};
keymap_layout = ${builtins.toString xcfg.xkb.layout};
keymap_variant = ${builtins.toString xcfg.xkb.variant};
keymap_options = ${builtins.toString xcfg.xkb.options};
[libinput]
enable-tap = ${builtins.toString xcfg.libinput.mouse.tapping};
left-handed = ${builtins.toString xcfg.libinput.mouse.leftHanded};
[output] [output]
name=DP-3 name=DP-3
@ -20,25 +27,28 @@ let
[output] [output]
name=HDMI-A-3 name=HDMI-A-3
mode=off mode=off
''
; '';
in in
{ {
services.xserver.displayManager.defaultSession = "plasma"; services.xserver.displayManager.defaultSession = "plasma";
services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.enable = true;
services.xserver.displayManager.sddm.wayland.enable = true;
services.xserver.displayManager.sddm.wayland.compositor = lib.mkForce "weston";
services.xserver.displayManager.sddm.wayland.compositorCommand = lib.concatStringsSep " " [
"${lib.getExe pkgs.weston}"
"--shell=kiosk"
"-c ${westonSddm}"
];
services.xserver.displayManager.sddm.settings = { services.xserver.displayManager.sddm.settings = {
General = { General = {
#DisplayServer = "wayland";
InputMethod = ""; InputMethod = "";
}; };
Theme = { Theme = {
CursorTheme = "breeze_cursors"; CursorTheme = "breeze_cursors";
CursorSize = "24"; CursorSize = "24";
}; };
Wayland = {
#CompositorCommand = "${pkgs.weston}/bin/weston -c ${westonSddm}";
};
}; };
services.desktopManager.plasma6.enable = true; services.desktopManager.plasma6.enable = true;
services.desktopManager.plasma6.enableQt5Integration = true; services.desktopManager.plasma6.enableQt5Integration = true;

1
configurations/host/materusPC/tmp.nix
View File

@ -27,6 +27,7 @@
time.timeZone = "Europe/Warsaw"; time.timeZone = "Europe/Warsaw";
i18n.defaultLocale = "pl_PL.UTF-8"; i18n.defaultLocale = "pl_PL.UTF-8";
services.xserver.xkb.layout = "pl";
console = { console = {
font = "lat2-16"; font = "lat2-16";
# keyMap = "pl"; # keyMap = "pl";

10
configurations/profile/home/xdg.nix
View File

@ -21,14 +21,20 @@
xdg.userDirs.desktop = lib.mkDefault "${config.home.homeDirectory}/Pulpit"; xdg.userDirs.desktop = lib.mkDefault "${config.home.homeDirectory}/Pulpit";
xdg.userDirs.documents = lib.mkDefault "${config.home.homeDirectory}/Dokumenty"; xdg.userDirs.documents = lib.mkDefault "${config.home.homeDirectory}/Dokumenty";
xdg.userDirs.download = lib.mkDefault "${config.home.homeDirectory}/Pobrane"; xdg.userDirs.download = lib.mkDefault "${config.home.homeDirectory}/Pobrane";
xdg.userDirs.music = lib.mkDefault "${config.home.homeDirectory}/Muzyka"; xdg.userDirs.music = lib.mkDefault "${config.xdg.userDirs.extraConfig.XDG_AUDIO_DIR}/Muzyka";
xdg.userDirs.pictures = lib.mkDefault "${config.home.homeDirectory}/Obrazy"; xdg.userDirs.pictures = lib.mkDefault "${config.home.homeDirectory}/Obrazy";
xdg.userDirs.publicShare = lib.mkDefault "${config.home.homeDirectory}/Publiczny"; xdg.userDirs.publicShare = lib.mkDefault "${config.home.homeDirectory}/Publiczny";
xdg.userDirs.templates = lib.mkDefault "${config.home.homeDirectory}/Szablony"; xdg.userDirs.templates = lib.mkDefault "${config.home.homeDirectory}/Szablony";
xdg.userDirs.videos = lib.mkDefault "${config.home.homeDirectory}/Wideo"; xdg.userDirs.videos = lib.mkDefault "${config.home.homeDirectory}/Wideo";
xdg.userDirs.extraConfig = { xdg.userDirs.extraConfig = {
XDG_MISC_DIR = lib.mkDefault "${config.home.homeDirectory}/Inne"; XDG_MISC_DIR = lib.mkDefault "${config.home.homeDirectory}/Inne";
XDG_SCREENSHOTS_DIR = "${config.xdg.userDirs.pictures}/Zrzuty ekranu"; XDG_PIC_SCREENSHOTS_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Zrzuty ekranu";
XDG_PIC_MEMES_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Memy";
XDG_PIC_MISC_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Inne";
XDG_PIC_PHOTOS_DIR = lib.mkDefault "${config.xdg.userDirs.pictures}/Zdjęcia";
XDG_PIC_AVATARS_DIR = "${config.xdg.userDirs.pictures}/Avatar";
XDG_AUDIO_DIR = lib.mkDefault "${config.home.homeDirectory}/Audio";
XDG_KEYS_DIR = lib.mkDefault "${config.xdg.userDirs.documents}/Klucze";
}; };
}; };