From ae08b23335b6313e1bd7b6d96a752c95f37b06d7 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Sun, 16 Jun 2024 20:47:03 +0100
Subject: [PATCH] Disable/remove more options not needed for plasma6

---
 configuration/default.nix | 21 ++--------
 configuration/desktop.nix | 87 ++++++++++-----------------------------
 2 files changed, 25 insertions(+), 83 deletions(-)

diff --git a/configuration/default.nix b/configuration/default.nix
index bd51f00c..70d85c05 100644
--- a/configuration/default.nix
+++ b/configuration/default.nix
@@ -81,7 +81,6 @@
     ];
     localBinInPath = true;
   };
-  console.keyMap = "uk";
   programs = {
     command-not-found.enable = false;
     ssh.startAgent = true;
@@ -106,22 +105,10 @@
   };
   virtualisation.podman.enable = true;
   time.timeZone = "Europe/London";
-  i18n = let
-    locale = "en_GB.UTF-8";
-  in {
-    # Select internationalisation properties.
-    defaultLocale = locale;
-    extraLocaleSettings = {
-      LC_ADDRESS = locale;
-      LC_IDENTIFICATION = locale;
-      LC_MEASUREMENT = locale;
-      LC_MONETARY = locale;
-      LC_NAME = locale;
-      LC_NUMERIC = locale;
-      LC_PAPER = locale;
-      LC_TELEPHONE = locale;
-      LC_TIME = locale;
-    };
+  i18n.defaultLocale = "en_GB.UTF-8";
+  console = {
+    font = iosevkaCustom.names.iosevka-custom-nerdfont;
+    useXkbConfig = true;
   };
   fonts = {
     packages = with pkgs;
diff --git a/configuration/desktop.nix b/configuration/desktop.nix
index 591cea03..977b6053 100644
--- a/configuration/desktop.nix
+++ b/configuration/desktop.nix
@@ -5,46 +5,21 @@
   ...
 }: {
   imports = [./default.nix];
-  # nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland";
   system.autoUpgrade.operation = "boot";
+  hardware = {
+    pulseaudio.enable = true;
+    bluetooth.enable = true;
+  };
   environment = {
-    # sessionVariables = {
-    #   NIXOS_OZONE_WL = "1";
-    #   GRIM_DEFAULT_DIR = "$HOME/Pictures/Grim";
-    # };
+    plasma6 =
+      lib.mkIf config.services.desktopManager.plasma6.enable
+      {excludePackages = with pkgs.kdePackages; [plasma-browser-integration];};
     systemPackages = with pkgs; [
-      wtype
-      # wl-clipboard
       xdg-utils
-      # libnotify
-      # libcamera
-      glib
-      # gsettings-desktop-schemas
       hunspell
       hunspellDicts.en_GB-large
-      # pamixer
-      # pavucontrol
-      # playerctl
-      # brightnessctl
     ];
   };
-  # 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;
     noisetorch.enable = true;
@@ -52,51 +27,31 @@
       enable = true;
       capSysNice = true;
     };
-    # xwayland.enable = true;
-  };
-  gtk.iconCache.enable = true;
-  qt = {
-    enable = true;
-    platformTheme = "gnome";
-    style = "adwaita";
   };
   services = {
     flatpak.enable = true;
-    accounts-daemon.enable = true;
-    pipewire = {
-      enable = true;
-      alsa = {
-        enable = true;
-        support32Bit = true;
-      };
-      audio.enable = true;
-      jack.enable = true;
-      pulse.enable = true;
-      wireplumber.enable = true;
-    };
-    # tumbler.enable = true;
-    # udisks2.enable = true;
+    printing.enable = true;
+    # pipewire = {
+    #   enable = true;
+    #   pulse.enable = true;
+    #   wireplumber.enable = true;
+    # };
     xserver = {
-      # enable = true;
+      enable = true;
       xkb = {
         layout = "gb";
         variant = "";
         options = "ctrl:nocaps";
       };
     };
-    displayManager = {
+    displayManager.sddm = {
       enable = true;
-      defaultSession = "plasma";
-      sddm = {
-        enable = true;
-        wayland.enable = true;
-      };
+      wayland.enable = true;
+      settings.General.DisplayServer = "x11-user";
+    };
+    desktopManager.plasma6 = {
+      enable = true;
+      enableQt5Integration = 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];
   };
 }