From e8269031c692bf6a6a4766cf1681cc5c3e3a27bc Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Fri, 29 Oct 2021 14:37:45 -0400
Subject: [PATCH] etc.

---
 features/desktopish/fonts.nix   | 1 +
 features/desktopish/guiapps.nix | 8 ++++++++
 features/kde.nix                | 5 -----
 flake.lock                      | 6 +++---
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/features/desktopish/fonts.nix b/features/desktopish/fonts.nix
index c506508..6d6c43e 100644
--- a/features/desktopish/fonts.nix
+++ b/features/desktopish/fonts.nix
@@ -12,6 +12,7 @@
       fira-code
       cascadia-code
       nerdfonts
+      b612
     ];
   };
 }
diff --git a/features/desktopish/guiapps.nix b/features/desktopish/guiapps.nix
index a63e1d6..f1107dd 100644
--- a/features/desktopish/guiapps.nix
+++ b/features/desktopish/guiapps.nix
@@ -5,6 +5,14 @@
     vscode
     vlc
     steam
+
+    # X stuff
+    xorg.xdpyinfo
+    xorg.xrandr
+    xclip
+    xsel
+    arandr
+    autorandr
   ];
 
   # https://github.com/NixOS/nixpkgs/issues/47932#issuecomment-447508411
diff --git a/features/kde.nix b/features/kde.nix
index c5c6c7b..426e9f5 100644
--- a/features/kde.nix
+++ b/features/kde.nix
@@ -6,10 +6,5 @@
   };
 
   environment.systemPackages = with pkgs; [
-    xorg.xdpyinfo
-    xorg.xrandr
-    xsel
-    arandr
-    autorandr
   ];
 }
diff --git a/flake.lock b/flake.lock
index 091e51f..2d1235d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -133,11 +133,11 @@
         "windicss": "windicss"
       },
       "locked": {
-        "lastModified": 1635273350,
-        "narHash": "sha256-NE63clMe2JQSPVOv08ld/oOFS78XJOzWbYI8SJt2qZM=",
+        "lastModified": 1635278951,
+        "narHash": "sha256-3GMg80sHS6+lYLl97Zoj/ERqo/N4k5vM6rGNh4lQYDQ=",
         "owner": "srid",
         "repo": "emanote",
-        "rev": "228029bbe7320ea816e523c8eb7b628133b03639",
+        "rev": "d1850607ebeaf2d8b578a7b8f1d43a058d83616f",
         "type": "github"
       },
       "original": {