From b5519182738c435284873f6f4ee6cce8d906f617 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte.vanpetegem@ugent.be>
Date: Tue, 14 Feb 2023 17:13:25 +0100
Subject: [PATCH] Switch terminal and font

---
 flake.lock                             | 17 ------------
 flake.nix                              |  4 +--
 modules/base/emacs/base-init.el        |  2 +-
 modules/graphical/default.nix          | 29 --------------------
 modules/graphical/sway/default.nix     | 10 +++----
 modules/graphical/sway/launcher.zsh    |  2 +-
 modules/graphical/terminal/default.nix | 27 +++++++++++++++++--
 modules/graphical/terminal/wezterm.lua | 37 --------------------------
 modules/graphical/theme/default.nix    |  9 +++----
 9 files changed, 37 insertions(+), 100 deletions(-)
 delete mode 100644 modules/graphical/terminal/wezterm.lua

diff --git a/flake.lock b/flake.lock
index 1d44d694..cbe319ce 100644
--- a/flake.lock
+++ b/flake.lock
@@ -300,22 +300,6 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1676253841,
-        "narHash": "sha256-jhuI8Mmky8VCD45OoJEuF6HdPLFBwNrHA0ljjZ/zkfw=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "a45a8916243a7d27acc358f4fc18c4491f3eeca8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-22.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nur": {
       "locked": {
         "lastModified": 1676385929,
@@ -343,7 +327,6 @@
         "home-manager": "home-manager",
         "nixos-mailserver": "nixos-mailserver",
         "nixpkgs": "nixpkgs",
-        "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur",
         "tetris": "tetris",
         "utils": "utils",
diff --git a/flake.nix b/flake.nix
index ec4038d1..cc2c8c66 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,7 +62,6 @@
       };
     };
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-22.11";
     nur.url = "github:nix-community/NUR";
     tetris = {
       url = "github:chvp/tetris";
@@ -88,7 +87,7 @@
     };
   };
 
