From 755ba0ca57f694b49fa94be72b2c108f5edba8ce Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Mon, 27 Jan 2025 17:26:05 -0500 Subject: [PATCH] Remove tmux --- default.nix | 1 - home/default.nix | 64 +------------------------------- machines/zelus/configuration.nix | 6 --- packages.nix | 1 - 4 files changed, 2 insertions(+), 70 deletions(-) diff --git a/default.nix b/default.nix index f41d474..aa87fa5 100644 --- a/default.nix +++ b/default.nix @@ -8,7 +8,6 @@ in src = ./.; hooks = { shellcheck.enable = true; - nixfmt.enable = true; }; }; } diff --git a/home/default.nix b/home/default.nix index 3ebe051..e88beb1 100644 --- a/home/default.nix +++ b/home/default.nix @@ -18,7 +18,6 @@ in base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml"; targets = { alacritty.enable = true; - tmux.enable = true; vscode.enable = false; # overrides synced settings }; @@ -145,6 +144,7 @@ in envExtra = '' export PAGER=less export EDITOR=vim + export DOCKER_CLI_HINTS=false export PATH=$PATH:~/.cargo/bin export PATH=$PATH:~/.local/bin @@ -213,64 +213,6 @@ in enable = true; }; - tmux = { - enable = true; - clock24 = true; - terminal = "tmux-256color"; - customPaneNavigationAndResize = true; - plugins = with pkgs.tmuxPlugins; [ - { - plugin = sessionist; - extraConfig = "set -g @plugin 'tmux-plugins/tmux-sessionist'"; - } - { - plugin = sensible; - extraConfig = "set -g @plugin 'tmux-plugins/tmux-sensible'"; - } - { - plugin = yank; - extraConfig = "set -g @plugin 'tmux-plugins/tmux-yank'"; - } - { - plugin = resurrect; - extraConfig = '' - set -g @plugin 'tmux-plugins/tmux-resurrect' - ''; - } - { - plugin = continuum; - extraConfig = '' - set -g @plugin 'tmux-plugins/tmux-continuum' - set -g @continuum-restore 'on' - ''; - } - { - plugin = open; - extraConfig = '' - set -g @plugin 'tmux-plugins/tmux-open' - ''; - } - ]; - extraConfig = '' - set-window-option -g automatic-rename on - set-window-option -g mode-keys vi - - bind-key -T copy-mode-vi v send -X begin-selection - bind-key -T copy-mode-vi V send -X select-line - unbind-key -T copy-mode-vi MouseDragEnd1Pane - - set-option -g set-titles on - set -g mouse on - set -g default-command "zsh" - set -g status-left-length 30 - set -g status-right-length 150 - set -g xterm-keys on - set -g monitor-activity on - set -g status-right '#(gitmux #{pane_current_path})' - set -g @yank_action 'copy-pipe' - ''; - }; - fzf = { enable = true; }; @@ -473,9 +415,7 @@ in ms-kubernetes-tools.vscode-kubernetes-tools redhat.vscode-yaml ] - ++ lib.optionals stdenv.isLinux [ - ms-python.python - ]; + ++ lib.optionals stdenv.isLinux [ ms-python.python ]; }; firefox = { diff --git a/machines/zelus/configuration.nix b/machines/zelus/configuration.nix index 3d588c4..439480c 100644 --- a/machines/zelus/configuration.nix +++ b/machines/zelus/configuration.nix @@ -1,7 +1,4 @@ { pkgs, ... }: -let - checkBrew = "command -v brew > /dev/null"; -in { nixpkgs = { config = { @@ -29,9 +26,6 @@ in users.users."dave.gallant".home = "/Users/dave.gallant"; environment = { - extraInit = '' - ${checkBrew} || >&2 echo "brew is not installed (install it via https://brew.sh)" - ''; variables = { LANG = "en_US.UTF-8"; }; diff --git a/packages.nix b/packages.nix index e9e4ecc..f2419c2 100644 --- a/packages.nix +++ b/packages.nix @@ -34,7 +34,6 @@ in shellcheck shfmt tldr - tmux-sessionizer atuin github-cli