From 1fa582146453f754302a6b56974f4b7c65509a0e Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Sun, 17 Dec 2023 17:10:10 +0100
Subject: [PATCH] switch to kitty

---
 home-manager/hyprland-settings.nix   |  4 ++--
 home-manager/kitty.nix               | 18 ++++++++++++++++++
 home-manager/themes/yorha/colors.nix | 23 +++++++++++++++++++++++
 modules/graphical/shared.nix         |  1 +
 users/kopatz/home.nix                | 11 ++---------
 5 files changed, 46 insertions(+), 11 deletions(-)
 create mode 100644 home-manager/kitty.nix
 create mode 100644 home-manager/themes/yorha/colors.nix

diff --git a/home-manager/hyprland-settings.nix b/home-manager/hyprland-settings.nix
index 3cf806e..4871223 100644
--- a/home-manager/hyprland-settings.nix
+++ b/home-manager/hyprland-settings.nix
@@ -133,7 +133,7 @@
         # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
         bind = let
 	  rofi = "${pkgs.rofi-wayland}/bin/rofi";
-	  konsole = "${pkgs.konsole}/bin/konsole";
+	  kitty = "${pkgs.kitty}/bin/kitty";
 	  thunar = "${pkgs.xfce.thunar}/bin/thunar";
 	  wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
 	  wl-paste = "${pkgs.wl-clipboard}/bin/wl-paste";
@@ -145,7 +145,7 @@
           swaylock = "${pkgs.swaylock}/bin/swaylock";
           playerctl = "${pkgs.playerctl}/bin/playerctl";
         in  [ 
-	  "$mainMod, Q, exec, ${konsole}"
+	  "$mainMod, Q, exec, ${kitty}"
           "$mainMod, C, killactive"
           "$mainMod, L, exec, ${swaylock} -f -c 000000"
           "$mainMod, M, exit,"
diff --git a/home-manager/kitty.nix b/home-manager/kitty.nix
new file mode 100644
index 0000000..35895db
--- /dev/null
+++ b/home-manager/kitty.nix
@@ -0,0 +1,18 @@
+{ config, pkgs, inputs, ...}:
+{
+  programs.kitty = {
+    enable = true;
+    settings = {
+      foreground = "#${config.colorScheme.colors.base05}";
+      background = "#${config.colorScheme.colors.base00}";
+      env = "TERM=xterm-256color";
+      # ...
+    };
+    extraConfig = ''
+      map ctrl+left neighboring_window left
+      map shift+left move_window right
+      map ctrl+down neighboring_window down
+      map shift+down move_window up
+    '';
+  };
+}
diff --git a/home-manager/themes/yorha/colors.nix b/home-manager/themes/yorha/colors.nix
new file mode 100644
index 0000000..7c5e344
--- /dev/null
+++ b/home-manager/themes/yorha/colors.nix
@@ -0,0 +1,23 @@
+{
+    slug = "yorha";
+    name = "yorha";
+    author = "flick0 (https://github.com/flick0)";
+    colors = {
+      base00 = "#1e1d1c";
+      base01 = "#A39D8F";
+      base02 = "#AFA899";
+      base03 = "#BBB4A5";
+      base04 = "#C3BCAB";
+      base05 = "#D2CCB9";
+      base06 = "#DBD5C2";
+      base07 = "#e8e5da";
+      base08 = "#a2a098";
+      base09 = "#A39D8F";
+      base10 = "#AFA899";
+      base11 = "#BBB4A5";
+      base12 = "#C3BCAB";
+      base13 = "#D2CCB9";
+      base14 = "#DBD5C2";
+      base15 = "#e8e5da";
+    };
+}
diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix
index f1289dd..e669065 100644
--- a/modules/graphical/shared.nix
+++ b/modules/graphical/shared.nix
@@ -67,6 +67,7 @@ in
     brightnessctl
     wacomtablet
     osu-lazer-bin
+    libsForQt5.kolourpaint
   ];
 
   #environment.sessionVariables = {
diff --git a/users/kopatz/home.nix b/users/kopatz/home.nix
index f886526..4f39254 100644
--- a/users/kopatz/home.nix
+++ b/users/kopatz/home.nix
@@ -11,14 +11,6 @@
     # changes in each release.
     stateVersion = "23.05";
   };
-      programs.kitty = {
-        enable = true;
-        settings = {
-          foreground = "#${config.colorScheme.colors.base05}";
-          background = "#${config.colorScheme.colors.base00}";
-          # ...
-        };
-    };
 
   imports = [
     ../../home-manager/nvim.nix
@@ -27,8 +19,9 @@
     ../../home-manager/gtk-theme.nix
     ../../home-manager/direnv.nix
     ../../home-manager/lf.nix
+    ../../home-manager/kitty.nix
     inputs.nix-colors.homeManagerModule
   ];
 
-  colorScheme = inputs.nix-colors.colorSchemes.tokyo-night-dark;
+  colorScheme = import ../../home-manager/themes/yorha/colors.nix;
 }