From 7b84ccba8486dd19d36661c1409fa87a8d08f9d4 Mon Sep 17 00:00:00 2001
From: Matthew Ess <mat@mat.services>
Date: Wed, 5 May 2021 21:03:56 -0400
Subject: [PATCH] Move kitty back

---
 hm-configs/files-all.nix | 8 --------
 hm-configs/files.nix     | 8 ++++++++
 users/mat-hm-laptop.nix  | 2 ++
 users/mat-hm.nix         | 7 +------
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/hm-configs/files-all.nix b/hm-configs/files-all.nix
index 073363e..2367797 100644
--- a/hm-configs/files-all.nix
+++ b/hm-configs/files-all.nix
@@ -32,12 +32,4 @@
       unzip -d $target $target
     end
   '';
-  ".config/kitty/kitty.conf".text = ''
-    font_family Fira Code Regular
-    bold_font   Fira Code Bold
-    font_size   15.0
-    clipboard_control write-clipboard write-primary no-append
-    include ./theme.conf
-  '';
-  ".config/kitty/theme.conf".source = ../assets/kitty-theme.conf;
 }
diff --git a/hm-configs/files.nix b/hm-configs/files.nix
index 3a6ceff..ca19920 100644
--- a/hm-configs/files.nix
+++ b/hm-configs/files.nix
@@ -17,4 +17,12 @@
     full_name = "mat"
     email = "mat@mat.services"
   '';
+  ".config/kitty/kitty.conf".text = ''
+    font_family Fira Code Regular
+    bold_font   Fira Code Bold
+    font_size   15.0
+    clipboard_control write-clipboard write-primary no-append
+    include ./theme.conf
+  '';
+  ".config/kitty/theme.conf".source = ../assets/kitty-theme.conf;
 }
diff --git a/users/mat-hm-laptop.nix b/users/mat-hm-laptop.nix
index 2294b0d..e8dc87e 100644
--- a/users/mat-hm-laptop.nix
+++ b/users/mat-hm-laptop.nix
@@ -5,6 +5,7 @@ in {
     sessionVariables = {
       BROWSER = "vivaldi";
       CM_LAUNCHER = "rofi";
+      TERMINAL = "kitty";
     };
     packages = with pkgs; [
       # command line utilities
@@ -41,6 +42,7 @@ in {
       clipnotify
       gnome3.gnome-disk-utility
       i3status-rust
+      kitty
       libappindicator
       libnotify
       lxappearance
diff --git a/users/mat-hm.nix b/users/mat-hm.nix
index 00196ee..a8fef6b 100644
--- a/users/mat-hm.nix
+++ b/users/mat-hm.nix
@@ -4,10 +4,7 @@ let
   email = "mat@mat.services";
 in {
   home = {
-    sessionVariables = {
-      EDITOR = "nvim";
-      TERMINAL = "kitty";
-    };
+    sessionVariables = { EDITOR = "nvim"; };
     packages = with pkgs; [
       # nix utilities
       cachix
@@ -24,8 +21,6 @@ in {
       neofetch
       rlwrap
       tealdeer
-
-      kitty
     ];
     file = import ../hm-configs/files-all.nix;
   };