From e49f497045f24c70ebcca94cd0ae003fb220bacb Mon Sep 17 00:00:00 2001 From: yukkop Date: Fri, 24 Jul 2026 15:21:11 +0400 Subject: [PATCH] fix: aga --- darwin/system/yukkop/yukkop.nix | 33 ++++------------------------ home/module/program/tmux.nix | 30 +++++++++++++++++++++++++ nixos/module/hectic/program/tmux.nix | 31 +------------------------- 3 files changed, 35 insertions(+), 59 deletions(-) create mode 100644 home/module/program/tmux.nix diff --git a/darwin/system/yukkop/yukkop.nix b/darwin/system/yukkop/yukkop.nix index e806ff81..2e402b59 100644 --- a/darwin/system/yukkop/yukkop.nix +++ b/darwin/system/yukkop/yukkop.nix @@ -1,4 +1,5 @@ { + flake, pkgs, lib, ... @@ -42,6 +43,9 @@ in { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.backupFileExtension = "backup"; + home-manager.sharedModules = [ + (flake + "/home/module/program/tmux.nix") + ]; home-manager.users.${name} = { home.stateVersion = "25.11"; @@ -84,35 +88,6 @@ in { ''; }; - programs.tmux = { - enable = true; - plugins = with pkgs.tmuxPlugins; [ resurrect continuum ]; - keyMode = "vi"; - escapeTime = 500; - historyLimit = 50000; - newSession = true; - extraConfig = '' - # resurrect - set -g @resurrect-strategy-vim 'session' - set -g @resurrect-strategy-nvim 'session' - set -g @resurrect-capture-pane-contents 'on' - - resurrect_dir="$HOME/.tmux/resurrect" - set -g @resurrect-dir $resurrect_dir - set -g @resurrect-hook-post-save-all 'target=$(readlink -f $resurrect_dir/last); sed "s| --cmd .*-vim-pack-dir||g; s|/etc/profiles/per-user/$USER/bin/||g; s|/home/$USER/.nix-profile/bin/||g" $target | sponge $target' - - # continuum - set -g @continuum-restore 'on' - set -g @continuum-boot 'on' - set -g @continuum-save-interval '10' - - bind-key -T copy-mode-vi v send-keys -X begin-selection - bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle - - bind-key O select-pane -t :.- - ''; - }; - xdg.configFile."aerospace/aerospace.toml".text = '' start-at-login = false diff --git a/home/module/program/tmux.nix b/home/module/program/tmux.nix new file mode 100644 index 00000000..810e4d76 --- /dev/null +++ b/home/module/program/tmux.nix @@ -0,0 +1,30 @@ +{ pkgs, ... }: { + programs.tmux = { + enable = true; + plugins = with pkgs.tmuxPlugins; [ resurrect continuum ]; + keyMode = "vi"; + escapeTime = 500; + historyLimit = 50000; + newSession = true; + extraConfig = '' + # resurrect + set -g @resurrect-strategy-vim 'session' + set -g @resurrect-strategy-nvim 'session' + set -g @resurrect-capture-pane-contents 'on' + + resurrect_dir="$HOME/.tmux/resurrect" + set -g @resurrect-dir $resurrect_dir + set -g @resurrect-hook-post-save-all 'target=$(readlink -f $resurrect_dir/last); sed "s| --cmd .*-vim-pack-dir||g; s|/etc/profiles/per-user/$USER/bin/||g; s|/home/$USER/.nix-profile/bin/||g" $target | sponge $target' + + # continuum + set -g @continuum-restore 'on' + set -g @continuum-boot 'on' + set -g @continuum-save-interval '10' + + bind-key -T copy-mode-vi v send-keys -X begin-selection + bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle + + bind-key O select-pane -t :.- + ''; + }; +} diff --git a/nixos/module/hectic/program/tmux.nix b/nixos/module/hectic/program/tmux.nix index e26d7d85..1685ea98 100644 --- a/nixos/module/hectic/program/tmux.nix +++ b/nixos/module/hectic/program/tmux.nix @@ -25,36 +25,7 @@ in { programs.bash.shellAliases.tmux = "tmux a"; home-manager.sharedModules = [ - { - programs.tmux = { - enable = true; - plugins = with pkgs.tmuxPlugins; [ resurrect continuum ]; - keyMode = "vi"; - escapeTime = 500; - historyLimit = 50000; - newSession = true; - extraConfig = '' - # resurrect - set -g @resurrect-strategy-vim 'session' - set -g @resurrect-strategy-nvim 'session' - set -g @resurrect-capture-pane-contents 'on' - - resurrect_dir="$HOME/.tmux/resurrect" - set -g @resurrect-dir $resurrect_dir - set -g @resurrect-hook-post-save-all 'target=$(readlink -f $resurrect_dir/last); sed "s| --cmd .*-vim-pack-dir||g; s|/etc/profiles/per-user/$USER/bin/||g; s|/home/$USER/.nix-profile/bin/||g" $target | sponge $target' - - # continuum - set -g @continuum-restore 'on' - set -g @continuum-boot 'on' - set -g @continuum-save-interval '10' - - bind-key -T copy-mode-vi v send-keys -X begin-selection - bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle - - bind-key O select-pane -t :.- - ''; - }; - } + (flake + "/home/module/program/tmux.nix") ]; home-manager.users.root.home.stateVersion = lib.mkDefault "25.05";