From da7363f629659eff5f4ccd71ef1a1e65feb6a777 Mon Sep 17 00:00:00 2001
From: Jacob Bachmann <jacob.bachmann@posteo.de>
Date: Wed, 28 Aug 2024 12:27:54 +0200
Subject: [PATCH] feat: add kitty and yazi

---
 modules/nautilus.nix                           |  2 +-
 users/gandalf/modules/default.nix              |  1 +
 users/gandalf/modules/gui/i3/default.nix       |  5 ++---
 users/gandalf/modules/gui/programs/default.nix |  1 +
 users/gandalf/modules/gui/programs/games.nix   |  3 ++-
 users/gandalf/modules/gui/programs/kitty.nix   | 12 ++++++++++++
 users/gandalf/modules/gui/sway/default.nix     |  2 +-
 users/gandalf/modules/yazi.nix                 |  7 +++++++
 8 files changed, 27 insertions(+), 6 deletions(-)
 create mode 100644 users/gandalf/modules/gui/programs/kitty.nix
 create mode 100644 users/gandalf/modules/yazi.nix

diff --git a/modules/nautilus.nix b/modules/nautilus.nix
index 5c6b169..ba8710d 100644
--- a/modules/nautilus.nix
+++ b/modules/nautilus.nix
@@ -1,7 +1,7 @@
 { pkgs, lib, config, ... }: with config.bchmnn; lib.mkIf (gui.enable && gui.flavour != [ ]) {
   programs.nautilus-open-any-terminal = {
     enable = true;
-    terminal = "alacritty";
+    terminal = "kitty";
   };
 
   environment = {
diff --git a/users/gandalf/modules/default.nix b/users/gandalf/modules/default.nix
index 184cb27..d22686a 100644
--- a/users/gandalf/modules/default.nix
+++ b/users/gandalf/modules/default.nix
@@ -15,6 +15,7 @@
     ./ssh.nix
     ./tmux.nix
     ./xdg.nix
+    ./yazi.nix
     ./zsh.nix
   ];
 }
diff --git a/users/gandalf/modules/gui/i3/default.nix b/users/gandalf/modules/gui/i3/default.nix
index 4bed737..1bc4566 100644
--- a/users/gandalf/modules/gui/i3/default.nix
+++ b/users/gandalf/modules/gui/i3/default.nix
@@ -21,7 +21,6 @@ in
   ];
 
   home.packages = with pkgs; [
-    alacritty
     dmenu
     xclip # tool to access the x clipboard from a console application
     wireplumber
@@ -44,7 +43,7 @@ in
     config = {
       modifier = "Mod4";
       bars = [ ];
-      terminal = "${pkgs.alacritty}/bin/alacritty";
+      terminal = "${config.programs.kitty.package}/bin/kitty";
       menu = "${config.programs.rofi.package}/bin/rofi -show drun";
       startup = with pkgs; [
         { command = "${start-polybar}"; }
@@ -57,7 +56,7 @@ in
         { command = "${nextcloud-client}/bin/nextcloud"; }
         { command = "${plasma5Packages.kdeconnect-kde}/bin/kdeconnect-indicator"; }
         { command = "${system-config-printer}/bin/system-config-printer-applet"; }
-        { command = "${alacritty}/bin/alacritty --class dropdown --title dropdown"; always = true; }
+        { command = "${config.programs.kitty.package}/bin/kitty --class dropdown --title dropdown"; always = true; }
       ];
       fonts = {
         names = [ common.font ];
diff --git a/users/gandalf/modules/gui/programs/default.nix b/users/gandalf/modules/gui/programs/default.nix
index 4c29c77..2c958a2 100644
--- a/users/gandalf/modules/gui/programs/default.nix
+++ b/users/gandalf/modules/gui/programs/default.nix
@@ -6,6 +6,7 @@
     ./discord.nix
     ./games.nix
     ./keyring.nix
+    ./kitty.nix
     ./obs.nix
     ./vscode.nix
     ./zathura.nix
diff --git a/users/gandalf/modules/gui/programs/games.nix b/users/gandalf/modules/gui/programs/games.nix
index a3e5a81..f97b25f 100644
--- a/users/gandalf/modules/gui/programs/games.nix
+++ b/users/gandalf/modules/gui/programs/games.nix
@@ -1,5 +1,6 @@
 { nixosConfig, lib, pkgs, ... }: lib.mkIf nixosConfig.bchmnn.games.enable {
   home.packages = with pkgs; [
-    extremetuxracer
+    celestia # real-time 3d simulation of space
+    extremetuxracer # high speed arctic racing game based on tux racer
   ];
 }
diff --git a/users/gandalf/modules/gui/programs/kitty.nix b/users/gandalf/modules/gui/programs/kitty.nix
new file mode 100644
index 0000000..7f8890c
--- /dev/null
+++ b/users/gandalf/modules/gui/programs/kitty.nix
@@ -0,0 +1,12 @@
+{ pkgs, lib, ... }:
+let
+  common = (import ../common.nix) { pkgs = pkgs; lib = lib; };
+in
+{
+  programs.kitty = {
+    enable = true;
+    font.name = common.font;
+    font.size = 12;
+    theme = "Tango Light";
+  };
+}
diff --git a/users/gandalf/modules/gui/sway/default.nix b/users/gandalf/modules/gui/sway/default.nix
index 51060af..d1712c2 100644
--- a/users/gandalf/modules/gui/sway/default.nix
+++ b/users/gandalf/modules/gui/sway/default.nix
@@ -81,7 +81,7 @@ in
     '';
     config = {
       modifier = "Mod4";
-      terminal = "${pkgs.alacritty}/bin/alacritty";
+      terminal = "${config.programs.kitty.package}/bin/kitty";
       menu = "${pkgs.wofi}/bin/wofi";
       # TODO for some reason bar only works when used with exec
       bars = [ ];
diff --git a/users/gandalf/modules/yazi.nix b/users/gandalf/modules/yazi.nix
new file mode 100644
index 0000000..5cf9b78
--- /dev/null
+++ b/users/gandalf/modules/yazi.nix
@@ -0,0 +1,7 @@
+{ ... }: {
+
+  programs.yazi = {
+    enable = true;
+  };
+
+}