wezterm: use flake cuz NixOS/nixpkgs#336069

KiaraGrouwstra · Aug 31, 2024 · 6b285e2 · 6b285e2
1 parent ebafcc0
commit 6b285e2
Show file tree

Hide file tree

Showing 6 changed files with 167 additions and 3 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -111,6 +111,11 @@
       url = "github:gilcu3/hullcaster";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    # https://github.com/NixOS/nixpkgs/issues/336069
+    wezterm = {
+      url = "github:wez/wezterm/main?dir=nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {

diff --git a/home-manager/kiara/commands.nix b/home-manager/kiara/commands.nix
@@ -125,7 +125,8 @@ let
       })
   );
   commands = let
-    inherit (pkgs) wezterm rofi-systemd;
+    inherit (pkgs) rofi-systemd;
+    wezterm = config.programs.wezterm.package;
   in
     lib.dryCommands binaries
     //

diff --git a/home-manager/kiara/features/tools/default.nix b/home-manager/kiara/features/tools/default.nix
@@ -49,7 +49,6 @@
         ## terminals
 
         kitty
-        wezterm
         ## command-line utilities
 
         xdg-terminal-exec

diff --git a/home-manager/kiara/wezterm.nix b/home-manager/kiara/wezterm.nix
@@ -1,9 +1,15 @@
-{config, ...}: {
+{
+  config,
+  inputs,
+  system,
+  ...
+}: {
   home.persistence."/persist/home/kiara".directories = [
     ".config/wezterm"
   ];
   programs.wezterm = {
     enable = true;
+    package = inputs.wezterm.packages.${system}.default;
     extraConfig = let
       inherit (config.keyboard.vi) j k;
     in

diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -10,6 +10,7 @@
     "nix-search"
     "noshell"
     # "hullcaster"  # https://codeberg.org/kiara/cfg/issues/361
+    "wezterm"
   ]
   //
   (let
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,7 +49,6 @@ @@
             ## terminals
             kitty
-            wezterm
             ## command-line utilities
             xdg-terminal-exec
@@ Expand Down @@