Switch to catppuccin

hmModules/btop/default.nix

@@ -1,10 +1,18 @@
-{config, ...}: {
+{pkgs, ...}: {
   programs.btop = {
     enable = true;
     settings = {
       update_ms = 100;
       theme_background = false;
-      color_theme = "${config.programs.btop.package}/share/btop/themes/dracula.theme";
+      # color_theme = "${config.programs.btop.package}/share/btop/themes/dracula.theme";
+      color_theme = let
+        catppuccin-theme = pkgs.fetchFromGitHub {
+          owner = "catppuccin";
+          repo = "btop";
+          rev = "21b8d5956a8b07fa52519e3267fb3a2d2e693d17";
+          hash = "sha256-UXeTypc15MhjgGUiCrDUZ40m32yH2o1N+rcrEgY6sME=";
+        };
+      in "${catppuccin-theme}/themes/catppuccin_mocha.theme";
     };
   };
 }

hmModules/firefox/default.nix

@@ -9,7 +9,7 @@
       extraPolicies = {
         ExtensionSettings = {};
       };
-      nativeMessagingHosts = [pkgs.tridactyl-native pkgs.fx-cast-bridge];
+      nativeMessagingHosts = [pkgs.tridactyl-native];
     };
     profiles.${username} = {
       extensions = with pkgs.nur.repos.rycee.firefox-addons; [

hmModules/foot/default.nix

@@ -1,5 +1,16 @@
-{lib, ...}: {
-  programs.foot = {
+{
+  lib,
+  pkgs,
+  ...
+}: {
+  programs.foot = let
+    catppuccin = pkgs.fetchFromGitHub {
+      owner = "catppuccin";
+      repo = "foot";
+      rev = "307611230661b7b1787feb7f9d122e851bae97e9";
+      hash = "sha256-mkPYHDJtfdfDnqLr1YOjaBpn4lCceok36LrnkUkNIE4=";
+    };
+  in {
     enable = true;
     server.enable = true;
     settings = {
@@ -9,11 +20,13 @@
         # Using dpi-aware = "yes" font size is too small on my external monitor
         # Scaling that output in sway is inefficient and make XWayland apps blurred
         dpi-aware = "no";
+        horizontal-letter-offset = "1";
+        include = "${catppuccin}/themes/catppuccin-mocha.ini";
         font = let
-          size = "12";
+          size = "13";
         in
           lib.concatStringsSep ", " [
-            "Fira Code:size=${size}"
+            "Iosevka Comfy:size=${size}"
             "Symbols Nerd Font:size=${size}"
             "JoyPixels:size=${size}"
           ];
@@ -22,10 +35,6 @@
       mouse = {
         hide-when-typing = "yes";
       };
-
-      colors = {
-        background = "282C34";
-      };
     };
   };
 }

hmModules/helix/default.nix

@@ -2,7 +2,7 @@
   programs.helix = {
     enable = true;
     settings = {
-      theme = "dracula";
+      theme = "catppuccin_mocha";
       editor = {
         indent-guides.render = true;
         cursor-shape = {

hmModules/hyprland/default.nix

@@ -25,12 +25,10 @@ in {
     ./hyprpaper.nix
     ../waybar
     ../swayidle
-    # ../mako
-    ../swaync
     ../gammastep
-    # ../kitty
     ../wezterm
     ../wayvnc
+    ../foot
   ];
 
   home.packages = with pkgs; [wl-clipboard waypipe];
@@ -55,32 +53,32 @@ in {
     };
   };
 
-  services.kanshi = {
-    enable = true;
-    systemdTarget = "hyprland-session.target";
-    profiles = {
-      undocked = {
-        outputs = [
-          {
-            status = "enable";
-            criteria = "eDP-1";
-          }
-        ];
-      };
-      docked = {
-        outputs = [
-          {
-            status = "disable";
-            criteria = "eDP-1";
-          }
-          {
-            status = "enable";
-            criteria = "DP-1";
-          }
-        ];
-      };
-    };
-  };
+  # services.kanshi = {
+  #   enable = true;
+  #   systemdTarget = "hyprland-session.target";
+  #   profiles = {
+  #     undocked = {
+  #       outputs = [
+  #         {
+  #           status = "enable";
+  #           criteria = "eDP-1";
+  #         }
+  #       ];
+  #     };
+  #     docked = {
+  #       outputs = [
+  #         {
+  #           status = "disable";
+  #           criteria = "eDP-1";
+  #         }
+  #         {
+  #           status = "enable";
+  #           criteria = "DP-1";
+  #         }
+  #       ];
+  #     };
+  #   };
+  # };
 
   wayland.windowManager.hyprland = {
     enable = true;
@@ -110,10 +108,7 @@ in {
       windowrulev2 = float, title:^(floating)$
 
       bind = $mod, b, exec, firefox
-      bind = $mod SHIFT, b , exec, ${pkgs.waypipe}/bin/waypipe --compress lz4=10 ssh mothership.fleet firefox
-      bind = $mod SHIFT, RETURN, exec, ${config.programs.wezterm.package}/bin/wezterm ssh mothership.fleet
-      bind = $mod, m, exec, ${config.programs.wezterm.package}/bin/wezterm start -- mosh mothership.fleet
-      bind = $mod, t, exec, ${config.programs.wezterm.package}/bin/wezterm
+      bind = $mod, t, exec, ${lib.getExe config.programs.wezterm.package}
       bind = $mod, RETURN, exec, emacsclient -c --eval "(ccr/start-eshell)"
       bind = $mod, x, exec, emacsclient -c
       bind = $mod SHIFT, n, exec, emacsclient --eval '(ccr/org-capture "n")' -c -F '((name . "floating"))'
@@ -125,7 +120,6 @@ in {
       bind = , XF86MonBrightnessDown, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 5%-
       bind = $mod, code:60, exec, ${pkgs.brightnessctl}/bin/brightnessctl s +5%
       bind = $mod, code:59, exec, ${pkgs.brightnessctl}/bin/brightnessctl s 5%-
-      bind = $mod SHIFT, t, exec, ${config.services.swaync.package}/bin/swaync-client -t
 
 
       bind = $mod SHIFT, q, killactive

hmModules/shell/default.nix

@@ -4,6 +4,7 @@
   pkgs,
   age,
   fleetFlake,
+  hostname,
   ...
 }: {
   programs.bat.enable = true;
@@ -96,24 +97,41 @@
   #   '';
   # };
 
-  xdg.configFile."dracula-theme" = {
-    target = "fish/themes/dracula.theme";
-    source = let
-      theme = pkgs.fetchFromGitHub {
-        owner = "dracula";
-        repo = "fish";
-        rev = "269cd7d76d5104fdc2721db7b8848f6224bdf554";
-        hash = "sha256-Hyq4EfSmWmxwCYhp3O8agr7VWFAflcUe8BUKh50fNfY=";
-      };
-    in "${theme}/themes/Dracula\ Official.theme";
+  xdg.configFile = {
+    "dracula-theme" = {
+      target = "fish/themes/dracula.theme";
+      source = let
+        theme = pkgs.fetchFromGitHub {
+          owner = "dracula";
+          repo = "fish";
+          rev = "269cd7d76d5104fdc2721db7b8848f6224bdf554";
+          hash = "sha256-Hyq4EfSmWmxwCYhp3O8agr7VWFAflcUe8BUKh50fNfY=";
+        };
+      in "${theme}/themes/Dracula\ Official.theme";
+    };
+    "catppuccin-theme" = {
+      target = "fish/themes/Catppuccin\ Mocha.theme";
+      source = let
+        theme = pkgs.fetchFromGitHub {
+          owner = "catppuccin";
+          repo = "fish";
+          rev = "a3b9eb5eaf2171ba1359fe98f20d226c016568cf";
+          hash = "sha256-shQxlyoauXJACoZWtRUbRMxmm10R8vOigXwjxBhG8ng=";
+        };
+      in "${theme}/themes/Catppuccin\ Mocha.theme";
+    };
   };
 
   programs.fish = {
     enable = true;
-    shellInit = ''
-      fish_config theme choose "dracula"
-      export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
-    '';
+    shellInit =
+      ''
+        fish_config theme choose "dracula"
+        fish_config theme choose "Catppuccin Mocha"
+      ''
+      + lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
+        export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
+      '';
     shellAliases = {
       "cat" = "bat";
     };
@@ -193,22 +211,25 @@
   #   '';
   # };
 
-  home.packages = with pkgs; [
-    thefuck
-    htop-vim
-    bottom
-    dig.dnsutils
-    lsof
-    zsh-completions
-    nix-zsh-completions
-    comma
-    # carapace # used by nushell
-    nil # TODO probably not best place
-    fleetFlake.inputs.nixd.packages.${pkgs.system}.nixd # TODO probably not best place
-    terraform-lsp # TODO probably not best place
-    python3Packages.jedi-language-server # TODO probably not best place
-    nodePackages.typescript-language-server # TODO probably not best place
-    cntr # TODO probably not best place
-    # nom # FIXME disable on aarch64-linux, breaks everything :(
-  ];
+  home.packages = with pkgs;
+    [
+      thefuck
+      htop-vim
+      bottom
+      dig.dnsutils
+      lsof
+      zsh-completions
+      nix-zsh-completions
+      comma
+      carapace # used by nushell
+    ]
+    ++ (lib.optionals (builtins.elem hostname ["kirk" "picard"]) [
+      nil # TODO probably not best place
+      (fleetFlake.inputs.nixd.packages.${pkgs.system}.nixd) # TODO probably not best place
+      terraform-lsp # TODO probably not best place
+      python3Packages.jedi-language-server # TODO probably not best place
+      nodePackages.typescript-language-server # TODO probably not best place
+      cntr # TODO probably not best place
+      nom # FIXME disable on aarch64-linux, breaks everything :(
+    ]);
 }

hmModules/wezterm/default.nix

@@ -1,9 +1,70 @@
-{...}: {
+{
+  pkgs,
+  hostname,
+  ...
+}: {
   programs.wezterm = {
     enable = true;
+    package =
+      if hostname == "pircard"
+      then
+        (pkgs.wezterm.overrideAttrs (old: rec {
+          pname = "wezterm";
+          version = "20240406-cce0706";
+          src = pkgs.fetchFromGitHub {
+            owner = "wez";
+            repo = "${pname}";
+            rev = "cce0706b1f2a9e2d1f02c57f2d1cd367c91df1ae";
+            fetchSubmodules = true;
+            hash = "sha256-BBPxidOpFrw/tIRTqMSREyJF3QEWOwlIoVRT3FD62sQ=";
+          };
+          cargoDeps = pkgs.rustPlatform.importCargoLock {
+            lockFile = "${src}/Cargo.lock";
+            outputHashes = {
+              "xcb-imdkit-0.3.0" = "sha256-fTpJ6uNhjmCWv7dZqVgYuS2Uic36XNYTbqlaly5QBjI=";
+            };
+          };
+          patches =
+            (old.patches or [])
+            ++ [
+              (pkgs.fetchpatch {
+                # fix(wayland): ensure repaint event is sent in show
+                url = "https://patch-diff.githubusercontent.com/raw/wez/wezterm/pull/5264.patch";
+                hash = "sha256-c+frVaBEL0h3PJvNu3AW2iap+uUXBY8olbm7Wsxuh4Q=";
+              })
+              (pkgs.writeText
+                "wezterm-remove_capabilities.patch"
+                ''
+                  diff --git a/window/src/os/wayland/seat.rs b/window/src/os/wayland/seat.rs
+                  index 3798f4259..e91591130 100644
+                  --- a/window/src/os/wayland/seat.rs
+                  +++ b/window/src/os/wayland/seat.rs
+                  @@ -65,9 +65,15 @@ impl SeatHandler for WaylandState {
+                           _conn: &Connection,
+                           _qh: &QueueHandle<Self>,
+                           _seat: WlSeat,
+                  -        _capability: smithay_client_toolkit::seat::Capability,
+                  +        capability: smithay_client_toolkit::seat::Capability,
+                       ) {
+                  -        todo!()
+                  +        if capability == Capability::Keyboard && self.keyboard.is_some() {
+                  +            self.keyboard.take().unwrap().release();
+                  +        }
+                  +
+                  +        if capability == Capability::Pointer && self.pointer.is_some() {
+                  +            self.pointer = None;
+                  +        }
+                       }
+
+                       fn remove_seat(&mut self, _conn: &Connection, _qh: &QueueHandle<Self>, _seat: WlSeat) {
+                '')
+            ];
+        }))
+      else pkgs.wezterm;
+
     extraConfig = ''
       return {
-        enable_wayland = false; -- https://github.com/wez/wezterm/issues/4483
+        -- enable_wayland = false; -- https://github.com/wez/wezterm/issues/4483
         font = wezterm.font_with_fallback {
           {
             family = 'Iosevka Comfy',
@@ -14,7 +75,7 @@
         };
         font_size = 13;
         allow_square_glyphs_to_overflow_width = "Always";
-        color_scheme = "Dracula (Official)";
+        color_scheme = "Catppuccin Mocha";
         window_background_opacity = 1;
         enable_tab_bar = false;
         hide_mouse_cursor_when_typing = false;