From edecec85a9c78fda990f012faf1116eef63ae4be Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Fri, 6 Jan 2023 14:56:31 -0600
Subject: [PATCH] few more little tweaks for the modular system to start
 working well

---
 modules/desktop.nix              |  4 ++++
 system/kaladin/configuration.nix | 14 +-------------
 system/syl/configuration.nix     | 20 +-------------------
 3 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/modules/desktop.nix b/modules/desktop.nix
index 5922355..0647dc1 100644
--- a/modules/desktop.nix
+++ b/modules/desktop.nix
@@ -134,10 +134,14 @@ with lib;
   services.printing.enable = true;
   services.printing.drivers = [ pkgs.gutenprint pkgs.gutenprintBin pkgs.hplipWithPlugin ]; 
 
+  services.usbmuxd.enable = true;
+  services.fstrim.enable = true;
+
   #######################
   # VIRTUALIZATION
   #######################
 
+  # virtualisation.waydroid.enable = true;
   virtualisation.podman.enable = true;
   # virtualisation.docker.enable = true;
   virtualisation.libvirtd = {
diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix
index aabb64e..1242f6d 100644
--- a/system/kaladin/configuration.nix
+++ b/system/kaladin/configuration.nix
@@ -17,7 +17,7 @@
   boot = {
     kernelPackages = pkgs.linuxPackages_zen;
     kernelParams = [ "mem_sleep_default=deep" ];
-    initrd.kernelModules = [ "amdgpu" ];
+    # initrd.kernelModules = [ "amdgpu" ];
     loader = {
       systemd-boot.enable = true;
       efi.canTouchEfiVariables = true;
@@ -50,9 +50,6 @@
   Option         "TripleBuffer" "on"
   '';
 
-  services.usbmuxd.enable = true;
-  services.fstrim.enable = true;
-
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.chris = {
     isNormalUser = true;
@@ -61,15 +58,6 @@
 
   # virtualisation.waydroid.enable = true;
 
-  # services.ethminer = {
-  #   enable = true;
-  #   pool = "us-eth.2miners.com:2020";
-  #   toolkit = "cuda";
-  #   rig = "kaladin";
-  #   wallet = "0xE43c525d05Ac52303cb43772Eb209824AE328CA3";
-  #   registerMail = "ceth@cochrun.xyz";
-  # };
-
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;
diff --git a/system/syl/configuration.nix b/system/syl/configuration.nix
index a38b4b3..3b92d00 100644
--- a/system/syl/configuration.nix
+++ b/system/syl/configuration.nix
@@ -33,6 +33,7 @@
     vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
   };
 
+  services.xserver.videoDrivers = ["intel"];
   hardware.opengl = {
     enable = true;
     extraPackages = with pkgs; [
@@ -42,25 +43,13 @@
     ];
   };
 
-  services.xserver.videoDrivers = ["intel"];
-
-
-  # Configure keymap in X11
-  services.xserver.layout = "us";
-  # services.xserver.xkbOptions = "eurosign:e";
-
   systemd.services.display-manager = {
     wants = [ "systemd-user-sessions.service" "multi-user.target" "network-online.target" ];
     after = [ "systemd-user-sessions.service" "multi-user.target" "network-online.target" ];
   };
 
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-  services.printing.drivers = [ pkgs.gutenprint pkgs.gutenprintBin pkgs.hplipWithPlugin ]; 
-
   # Enable fingerprint
   services.fprintd.enable = true;
-  # programs.qt5ct.enable = true;
 
   # Some other things
   services.thermald.enable = true;
@@ -82,9 +71,6 @@
     };
   };
 
-  services.usbmuxd.enable = true;
-  services.fstrim.enable = true;
-
   # Enable touchpad support (enabled default in most desktopManager).
   services.xserver.libinput.enable = true;
 
@@ -94,10 +80,6 @@
     extraGroups = [ "adbusers" "wheel" "networkmanager" "input" "uinput" ];
   };
 
-  programs.partition-manager.enable = true;
-  programs.kdeconnect.enable = true;
-  # virtualisation.waydroid.enable = true;
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;