From e3cf1df4e7e15e3a57c18d1295398811adc4d7c2 Mon Sep 17 00:00:00 2001
From: Matthew Ess <mat@mat.services>
Date: Wed, 5 May 2021 20:27:06 -0400
Subject: [PATCH] Move kitty to common

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

diff --git a/hm-configs/files-all.nix b/hm-configs/files-all.nix
index f127bbb..71e86cf 100644
--- a/hm-configs/files-all.nix
+++ b/hm-configs/files-all.nix
@@ -17,7 +17,6 @@
     matthewess/fish-autovenv
     Gazorby/fish-abbreviation-tips
   '';
-  # ".config/fish/completions/systemctl.fish".source = ../assets/systemctl.fish;
   ".config/fish/functions/colortest.fish".source = ../assets/colortest.fish;
   ".config/fish/functions/mkdcd.fish".text = ''
     function mkdcd -a target
@@ -32,4 +31,12 @@
       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 d646fe8..3a6ceff 100644
--- a/hm-configs/files.nix
+++ b/hm-configs/files.nix
@@ -9,14 +9,6 @@
     end
   '';
   ".config/i3status.toml".source = ../assets/i3status.toml;
-  ".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;
   ".config/rofi/theme.rasi".source = ../assets/sidetab.rasi;
   ".config/fish/completions/pijul.fish".source = ../assets/pijul.fish;
   ".config/pijul/config.toml".text = ''
diff --git a/users/mat-hm-laptop.nix b/users/mat-hm-laptop.nix
index 1369be0..2294b0d 100644
--- a/users/mat-hm-laptop.nix
+++ b/users/mat-hm-laptop.nix
@@ -4,7 +4,6 @@ in {
   home = {
     sessionVariables = {
       BROWSER = "vivaldi";
-      TERMINAL = "kitty";
       CM_LAUNCHER = "rofi";
     };
     packages = with pkgs; [
@@ -24,7 +23,6 @@ in {
       dunst
       element-desktop
       enpass
-      kitty
       lagrange
       # mullvad-vpn
       okular
diff --git a/users/mat-hm.nix b/users/mat-hm.nix
index a8fef6b..00196ee 100644
--- a/users/mat-hm.nix
+++ b/users/mat-hm.nix
@@ -4,7 +4,10 @@ let
   email = "mat@mat.services";
 in {
   home = {
-    sessionVariables = { EDITOR = "nvim"; };
+    sessionVariables = {
+      EDITOR = "nvim";
+      TERMINAL = "kitty";
+    };
     packages = with pkgs; [
       # nix utilities
       cachix
@@ -21,6 +24,8 @@ in {
       neofetch
       rlwrap
       tealdeer
+
+      kitty
     ];
     file = import ../hm-configs/files-all.nix;
   };