materusPC: desktop env changes

2026-07-02 12:46:42 +00:00 · 2024-10-18 17:32:47 +02:00
parent 6ac8524294
commit 6d16c995e2
8 changed files with 45 additions and 43 deletions
@@ -3,6 +3,7 @@
 imports = [
  ./apps.nix
  ./java.nix
+  ./desktop
 ];

 }
@@ -0,0 +1,9 @@
+{ ... }:
+{
+ imports = [
+  ./kde.nix
+  ./sddm.nix
+
+ ];
+
+}
@@ -0,0 +1,38 @@
+{ config, pkgs, lib, ... }:
+{
+  services.displayManager.defaultSession = "gnome";
+  
+  services.xserver.desktopManager.gnome.enable = true;
+  services.xserver.desktopManager.gnome.sessionPath = [ pkgs.gnome.gpaste ];
+
+  services.gnome.gnome-online-accounts.enable = true;
+  services.gnome.gnome-browser-connector.enable = true;
+  services.gnome.core-utilities.enable = true;
+  services.gnome.core-shell.enable = true;
+  services.gnome.core-os-services.enable = true;
+
+  programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
+
+
+  programs.gnome-terminal.enable = true;
+
+  services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
+  services.dbus.packages = with pkgs; [ gnome2.GConf ];
+
+  environment.systemPackages = with pkgs; [
+
+    gnome3.adwaita-icon-theme
+    gnome3.gnome-tweaks
+    gnome3.gnome-color-manager
+    gnome3.gnome-shell-extensions
+
+    gnomeExtensions.appindicator
+    gnomeExtensions.desktop-clock
+    gnomeExtensions.gtk4-desktop-icons-ng-ding
+    gnomeExtensions.compiz-windows-effect
+    gnomeExtensions.burn-my-windows
+    gnomeExtensions.user-themes
+    gnomeExtensions.gsconnect
+
+  ];
+}
@@ -0,0 +1,32 @@
+{ config, pkgs, lib, ... }:
+{
+  services.displayManager.defaultSession = "plasma";
+
+  xdg.portal.enable = true;
+  xdg.portal.wlr.enable = true;
+  xdg.portal.xdgOpenUsePortal = true;
+  xdg.portal.extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde ];
+
+  services.desktopManager.plasma6.enable = true;
+  services.desktopManager.plasma6.enableQt5Integration = true;
+  programs.gnupg.agent.pinentryPackage = lib.mkForce pkgs.pinentry-gnome3;
+  environment.plasma6.excludePackages = with pkgs.kdePackages; [ kwallet kwalletmanager kwallet-pam ];
+  environment.variables = {
+    # Old fix for black cursor on amdgpu, seems to work fine now
+    #KWIN_DRM_NO_AMS = "1";
+
+    #Fix for amdgpu crashes
+    KWIN_DRM_USE_MODIFIERS = "0";
+    KWIN_DRM_NO_DIRECT_SCANOUT = "1";
+    QT_PLUGIN_PATH = [ 
+      "${pkgs.qt6.qtimageformats}/${pkgs.qt6.qtbase.qtPluginPrefix}"
+      "${pkgs.kdePackages.ffmpegthumbs}/${pkgs.qt6.qtbase.qtPluginPrefix}"
+     ];
+    XCURSOR_THEME = "breeze_cursors";
+  };
+  environment.systemPackages = with pkgs; [
+    kdePackages.ark
+  ];
+  programs.kdeconnect.enable = true;
+  materus.profile.steam.extraPkgs = [ pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin pkgs.vlc pkgs.vkbasalt-cli ];
+}
@@ -0,0 +1,52 @@
+{ config, pkgs, lib, ... }:
+let
+  westonSddm = let xcfg = config.services.xserver; in  pkgs.writeText "weston.ini"
+    ''
+      [core]
+      xwayland=false
+      shell=fullscreen-shell.so
+
+      [keyboard]
+      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]
+      name=DP-3
+      mode=1920x1080@240
+
+      [output]
+      name=DP-2
+      mode=off
+
+      [output]
+      name=HDMI-A-3
+      mode=off
+
+    '';
+in
+{
+  services.displayManager.sddm.enable = true;
+  services.displayManager.sddm.wayland.enable = true;
+  services.displayManager.sddm.wayland.compositor = lib.mkForce "weston";
+  services.displayManager.sddm.wayland.compositorCommand = lib.concatStringsSep " " [
+    "${lib.getExe pkgs.weston}"
+    "--shell=kiosk"
+    "-c ${westonSddm}"
+  ];
+
+  services.displayManager.sddm.settings = {
+    General = {
+      InputMethod = "";
+    };
+    Theme = {
+      CursorTheme = "breeze_cursors";
+      CursorSize = "24";
+    };
+  };
+}