From 41b3b9cf143227ea7989a4fcfee1c7b5187e05cd Mon Sep 17 00:00:00 2001 From: kat witch Date: Wed, 17 Mar 2021 05:43:35 +0000 Subject: [PATCH] weechat, terminfo and tmux --- config/hosts/athame/configuration.nix | 1 - config/profiles/kat/home/default.nix | 3 ++- config/profiles/kat/home/kitty.nix | 5 +++++ config/profiles/kat/home/packages.nix | 2 +- config/profiles/kat/home/tmux.nix | 4 ++++ config/profiles/kat/home/zsh/default.nix | 1 - pkgs/default.nix | 11 +++++++++++ 7 files changed, 23 insertions(+), 4 deletions(-) create mode 100644 config/profiles/kat/home/kitty.nix diff --git a/config/hosts/athame/configuration.nix b/config/hosts/athame/configuration.nix index c2f297ab..2b83c763 100644 --- a/config/hosts/athame/configuration.nix +++ b/config/hosts/athame/configuration.nix @@ -17,7 +17,6 @@ ../../services/taskserver.nix ../../services/murmur.nix ../../services/znc.nix - ../../services/weechat.nix ../../services/matrix.nix ]; diff --git a/config/profiles/kat/home/default.nix b/config/profiles/kat/home/default.nix index 3437347b..da615e9e 100644 --- a/config/profiles/kat/home/default.nix +++ b/config/profiles/kat/home/default.nix @@ -5,10 +5,11 @@ ./zsh ./vim ./git.nix + ./kitty.nix ./tmux.nix ./secrets.nix ./xdg.nix ./ssh.nix ./packages.nix - ]; # ./emacs bye emacs lol + ]; } diff --git a/config/profiles/kat/home/kitty.nix b/config/profiles/kat/home/kitty.nix new file mode 100644 index 00000000..0e8888a7 --- /dev/null +++ b/config/profiles/kat/home/kitty.nix @@ -0,0 +1,5 @@ +{ config, pkgs, ... }: + +{ + home.sessionVariables.TERMINFO_DIRS = "${pkgs.kitty.terminfo.outPath}/share/terminfo"; +} diff --git a/config/profiles/kat/home/packages.nix b/config/profiles/kat/home/packages.nix index 128cae6e..ffe5894b 100644 --- a/config/profiles/kat/home/packages.nix +++ b/config/profiles/kat/home/packages.nix @@ -2,6 +2,6 @@ { config = lib.mkIf config.deploy.profile.kat { - home.packages = with pkgs; [ kitty.terminfo ]; + home.packages = with pkgs; [ kitty.terminfo weechat ]; }; } diff --git a/config/profiles/kat/home/tmux.nix b/config/profiles/kat/home/tmux.nix index 50dcd69f..d70c4cfb 100644 --- a/config/profiles/kat/home/tmux.nix +++ b/config/profiles/kat/home/tmux.nix @@ -14,6 +14,10 @@ set -g base-index 1 setw -g pane-base-index 1 + # proper title handling + set -g set-titles on + set -g set-titles-string "#T" + # modes setw -g clock-mode-colour colour5 setw -g mode-style 'fg=colour1 bg=colour18 bold' diff --git a/config/profiles/kat/home/zsh/default.nix b/config/profiles/kat/home/zsh/default.nix index 9b757248..bcb37509 100644 --- a/config/profiles/kat/home/zsh/default.nix +++ b/config/profiles/kat/home/zsh/default.nix @@ -14,7 +14,6 @@ }; initExtra = '' ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=3,bold" - source ${./zshrc-title} ''; plugins = [{ name = "zsh-autosuggestions"; diff --git a/pkgs/default.nix b/pkgs/default.nix index f5059034..7c958cb6 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -15,6 +15,17 @@ let clockSupport = true; }; + weechat = arc.pkgs.wrapWeechat arc.pkgs.weechat-unwrapped { + configure = { availablePlugins, ... }: { + scripts = [ arc.pkgs.weechatScripts.weechat-matrix ]; + plugins = [ + availablePlugins.perl + (availablePlugins.python.withPackages + (ps: [ ps.potr ps.weechat-matrix ])) + ]; + }; + }; + notmuch = super.callPackage ./notmuch { inherit (super) notmuch; }; arc = import sources.arc-nixexprs { pkgs = super; };