From a24f3cf15b03e7257aad62c26515411b487b78cf Mon Sep 17 00:00:00 2001 From: mat ess Date: Wed, 5 May 2021 22:43:06 -0400 Subject: [PATCH] Revert "Move kitty back" This reverts commit 7b84ccba8486dd19d36661c1409fa87a8d08f9d4. --- 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, 14 insertions(+), 11 deletions(-) diff --git a/hm-configs/files-all.nix b/hm-configs/files-all.nix index 2367797..073363e 100644 --- a/hm-configs/files-all.nix +++ b/hm-configs/files-all.nix @@ -32,4 +32,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 ca19920..3a6ceff 100644 --- a/hm-configs/files.nix +++ b/hm-configs/files.nix @@ -17,12 +17,4 @@ 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 036c377..d3077d8 100644 --- a/users/mat-hm-laptop.nix +++ b/users/mat-hm-laptop.nix @@ -5,7 +5,6 @@ in { sessionVariables = { BROWSER = "vivaldi"; CM_LAUNCHER = "rofi"; - TERMINAL = "kitty"; }; packages = with pkgs; [ # command line utilities @@ -42,7 +41,6 @@ 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 0b37007..0bb307f 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; };