Commit a960ce5

@@ -1,4 +1,10 @@
 {lib, ...}: {
+  flake.modules.nixos.desktop = {pkgs, ...}: {
+    environment.plasma6.excludePackages = with pkgs.kdePackages; [
+      elisa # Using deadbeef instead.
+    ];
+  };
+
   flake.modules.homeManager.desktop = {pkgs, ...}: {
     programs.deadbeef =
       lib.mkIf

@@ -1,4 +1,10 @@
 {
+  flake.modules.nixos.desktop = {pkgs, ...}: {
+    environment.plasma6.excludePackages = with pkgs.kdePackages; [
+      kdepim-runtime # No needed if using Thunderbird.
+    ];
+  };
+
   flake.modules.homeManager.desktop = _: {
     programs.thunderbird = {
       enable = true;

@@ -0,0 +1,11 @@
+{
+  flake.modules.homeManager.desktop = _: {
+    programs.aria2 = {
+      enable = true;
+      settings = {
+        enable-rpc = true;
+        rpc-listen-port = 6800;
+      };
+    };
+  };
+}

@@ -0,0 +1,7 @@
+{
+  flake.modules.nixos.desktop = _: {
+    services.gvfs.enable = true; # Mount, trash, and other functionalities
+    services.tumbler.enable = true; # Thumbnail support for images
+    services.xserver.xkb.layout = "us";
+  };
+}

@@ -1,4 +1,10 @@
 {config, ...}: {
+  flake.modules.nixos.dev = {pkgs, ...}: {
+    environment.plasma6.excludePackages = with pkgs.kdePackages; [
+      kate
+    ];
+  };
+
   flake.modules.homeManager.dev = _: {
     imports = with config.flake.modules.homeManager; [
       dev-helix

@@ -13,6 +13,7 @@
       (with config.flake.modules.nixos; [
         core
         desktop
+        dev
         user-root
         user-hpcesia
         ssh-host-pardofelis

@@ -36,6 +36,9 @@
     # Thunderbolt
     services.hardware.bolt.enable = true;
 
+    # Bluetooth
+    hardware.bluetooth.enable = true;
+
     # Fingerprint
     services.fprintd = {
       enable = true;

@@ -1,8 +0,0 @@
-{
-  pkgs,
-  programsdb,
-  ...
-}: {
-  environment.etc."programs.sqlite".source = programsdb.packages.${pkgs.system}.programs-sqlite;
-  programs.command-not-found.dbPath = "/etc/programs.sqlite";
-}

@@ -1,20 +0,0 @@
-{
-  pkgs,
-  config,
-  ...
-}: {
-  environment.systemPackages = with pkgs; [
-    nushell
-
-    tree
-  ];
-
-  services.aria2 = {
-    enable = true;
-    rpcSecretFile = config.sops.secrets.aria2-rpc-secret.path;
-    settings = {
-      enable-rpc = true;
-      rpc-listen-port = 6800;
-    };
-  };
-}

@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [
-    # system tools
-    dmidecode
-    efibootmgr
-    ethtool
-  ];
-}

@@ -1,9 +1,4 @@
 {myvars, ...}: {
-  services = {
-    gvfs.enable = true; # Mount, trash, and other functionalities
-    tumbler.enable = true; # Thumbnail support for images
-  };
-
   services.sunshine = {
     enable = true;
     autoStart = false;

@@ -1,18 +0,0 @@
-{
-  #============================= Bluetooth =============================
-
-  # enable bluetooth & gui paring tools - blueman
-  # or you can use cli:
-  # $ bluetoothctl
-  # [bluetooth] # power on
-  # [bluetooth] # agent on
-  # [bluetooth] # default-agent
-  # [bluetooth] # scan on
-  # ...put device in pairing mode and wait [hex-address] to appear here...
-  # [bluetooth] # pair [hex-address]
-  # [bluetooth] # connect [hex-address]
-  # Bluetooth devices automatically connect with bluetoothctl as well:
-  # [bluetooth] # trust [hex-address]
-  hardware.bluetooth.enable = true;
-  services.blueman.enable = true; # KDE has bluetooth manager
-}

@@ -1,33 +1,7 @@
 {
-  pkgs,
-  config,
-  lib,
-  myvars,
-  ...
-}: {
   imports = [
     ./base
     ../base
     ./desktop
   ];
-
-  services = {
-    gvfs.enable = true; # Mount, trash, and other functionalities
-    tumbler.enable = true; # Thumbnail support for images
-    xserver = {
-      xkb.layout = "us";
-    };
-    displayManager = {
-      autoLogin = {
-        enable = true;
-        user = myvars.username;
-      };
-    };
-  };
-
-  environment.plasma6.excludePackages = with pkgs.kdePackages; [
-    kdepim-runtime
-    kate
-    elisa
-  ];
 }