-  outputs = inputs@{ self, nixpkgs, nixpkgs-stable, accentor, accentor-api, accentor-web, agenix, devshell, emacs-overlay, flake-utils, home-manager, nixos-mailserver, nur, tetris, utils, www-chvp-be }:
+  outputs = inputs@{ self, nixpkgs, accentor, accentor-api, accentor-web, agenix, devshell, emacs-overlay, flake-utils, home-manager, nixos-mailserver, nur, tetris, utils, www-chvp-be }:
     utils.lib.mkFlake {
       inherit self inputs;
       channels.nixpkgs = {
@@ -101,7 +100,6 @@
           (self: super: {
             tetris = tetris.packages.${self.system}.default;
             matrix-hookshot = self.callPackage ./packages/matrix-hookshot { };
-            wezterm = nixpkgs-stable.legacyPackages.${self.system}.wezterm;
           })
           nur.overlay
           www-chvp-be.overlay
diff --git a/modules/base/emacs/base-init.el b/modules/base/emacs/base-init.el
index 60c37a98..9ae41745 100644
--- a/modules/base/emacs/base-init.el
+++ b/modules/base/emacs/base-init.el
@@ -138,7 +138,7 @@
   ;; Font configuration
   (defun font-settings ()
     "Setup font settings."
-    (when window-system (set-frame-font "Fira Code 9"))
+    (when window-system (set-frame-font "Hack 9"))
     (set-fontset-font t 'symbol "Noto Color Emoji")
     (set-fontset-font t 'symbol "Symbola" nil 'append))
   ;; Make sure DISPLAY is set correctly in env.
diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix
index 3cbf17d5..55e9323b 100644
--- a/modules/graphical/default.nix
+++ b/modules/graphical/default.nix
@@ -1,13 +1,5 @@
 { config, lib, pkgs, ... }:
 
-let
-  ligature = pkgs.fetchFromGitHub {
-    owner = "mickeynp";
-    repo = "ligature.el";
-    rev = "9357156a917a021a87b33ee391567a5d8e44794a";
-    hash = "sha256-Bgb5wFyx0hMilpihxA8cTrRVw71EBOw2DczlM4lSNMs=";
-  };
-in
 {
   imports = [
     ./firefox
@@ -31,27 +23,6 @@ in
     users.users.charlotte.extraGroups = [ "input" "video" ];
     chvp = {
       base = {
-        emacs.extraConfig = [
-          ''
-            ;; Ligatures in GUI mode
-            (use-package ligature
-              :load-path "${ligature}"
-              :config
-              (ligature-set-ligatures 't '("www" "**" "***" "**/" "*>" "*/" "\\\\" "\\\\\\" "{-" "::"
-                                           ":::" ":=" "!!" "!=" "!==" "-}" "----" "-->" "->" "->>"
-                                           "-<" "-<<" "-~" "#{" "#[" "##" "###" "####" "#(" "#?" "#_"
-                                           "#_(" ".-" ".=" ".." "..<" "..." "?=" "??" ";;" "/*" "/**"
-                                           "/=" "/==" "/>" "//" "///" "&&" "||" "||=" "|=" "|>" "^=" "$>"
-                                           "++" "+++" "+>" "=:=" "==" "===" "==>" "=>" "=>>" "<="
-                                           "=<<" "=/=" ">-" ">=" ">=>" ">>" ">>-" ">>=" ">>>" "<*"
-                                           "<*>" "<|" "<|>" "<$" "<$>" "<!--" "<-" "<--" "<->" "<+"
-                                           "<+>" "<=" "<==" "<=>" "<=<" "<>" "<<" "<<-" "<<=" "<<<"
-                                           "<~" "<~~" "</" "</>" "~@" "~-" "~>" "~~" "~~>" "%%")
-              )
-              (global-ligature-mode 't)
-            )
-          ''
-        ];
         nix.unfreePackages = [ "google-chrome" ];
       };
       graphical = {
diff --git a/modules/graphical/sway/default.nix b/modules/graphical/sway/default.nix
index 07835f35..bc497d5b 100644
--- a/modules/graphical/sway/default.nix
+++ b/modules/graphical/sway/default.nix
@@ -29,7 +29,7 @@ in
       programs = {
         mako = {
           enable = true;
-          font = "Fira Code Normal 9";
+          font = "Hack Regular 9";
         };
         zsh.loginExtra = ''
           if [[ -z "$DISPLAY" ]] && [[ $(tty) = "/dev/tty1" ]]; then
@@ -72,9 +72,9 @@ in
           down = "j";
           up = "k";
           right = "l";
-          terminal = "${pkgs.wezterm}/bin/wezterm";
-          menu = "${terminal} start --class launcher -- ${launcher}/bin/launcher";
-          fonts = { names = [ "Fira Code" ]; size = 9.0; style = "Normal"; };
+          terminal = "${pkgs.foot}/bin/footclient";
+          menu = "${terminal} --app-id launcher -- ${launcher}/bin/launcher";
+          fonts = { names = [ "Hack" ]; size = 9.0; style = "Regular"; };
           bars = [
             {
               colors = {
@@ -85,7 +85,7 @@ in
                 inactiveWorkspace = { border = "#ffffff"; background = "#ffffff"; text = "#000000"; };
                 urgentWorkspace = { border = "#ff8892"; background = "#ff8892"; text = "#000000"; };
               };
-              fonts = { names = [ "Fira Code" ]; size = 9.0; style = "Normal"; };
+              fonts = { names = [ "Hack" ]; size = 9.0; style = "Regular"; };
               position = "top";
               statusCommand = "${pkgs.i3status-rust}/bin/i3status-rs ${status-configuration}";
               extraConfig = ''
diff --git a/modules/graphical/sway/launcher.zsh b/modules/graphical/sway/launcher.zsh
index 15c0cfa0..ffbd285f 100644
--- a/modules/graphical/sway/launcher.zsh
+++ b/modules/graphical/sway/launcher.zsh
@@ -105,7 +105,7 @@ windows() {
   @sway@/bin/swaymsg \[con_id="$window"\] focus
 }
 
-CHOSEN=$(cat <(windows_options) <(systemctl_options) <(pass_options) <(nrun_options) <(run_options) <(record_options) <(calc_options) <(emoji_options) | @fzy@/bin/fzy --lines 40 | tail -n1)
+CHOSEN=$(cat <(windows_options) <(systemctl_options) <(pass_options) <(nrun_options) <(run_options) <(record_options) <(calc_options) <(emoji_options) | @fzy@/bin/fzy --lines 80 | tail -n1)
 
 if [ -n "$CHOSEN" ]
 then
diff --git a/modules/graphical/terminal/default.nix b/modules/graphical/terminal/default.nix
index 9afa42ef..bcd6fa9c 100644
--- a/modules/graphical/terminal/default.nix
+++ b/modules/graphical/terminal/default.nix
@@ -8,8 +8,31 @@
 
   config = lib.mkIf config.chvp.graphical.terminal.enable {
     home-manager.users.charlotte = { pkgs, ... }: {
-      home.packages = [ pkgs.wezterm ];
-      xdg.configFile."wezterm/wezterm.lua".source = ./wezterm.lua;
+      home.packages = [ pkgs.foot ];
+      programs.foot = {
+        enable = true;
+        server.enable = true;
+        settings = {
+          main = {
+            font = "Hack:size=9";
+            dpi-aware = "no";
+          };
+          scrollback.lines = 10000;
+          cursor.blink = true;
+          colors = {
+            foreground = "000000";
+            background = "ffffff";
+            regular0 = "282828";
+            regular1 = "a60000";
+            regular2 = "005e00";
+            regular3 = "813e00";
+            regular4 = "0031a9";
+            regular5 = "721045";
+            regular6 = "00538b";
+            regular7 = "f8f8f8";
+          };
+        };
+      };
     };
   };
 }
diff --git a/modules/graphical/terminal/wezterm.lua b/modules/graphical/terminal/wezterm.lua
deleted file mode 100644
index 8f3a3931..00000000
--- a/modules/graphical/terminal/wezterm.lua
+++ /dev/null
@@ -1,37 +0,0 @@
-local wezterm = require 'wezterm';
-
-return {
-  font = wezterm.font("Fira Code"),
-  font_size = 9.0,
-  colors = {
-    foreground = "#000000",
-    background = "#ffffff",
-    cursor_bg = "#777777",
-    cursor_fg = "#ffffff",
-    cursor_border = "#777777",
-    selection_bg = "#000000",
-    selection_fg = "#ffffff",
-    ansi = { "#282828", "#a60000", "#005e00", "#813e00", "#0031a9", "#721045", "#00538b", "#f8f8f8" },
-    brights = { "#000000", "#972500", "#315b00", "#70480f", "#2544bb", "#8f0075", "#30517f", "#ffffff" },
-  },
-  enable_scroll_bar = false,
-  audible_bell = "Disabled",
-  check_for_updates = false,
-  enable_tab_bar = false,
-  cursor_blink_ease_in = "Constant",
-  cursor_blink_ease_out = "Constant",
-  default_cursor_style = "BlinkingBlock",
-  unicode_version = 14,
-  visual_bell = {
-    fade_in_function = "EaseIn",
-    fade_in_duration_ms = 150,
-    fade_out_function = "EaseOut",
-    fade_out_duration_ms = 150,
-  },
-  window_padding = {
-    left = 0,
-    right = 0,
-    top = 0,
-    bottom = 0,
-  },
-}
diff --git a/modules/graphical/theme/default.nix b/modules/graphical/theme/default.nix
index 6280c260..ca18d407 100644
--- a/modules/graphical/theme/default.nix
+++ b/modules/graphical/theme/default.nix
@@ -14,14 +14,13 @@
         defaultFonts = {
           emoji = [ "Noto Color Emoji" ];
           # The Tinos and Amiro fonts overlap with Font Awesome's codepoints, so make sure we give Font Awesome a higher priority.
-          monospace = [ "Fira Code" "Font Awesome 5 Free" ];
-          sansSerif = [ "Noto Sans" "Font Awesome 5 Free" ];
-          serif = [ "Noto Serif" "Font Awesome 5 Free" ];
+          monospace = [ "Hack" "Font Awesome 6 Free" ];
+          sansSerif = [ "Noto Sans" "Font Awesome 6 Free" ];
+          serif = [ "Noto Serif" "Font Awesome 6 Free" ];
         };
       };
       fonts = with pkgs; [
-        fira-code
-        fira-code-symbols
+        hack-font
         font-awesome
         noto-fonts
         noto-fonts-cjk