diff --git a/home/apps/wezterm.nix b/home/apps/wezterm.nix index 26551dc..703734d 100644 --- a/home/apps/wezterm.nix +++ b/home/apps/wezterm.nix @@ -4,16 +4,15 @@ ... }: { # Sleep well my prince, one day you will be enabled - # programs.wezterm = { # enable = true; # package = pkgs.nur.repos.nekowinston.wezterm-nightly; # }; # xdg.configFile."wezterm/wezterm.lua".enable = false; - # xdg.configFile."wezterm" = { - # source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/apps/wezterm"; - # recursive = true; - # }; - # home.file.".terminfo/w/wezterm".source = wezterm/wezterm_terminfo; + xdg.configFile."wezterm" = { + source = config.lib.file.mkOutOfStoreSymlink "${flakePath}/home/apps/wezterm"; + recursive = true; + }; + home.file.".terminfo/w/wezterm".source = wezterm/wezterm_terminfo; } diff --git a/home/apps/wezterm/.gitignore b/home/apps/wezterm/.gitignore deleted file mode 100644 index f60711a..0000000 --- a/home/apps/wezterm/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -wezterm-bar -wezterm_terminfo -wezterm.sh \ No newline at end of file diff --git a/home/apps/wezterm/wezterm.lua b/home/apps/wezterm/wezterm.lua index 9247916..0cacdd5 100644 --- a/home/apps/wezterm/wezterm.lua +++ b/home/apps/wezterm/wezterm.lua @@ -150,7 +150,7 @@ wezterm.plugin.require("https://github.com/catppuccin/wezterm").apply_to_config( sync_flavors = { light = "latte", dark = "mocha" }, }) -require("wezterm-bar.plugin").apply_to_config(c, { +wezterm.plugin.require("https://github.com/sgoudham/wezterm-bar").apply_to_config(c, { indicator = { leader = { enabled = false }, }, diff --git a/home/apps/wezterm/wezterm_terminfo b/home/apps/wezterm/wezterm_terminfo new file mode 100644 index 0000000..f7a4af4 --- /dev/null +++ b/home/apps/wezterm/wezterm_terminfo @@ -0,0 +1,89 @@ +# This is Wez's term definition for wezterm. +# It was reconstructed via infocmp from file: /lib/terminfo/x/xterm-256color +# and then has some additions in the top few lines (until the line starting +# with am). +# Tc: true color boolean for tmux +# sitm/ritm: italics +# Ms modifies the selection/clipboard. Its parameters are +# p1 = the storage unit (clipboard, selection or cut buffer) +# p2 = the base64-encoded clipboard content. +# +# Ss is used to set the cursor style as described by the DECSCUSR +# function to a block or underline. +# Se resets the cursor style to the terminal power-on default. +# Smulx defines kitty style underline escape sequence support +# +# hs, dsl, fsl, tsl are used by nvim to amend the "status line". +# These are not normally present for xterm and have assumed values +# when TERM==xterm. When using this terminfo file that assumption is not +# true and that functionality is broken. +# We follow the foot's terminfo settings for these, based on +# https://codeberg.org/dnkl/foot/pulls/243/files +# although we use OSC 0 for the title rather than OSC 2. +# https://github.com/neovim/neovim/issues/20706 +# https://github.com/wez/wezterm/issues/2635 +wezterm|Wez's terminal emulator, + Tc, + hs, + sitm=\E[3m, ritm=\E[23m, + Cr=\E]112\007, Cs=\E]12;%p1%s\007, Ms=\E]52;%p1%s;%p2%s\007, Se=\E[2\sq, + Ss=\E[%p1%d\sq, + Smulx=\E[4:%p1%dm, + Sync=\E[?2026%?%p1%{1}%-%tl%eh, + Setulc=\E[58:2::%p1%{65536}%/%d:%p1%{256}%/%{255}%&%d:%p1%{255}%&%d%;m, + Smol=\E[53m, + am, bce, ccc, km, mc5i, mir, msgr, npc, xenl, + colors#0x100, cols#80, it#8, lines#24, pairs#0x7fff, + acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~, + bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l, + clear=\E[H\E[2J, cnorm=\E[?12l\E[?25h, cr=\r, + csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H, + cud=\E[%p1%dB, cud1=\n, cuf=\E[%p1%dC, cuf1=\E[C, + cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A, + cvvis=\E[?12;25h, dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, + dl=\E[%p1%dM, dl1=\E[M, dsl=\E]2;\E\\, + ech=\E[%p1%dX, ed=\E[J, el=\E[K, + el1=\E[1K, flash=\E[?5h$<100/>\E[?5l, fsl=\E\\, home=\E[H, + hpa=\E[%i%p1%dG, ht=^I, hts=\EH, ich=\E[%p1%d@, + il=\E[%p1%dL, il1=\E[L, ind=\n, indn=\E[%p1%dS, + initc=\E]4;%p1%d;rgb\:%p2%{255}%*%{1000}%/%2.2X/%p3%{255}%*%{1000}%/%2.2X/%p4%{255}%*%{1000}%/%2.2X\E\\, + invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>, kDC=\E[3;2~, + kEND=\E[1;2F, kHOM=\E[1;2H, kIC=\E[2;2~, kLFT=\E[1;2D, + kNXT=\E[6;2~, kPRV=\E[5;2~, kRIT=\E[1;2C, kb2=\EOE, kbs=^?, + kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, + kdch1=\E[3~, kend=\EOF, kent=\EOM, kf1=\EOP, kf10=\E[21~, + kf11=\E[23~, kf12=\E[24~, kf13=\E[1;2P, kf14=\E[1;2Q, + kf15=\E[1;2R, kf16=\E[1;2S, kf17=\E[15;2~, kf18=\E[17;2~, + kf19=\E[18;2~, kf2=\EOQ, kf20=\E[19;2~, kf21=\E[20;2~, + kf22=\E[21;2~, kf23=\E[23;2~, kf24=\E[24;2~, + kf25=\E[1;5P, kf26=\E[1;5Q, kf27=\E[1;5R, kf28=\E[1;5S, + kf29=\E[15;5~, kf3=\EOR, kf30=\E[17;5~, kf31=\E[18;5~, + kf32=\E[19;5~, kf33=\E[20;5~, kf34=\E[21;5~, + kf35=\E[23;5~, kf36=\E[24;5~, kf37=\E[1;6P, kf38=\E[1;6Q, + kf39=\E[1;6R, kf4=\EOS, kf40=\E[1;6S, kf41=\E[15;6~, + kf42=\E[17;6~, kf43=\E[18;6~, kf44=\E[19;6~, + kf45=\E[20;6~, kf46=\E[21;6~, kf47=\E[23;6~, + kf48=\E[24;6~, kf49=\E[1;3P, kf5=\E[15~, kf50=\E[1;3Q, + kf51=\E[1;3R, kf52=\E[1;3S, kf53=\E[15;3~, kf54=\E[17;3~, + kf55=\E[18;3~, kf56=\E[19;3~, kf57=\E[20;3~, + kf58=\E[21;3~, kf59=\E[23;3~, kf6=\E[17~, kf60=\E[24;3~, + kf61=\E[1;4P, kf62=\E[1;4Q, kf63=\E[1;4R, kf7=\E[18~, + kf8=\E[19~, kf9=\E[20~, khome=\EOH, kich1=\E[2~, + kind=\E[1;2B, knp=\E[6~, kpp=\E[5~, + kri=\E[1;2A, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, meml=\El, + memu=\Em, oc=\E]104\007, op=\E[39;49m, rc=\E8, + rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m, ri=\EM, + rin=\E[%p1%dT, ritm=\E[23m, rmacs=\E(B, rmam=\E[?7l, + rmcup=\E[?1049l\E[23;0;0t, rmir=\E[4l, rmkx=\E[?1l\E>, + rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m, rmxx=\E[29m, + rs1=\Ec\E]104\007, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, + setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m, + setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m, + sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m, + sgr0=\E(B\E[m, sitm=\E[3m, smacs=\E(0, smam=\E[?7h, + smcup=\E[?1049h\E[22;0;0t, smir=\E[4h, smkx=\E[?1h\E=, + smm=\E[?1034h, smso=\E[7m, smul=\E[4m, smxx=\E[9m, + tbc=\E[3g, tsl=\E]0;, u6=\E[%i%d;%dR, u7=\E[6n, u8=\E[?%[;0123456789]c, + u9=\E[c, vpa=\E[%i%p1%dd, XM=\E[?1003;1006%?%p1%{1}%=%th%el%;, + kmous=\E[<, XM=\E[?1006;1000%?%p1%{1}%=%th%el%;, + xm=\E[<%i%p3%d;%p1%d;%p2%d;%?%p4%tM%em%;, diff --git a/home/default.nix b/home/default.nix index a2f8e6a..79c8897 100644 --- a/home/default.nix +++ b/home/default.nix @@ -5,7 +5,7 @@ ... }: { imports = [ - # ./apps/wezterm.nix + ./apps/wezterm.nix # ./apps/zsh.nix ./apps/fonts.nix ./apps/git.nix