From dfce52845df6834945066fcc4b5c6e66853a0e74 Mon Sep 17 00:00:00 2001
From: Thomas Syms <thomassyms@gmail.com>
Date: Tue, 21 Nov 2023 15:25:52 -0400
Subject: [PATCH] Added kde for Equinox

---
 hosts/Equinox/default.nix |  3 +-
 modules/kde.nix           |  8 ++++
 modules/system.nix        | 94 ---------------------------------------
 3 files changed, 9 insertions(+), 96 deletions(-)
 create mode 100644 modules/kde.nix

diff --git a/hosts/Equinox/default.nix b/hosts/Equinox/default.nix
index cb25c59..db5d2f9 100644
--- a/hosts/Equinox/default.nix
+++ b/hosts/Equinox/default.nix
@@ -4,8 +4,6 @@ let
   hostname = "Equinox";
 in
 {
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
 
 
   # System version
@@ -15,6 +13,7 @@ in
   # Import hardware configuration
   imports = [
     ../../modules/system.nix
+    ../../modules/kde.nix
 
 
     inputs.nixos-hardware.nixosModules.dell-xps-15-9510
diff --git a/modules/kde.nix b/modules/kde.nix
new file mode 100644
index 0000000..62ef3e5
--- /dev/null
+++ b/modules/kde.nix
@@ -0,0 +1,8 @@
+{ pkgs, ... }:
+{
+    services.xserver.enable = true;
+    services.xserver.displayManager.sddm.enable = true;
+    services.xserver.displayManager.defaultSession = "plasmawayland";
+    services.xserver.desktopManager.plasma5.enable = true;
+    programs.dconf.enable = true;
+}
\ No newline at end of file
diff --git a/modules/system.nix b/modules/system.nix
index d918273..0f787aa 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -1,58 +1,10 @@
 { config, pkgs, ... }:
 
 {
-  # Set your time zone.
-  time.timeZone = "Asia/Shanghai";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "zh_CN.UTF-8";
-    LC_IDENTIFICATION = "zh_CN.UTF-8";
-    LC_MEASUREMENT = "zh_CN.UTF-8";
-    LC_MONETARY = "zh_CN.UTF-8";
-    LC_NAME = "zh_CN.UTF-8";
-    LC_NUMERIC = "zh_CN.UTF-8";
-    LC_PAPER = "zh_CN.UTF-8";
-    LC_TELEPHONE = "zh_CN.UTF-8";
-    LC_TIME = "zh_CN.UTF-8";
-  };
 
   # Enable CUPS to print documents.
   services.printing.enable = true;
 
-
-  fonts = {
-    fonts = with pkgs; [
-      # icon fonts
-      material-design-icons
-
-      # normal fonts
-      noto-fonts
-      noto-fonts-cjk
-      noto-fonts-emoji
-
-      # nerdfonts
-      (nerdfonts.override { fonts = [ "FiraCode" "JetBrainsMono" ]; })
-    ];
-
-    # use fonts specified by user rather than default ones
-    enableDefaultFonts = false;
-
-    # user defined fonts
-    # the reason there's Noto Color Emoji everywhere is to override DejaVu's
-    # B&W emojis that would sometimes show instead of some Color emojis
-    fontconfig.defaultFonts = {
-      serif = [ "Noto Serif" "Noto Color Emoji" ];
-      sansSerif = [ "Noto Sans" "Noto Color Emoji" ];
-      monospace = [ "JetBrainsMono Nerd Font" "Noto Color Emoji" ];
-      emoji = [ "Noto Color Emoji" ];
-    };
-  };
-
-  programs.dconf.enable = true;
-
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.
@@ -72,52 +24,6 @@
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    wget
-    curl
-    git
-    sysstat
-    lm_sensors # for `sensors` command
-    # minimal screen capture tool, used by i3 blur lock to take a screenshot
-    # print screen key is also bound to this tool in i3 config
-    scrot
-    neofetch
-    xfce.thunar # xfce4's file manager
-    nnn # terminal file manager
-  ];
-
-  # Enable sound with pipewire.
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  services.power-profiles-daemon = {
-    enable = true;
-  };
-  security.polkit.enable = true;
-
-  services = {
-    dbus.packages = [ pkgs.gcr ];
-
-    geoclue2.enable = true;
-
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-      # If you want to use JACK applications, uncomment this
-      jack.enable = true;
-
-      # use the example session manager (no others are packaged yet so this is enabled by default,
-      # no need to redefine it in your config for now)
-      #media-session.enable = true;
-    };
-
-    udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
-  };
-
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.panotaka = {
     isNormalUser = true;