tweaks

5 files changed, 13 insertions, 23 deletions

diff --git a/home.nix b/home.nix
index 399db78..33949b8 100644
--- a/home.nix
+++ b/home.nix
@@ -62,7 +62,7 @@
 
     # input
     xinput_calibrator
-    touchegg
+    libinput
 
     # meta
     nixpkgs-review
diff --git a/hosts/myrtle/configuration.nix b/hosts/myrtle/configuration.nix
index 468f64a..c86efd4 100644
--- a/hosts/myrtle/configuration.nix
+++ b/hosts/myrtle/configuration.nix
@@ -11,20 +11,16 @@
   boot.loader.efi.canTouchEfiVariables = true;
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.blacklistedKernelModules = [ "nouveau" ];
-  boot.kernelParams = [ "module_blacklist=i915" ];
+  boot.kernelParams = [
+    "module_blacklist=i915"
+    #    "intel_pstate=disable"
+  ];
 
   networking = {
     hostName = "myrtle";
     wireless = {
       iwd.enable = true;
       interfaces = [ "wlan0" ];
-      environmentFile = "/home/np/.wireless.env";
-      networks = {
-        Sanic.psk = "@PSK_SANI@";
-        Gopalan.psk = "@PSK_GOPA@";
-        Srividhya.psk = "@PSK_SRIV@";
-        sage.psk = "@PSK_SAGE@";
-      };
     };
   };
 
@@ -125,7 +121,6 @@
     '';
 
     auto-cpufreq.enable = true;
-    thermald.enable = true;
     batteryNotifier = {
       enable = true;
       notifyCapacity = 20;
@@ -134,11 +129,6 @@
     touchegg.enable = true;
   };
 
-  powerManagement = {
-    enable = true;
-    powertop.enable = true;
-  };
-
   systemd.sleep.extraConfig = ''
     HibernateMode=shutdown
   '';
diff --git a/scripts/default.nix b/scripts/default.nix
index 72d0235..1c57566 100644
--- a/scripts/default.nix
+++ b/scripts/default.nix
@@ -60,19 +60,19 @@ let
     fi
   '';
 
-  touchscreen = "ELAN9008:00 04F3:2ED6";
-  stylus = "ELAN9008:00 04F3:2ED6 Stylus Pen (0)";
+  touchscreen = 21;
+  stylus = 15;
   portait-transform = builtins.toString [ 0 (-1) 1 1 0 0 0 0 1 ];
   landscape-transform = builtins.toString [ 0 0 0 0 0 0 0 0 0 ];
   portrait = pkgs.writeScriptBin "portrait" ''
     ${pkgs.xorg.xrandr}/bin/xrandr -o left
-    ${pkgs.xorg.xinput}/bin/xinput set-prop "${touchscreen}" --type=float "Coordinate Transformation Matrix" ${portait-transform}
-    ${pkgs.xorg.xinput}/bin/xinput set-prop "${stylus}" --type=float "Coordinate Transformation Matrix" ${portait-transform}
+    ${pkgs.xorg.xinput}/bin/xinput set-prop ${builtins.toString touchscreen} --type=float "Coordinate Transformation Matrix" ${portait-transform}
+    ${pkgs.xorg.xinput}/bin/xinput set-prop ${builtins.toString stylus} --type=float "Coordinate Transformation Matrix" ${portait-transform}
   '';
   landscape = pkgs.writeScriptBin "landscape" ''
     ${pkgs.xorg.xrandr}/bin/xrandr -o normal
-    ${pkgs.xorg.xinput}/bin/xinput set-prop "${touchscreen}" --type=float "Coordinate Transformation Matrix" ${landscape-transform}
-    ${pkgs.xorg.xinput}/bin/xinput set-prop "${stylus}" --type=float "Coordinate Transformation Matrix" ${landscape-transform}
+    ${pkgs.xorg.xinput}/bin/xinput set-prop ${builtins.toString touchscreen} --type=float "Coordinate Transformation Matrix" ${landscape-transform}
+    ${pkgs.xorg.xinput}/bin/xinput set-prop ${builtins.toString stylus} --type=float "Coordinate Transformation Matrix" ${landscape-transform}
   '';
 
 in
diff --git a/services/default.nix b/services/default.nix
index b2a39bb..2bce0e4 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -8,7 +8,7 @@
 
   imports = [
     ./dunst.nix
-    ./picom.nix
+    # ./picom.nix
     ./redshift.nix
     ./sxhkd.nix
     # ./mbsync.nix
diff --git a/services/picom.nix b/services/picom.nix
index d298424..07f8f58 100644
--- a/services/picom.nix
+++ b/services/picom.nix
@@ -6,7 +6,7 @@
 {
   services.picom = {
     enable = true;
-    backend = "glx";
+    backend = "xrender";
     fade = true;
     fadeDelta = 10;
     fadeSteps = [ 0.04 0.04 ];