From ae949fc48b76753c2f0efd7ed0a19203b9e6b343 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Fri, 9 Apr 2021 16:48:42 -0400
Subject: [PATCH] alacritty and xmonad-srid fix

---
 features/desktopish/light-terminal.nix             |  1 +
 features/desktopish/touchpad-trackpoint.nix        | 14 +++++++-------
 .../xmonad/xmonad-srid/.vscode/settings.json       |  4 ++--
 features/desktopish/xmonad/xmonad-srid/Main.hs     |  2 +-
 features/desktopish/xmonad/xmonad-srid/default.nix |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/features/desktopish/light-terminal.nix b/features/desktopish/light-terminal.nix
index ee9d6a2..18e189e 100644
--- a/features/desktopish/light-terminal.nix
+++ b/features/desktopish/light-terminal.nix
@@ -12,5 +12,6 @@ in
 {
   environment.systemPackages = with pkgs; [
     myst
+    alacritty
   ];
 }
diff --git a/features/desktopish/touchpad-trackpoint.nix b/features/desktopish/touchpad-trackpoint.nix
index 70ec33f..6165d09 100644
--- a/features/desktopish/touchpad-trackpoint.nix
+++ b/features/desktopish/touchpad-trackpoint.nix
@@ -1,11 +1,11 @@
 { config, pkgs, ... }:
 
 {
-   services.xserver.libinput = {
-      enable = true;
-      # macOS like behaviour
-      touchpad.naturalScrolling = true;
-      # Tap to click
-      touchpad.tapping = true;
-    };
+  services.xserver.libinput = {
+    enable = true;
+    # macOS like behaviour
+    touchpad.naturalScrolling = true;
+    # Tap to click
+    touchpad.tapping = true;
+  };
 }
diff --git a/features/desktopish/xmonad/xmonad-srid/.vscode/settings.json b/features/desktopish/xmonad/xmonad-srid/.vscode/settings.json
index 7575832..d0f2252 100644
--- a/features/desktopish/xmonad/xmonad-srid/.vscode/settings.json
+++ b/features/desktopish/xmonad/xmonad-srid/.vscode/settings.json
@@ -1,5 +1,5 @@
 {
-    "nixEnvSelector.nixShellConfig": "${workspaceRoot}/default.nix",
     "editor.formatOnType": true,
-    "editor.formatOnSave": true
+    "editor.formatOnSave": true,
+    "nixEnvSelector.nixFile": "${workspaceRoot}/default.nix"
 }
\ No newline at end of file
diff --git a/features/desktopish/xmonad/xmonad-srid/Main.hs b/features/desktopish/xmonad/xmonad-srid/Main.hs
index d7ce4c4..58100d7 100644
--- a/features/desktopish/xmonad/xmonad-srid/Main.hs
+++ b/features/desktopish/xmonad/xmonad-srid/Main.hs
@@ -20,7 +20,7 @@ main = do
     cfg =
       def
         { modMask = mod4Mask, -- Use Super instead of Alt
-          terminal = "myst",
+          terminal = "alacritty", -- "myst",
           layoutHook =
             borderSpacing $
               avoidStruts $
diff --git a/features/desktopish/xmonad/xmonad-srid/default.nix b/features/desktopish/xmonad/xmonad-srid/default.nix
index 3db8c49..c9290a5 100644
--- a/features/desktopish/xmonad/xmonad-srid/default.nix
+++ b/features/desktopish/xmonad/xmonad-srid/default.nix
@@ -12,7 +12,7 @@ in
         [ cabal-install
           cabal-fmt
           ghcid
-          haskell-language-server
+          # haskell-language-server
         ]);
     overrides = self: super: with pkgs.haskell.lib; {
       # dulwich = dontCheck super.dulwich;