From a44d79e6a08006b7b575fb2e09b893da97b517c8 Mon Sep 17 00:00:00 2001 From: Evie Litherland-Smith Date: Sun, 16 Jun 2024 19:28:56 +0100 Subject: [PATCH] Disable extra services/programs covered by KDE --- configuration/desktop.nix | 111 +++++++++++++++----------------------- 1 file changed, 43 insertions(+), 68 deletions(-) diff --git a/configuration/desktop.nix b/configuration/desktop.nix index 0f454b2d..591cea03 100644 --- a/configuration/desktop.nix +++ b/configuration/desktop.nix @@ -5,68 +5,54 @@ ... }: { imports = [./default.nix]; - nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland"; + # nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland"; system.autoUpgrade.operation = "boot"; environment = { - sessionVariables = { - NIXOS_OZONE_WL = "1"; - GRIM_DEFAULT_DIR = "$HOME/Pictures/Grim"; - }; + # sessionVariables = { + # NIXOS_OZONE_WL = "1"; + # GRIM_DEFAULT_DIR = "$HOME/Pictures/Grim"; + # }; systemPackages = with pkgs; [ wtype - wl-clipboard + # wl-clipboard xdg-utils - libnotify - libcamera + # libnotify + # libcamera glib - gsettings-desktop-schemas + # gsettings-desktop-schemas hunspell hunspellDicts.en_GB-large - pamixer - pavucontrol - playerctl - brightnessctl + # pamixer + # pavucontrol + # playerctl + # brightnessctl ]; }; - security = { - polkit.enable = true; - rtkit.enable = true; - pam = { - services.swaylock = {}; - loginLimits = [ - { - domain = "@users"; - item = "rtprio"; - type = "-"; - value = 1; - } - ]; - }; - }; + # security = { + # polkit.enable = true; + # rtkit.enable = true; + # pam = { + # services.swaylock = {}; + # loginLimits = [ + # { + # domain = "@users"; + # item = "rtprio"; + # type = "-"; + # value = 1; + # } + # ]; + # }; + # }; sound.enable = false; hardware.bluetooth.enable = true; programs = { dconf.enable = true; - light.enable = true; noisetorch.enable = true; - kdeconnect.enable = true; - file-roller.enable = true; - thunar = { - enable = true; - plugins = with pkgs.xfce; [thunar-archive-plugin thunar-volman]; - }; - sway = { - enable = true; - package = - pkgs.swayfx.overrideAttrs - (old: {passthru.providedSessions = ["sway"];}); - wrapperFeatures.gtk = true; - }; gamescope = { enable = true; capSysNice = true; }; - xwayland.enable = true; + # xwayland.enable = true; }; gtk.iconCache.enable = true; qt = { @@ -76,27 +62,7 @@ }; services = { flatpak.enable = true; - blueman.enable = true; - gvfs = { - enable = true; - package = lib.mkForce pkgs.gnome3.gvfs; - }; accounts-daemon.enable = true; - dbus.packages = with pkgs; [gcr]; - greetd = { - enable = true; - vt = 7; - settings = { - default_session.command = '' - ${pkgs.greetd.tuigreet}/bin/tuigreet --time\ - --remember\ - --remember-session\ - --user-menu\ - --asterisks\ - --window-padding 10 - ''; - }; - }; pipewire = { enable = true; alsa = { @@ -108,20 +74,29 @@ pulse.enable = true; wireplumber.enable = true; }; - tumbler.enable = true; - udisks2.enable = true; + # tumbler.enable = true; + # udisks2.enable = true; xserver = { - enable = false; + # enable = true; xkb = { layout = "gb"; variant = ""; options = "ctrl:nocaps"; }; }; + displayManager = { + enable = true; + defaultSession = "plasma"; + sddm = { + enable = true; + wayland.enable = true; + }; + }; + desktopManager.plasma6.enable = true; }; xdg.portal = { enable = true; - config.common.default = "*"; # TODO change for xdg-desktop-portal > 1.17 changes - extraPortals = [pkgs.xdg-desktop-portal-gtk]; + # config.common.default = "*"; # TODO change for xdg-desktop-portal > 1.17 changes + # extraPortals = [pkgs.xdg-desktop-portal-gtk]; }; }