From 246938e646c395fc0e0cce3553fabf6aac6eadc1 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Fri, 19 Nov 2021 20:24:56 -0500
Subject: [PATCH] back to xmonad

---
 features/desktopish/default.nix                    | 2 +-
 features/desktopish/hidpi.nix                      | 3 ++-
 features/desktopish/xmonad/xmonad-srid/Main.hs     | 2 +-
 features/desktopish/xmonad/xmonad-srid/default.nix | 2 +-
 features/kde.nix                                   | 5 ++++-
 flake.lock                                         | 8 ++++----
 flake.nix                                          | 7 +++----
 hosts/thin.nix                                     | 3 ---
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/features/desktopish/default.nix b/features/desktopish/default.nix
index 3d30703..22e98c9 100644
--- a/features/desktopish/default.nix
+++ b/features/desktopish/default.nix
@@ -23,11 +23,11 @@
     acpi
     mpv
     xorg.xmessage
-    xclip
   ];
 
   services.xserver = {
     enable = true;
+    displayManager.lightdm.enable = true;
     #displayManager.gdm.enable = true;
     #desktopManager.gnome.enable = true;
   };
diff --git a/features/desktopish/hidpi.nix b/features/desktopish/hidpi.nix
index 549a1e2..061f6d7 100644
--- a/features/desktopish/hidpi.nix
+++ b/features/desktopish/hidpi.nix
@@ -1,5 +1,6 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 {
+  hardware.video.hidpi.enable = true;
   services.xserver.dpi = 170;
   services.xserver.displayManager.sessionCommands = ''
     ${pkgs.xorg.xrdb}/bin/xrdb -merge <<EOF
diff --git a/features/desktopish/xmonad/xmonad-srid/Main.hs b/features/desktopish/xmonad/xmonad-srid/Main.hs
index 3255878..9850ad6 100644
--- a/features/desktopish/xmonad/xmonad-srid/Main.hs
+++ b/features/desktopish/xmonad/xmonad-srid/Main.hs
@@ -19,7 +19,7 @@ main = do
   where
     cfg =
       def
-        { modMask = mod4Mask, -- Use Super instead of Alt
+        { -- modMask = mod4Mask, -- Use Super instead of Alt
           terminal = "alacritty", -- "myst",
           layoutHook =
             borderSpacingBetweenWindows $
diff --git a/features/desktopish/xmonad/xmonad-srid/default.nix b/features/desktopish/xmonad/xmonad-srid/default.nix
index c9290a5..3db8c49 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;
diff --git a/features/kde.nix b/features/kde.nix
index 426e9f5..c69ec82 100644
--- a/features/kde.nix
+++ b/features/kde.nix
@@ -1,10 +1,13 @@
-{ pkgs, ... }: {
+{ pkgs, lib, ... }: {
   services.xserver = {
     enable = true;
     displayManager.sddm.enable = true;
     desktopManager.plasma5.enable = true;
   };
 
+  hardware.video.hidpi.enable = lib.mkDefault true;
+  # services.xserver.dpi = 192;
+
   environment.systemPackages = with pkgs; [
   ];
 }
diff --git a/flake.lock b/flake.lock
index c0b2561..b185a52 100644
--- a/flake.lock
+++ b/flake.lock
@@ -636,17 +636,17 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1636976544,
-        "narHash": "sha256-9ZmdyoRz4Qu8bP5BKR1T10YbzcB9nvCeQjOEw2cRKR0=",
+        "lastModified": 1637155076,
+        "narHash": "sha256-26ZPNiuzlsnXpt55Q44+yzXvp385aNAfevzVEKbrU5Q=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6",
+        "rev": "715f63411952c86c8f57ab9e3e3cb866a015b5f2",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "931ab058daa7e4cd539533963f95e2bb0dbd41e6",
+        "rev": "715f63411952c86c8f57ab9e3e3cb866a015b5f2",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 57d7e3d..96c8a41 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,7 +6,7 @@
     # https://status.nixos.org/
     # 
     # This ensures that we always use the official nix cache.
-    nixpkgs.url = "github:nixos/nixpkgs/931ab058daa7e4cd539533963f95e2bb0dbd41e6";
+    nixpkgs.url = "github:nixos/nixpkgs/715f63411952c86c8f57ab9e3e3cb866a015b5f2";
 
     nixos-hardware.url = github:NixOS/nixos-hardware/master;
     home-manager.url = "github:nix-community/home-manager";
@@ -87,9 +87,8 @@
             inputs.nixos-hardware.nixosModules.lenovo-thinkpad-x1-7th-gen
             ./features/server/harden.nix
             #./features/distributed-build.nix
-            ./features/kde.nix
-            ./features/desktopish/guiapps.nix
-            ./features/desktopish/fonts.nix
+            # ./features/kde.nix
+            ./features/desktopish
             ./features/protonvpn.nix
             #./features/ema/emanote.nix
           ];
diff --git a/hosts/thin.nix b/hosts/thin.nix
index a6fc389..91612ec 100644
--- a/hosts/thin.nix
+++ b/hosts/thin.nix
@@ -25,9 +25,6 @@
   # See also: https://discourse.nixos.org/t/how-to-switch-cpu-governor-on-battery-power/8446/5
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 
-  # high-resolution display
-  hardware.video.hidpi.enable = lib.mkDefault true;
-  services.xserver.dpi = 192;
 
   hardware.pulseaudio.enable = true;
   hardware.pulseaudio.support32Bit = true; ## If compatibility with 32-bit applications is desired.