From fdc1d55761507b0ba22dab9ba921b59ad4cd245e Mon Sep 17 00:00:00 2001
From: Riley Apeldoorn <me@riley.lgbt>
Date: Sun, 21 May 2023 22:45:36 +0000
Subject: [PATCH] Configure terminal

---
 shared/core/default.nix            |  5 ++---
 shared/home/{fish.nix => bash.nix} |  7 ++++---
 shared/home/default.nix            |  2 +-
 shared/home/gui/default.nix        |  8 +++++++-
 shared/home/gui/sway.nix           |  5 ++++-
 shared/home/gui/term.nix           | 23 ++++++++++++++++++++---
 system/dev-lt-63/term.nix          |  2 +-
 7 files changed, 39 insertions(+), 13 deletions(-)
 rename shared/home/{fish.nix => bash.nix} (71%)

diff --git a/shared/core/default.nix b/shared/core/default.nix
index 8b1185a..4af7cc2 100644
--- a/shared/core/default.nix
+++ b/shared/core/default.nix
@@ -11,17 +11,16 @@
   config = {
     users.users."riley" = {
 
-      shell = pkgs.fish;
+      shell = pkgs.bash;
 
       isNormalUser = true;
       extraGroups = ["wheel"];
-      packages = [ pkgs.helix ];
+      packages = [ pkgs.kakoune ];
 
     };
 
     environment.systemPackages = (import ../env.nix pkgs);
 
-    programs.fish.enable = true;
     services.earlyoom.enable = true;
   };
 
diff --git a/shared/home/fish.nix b/shared/home/bash.nix
similarity index 71%
rename from shared/home/fish.nix
rename to shared/home/bash.nix
index 0694bae..192fc98 100644
--- a/shared/home/fish.nix
+++ b/shared/home/bash.nix
@@ -1,12 +1,13 @@
 # Configuration of the shell.
+# TODO: switch to a shell from this century
 
 { pkgs, lib, config, ... }:
 
-let cfg = config.custom.fish;
+let cfg = config.custom.bash;
 
 in with lib; {
 
-  options.custom.fish = with types; {
+  options.custom.bash = with types; {
     extraAliases = mkOption {
       default = {};
     };
@@ -15,7 +16,7 @@ in with lib; {
   config = {
 
     # Configure the shell itself
-    programs.fish = {
+    programs.bash = {
       enable = true;
       shellAliases = {} // cfg.extraAliases;
     };
diff --git a/shared/home/default.nix b/shared/home/default.nix
index 0111b7e..14adf05 100644
--- a/shared/home/default.nix
+++ b/shared/home/default.nix
@@ -3,7 +3,7 @@
 {
 
   imports = [
-    ./fish.nix
+    ./bash.nix
     ./git.nix
     ./nix.nix
     ./programs.nix
diff --git a/shared/home/gui/default.nix b/shared/home/gui/default.nix
index 92ddee9..7d921d7 100644
--- a/shared/home/gui/default.nix
+++ b/shared/home/gui/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 
 {
 
@@ -7,4 +7,10 @@
     ./term.nix
   ];
 
+  fonts.fontconfig.enable = true;
+
+  home.packages = with pkgs; [
+    fira-code
+  ];
+
 }
\ No newline at end of file
diff --git a/shared/home/gui/sway.nix b/shared/home/gui/sway.nix
index 931ae7b..7624770 100644
--- a/shared/home/gui/sway.nix
+++ b/shared/home/gui/sway.nix
@@ -18,7 +18,10 @@ in with lib; {
       extraSessionCommands = "export WLR_NO_HARDWARE_CURSORS=1";
       extraOptions = [ "--unsupported-gpu" ];
 
-      config.output."*".bg = "${../../data/wallpaper.jpg} fill";
+      config = {
+        output."*".bg = "${../../data/wallpaper.jpg} fill";
+        terminal = "${pkgs.kitty}/bin/kitty";
+      };
     };
 
   };
diff --git a/shared/home/gui/term.nix b/shared/home/gui/term.nix
index 2515280..0262a16 100644
--- a/shared/home/gui/term.nix
+++ b/shared/home/gui/term.nix
@@ -1,5 +1,22 @@
-{ ... }:
+{ pkgs, config, ... }:
+
+let theme = config.theme; in {
+
+  programs.kitty = {
+    enable = true;
+
+    settings = {
+      term = "xterm";
+      enable_audio_bell = false;
+      scrollback_lines = 5000000;
+      background = "#${theme.background.basic}";
+    };
+
+    font = {
+      name = "Fira Code";
+      package = pkgs.fira-code;
+      size = 8.5;
+    };
+  };
 
-{
-  programs.kitty.enable = true;
 }
\ No newline at end of file
diff --git a/system/dev-lt-63/term.nix b/system/dev-lt-63/term.nix
index 511992a..8777f75 100644
--- a/system/dev-lt-63/term.nix
+++ b/system/dev-lt-63/term.nix
@@ -14,7 +14,7 @@ let theme = config.theme; in {
 
     font = {
       name = "Fira Code";
-      package = pkgs.fira-code;
+      size = 8;
     };
   };