diff --git a/flake.lock b/flake.lock index 4a486c7..f0aeead 100644 --- a/flake.lock +++ b/flake.lock @@ -129,11 +129,11 @@ ] }, "locked": { - "lastModified": 1743360001, - "narHash": "sha256-HtpS/ZdgWXw0y+aFdORcX5RuBGTyz3WskThspNR70SM=", + "lastModified": 1743648554, + "narHash": "sha256-23JFd+zd2GamTTdnGuFVeIg8x8C3hLpQJRh/PGTORzo=", "owner": "nix-community", "repo": "home-manager", - "rev": "b6fd653ef8fbeccfd4958650757e91767a65506d", + "rev": "107352dde4ff3c01cb5a0b3fe17f5beef37215bc", "type": "github" }, "original": { @@ -197,11 +197,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1743315132, - "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "type": "github" }, "original": { @@ -213,11 +213,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1743315132, - "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", + "lastModified": 1743583204, + "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "52faf482a3889b7619003c0daec593a1912fddc1", + "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "type": "github" }, "original": { @@ -250,11 +250,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1743416833, - "narHash": "sha256-JBz6KWbF4MFgQVpwrq7FaUsPxDN/wQEbUAUHmm1Q494=", + "lastModified": 1743672862, + "narHash": "sha256-N/ld+hwgR0Cm9WDx4y9oCaoKkBM/cpPsvrv3dxB7eCc=", "owner": "nix-community", "repo": "NUR", - "rev": "a3f52fa7fae676916064a4b32cf306f15a79b408", + "rev": "caced35d934cd8e39136d49e003afadd9cbfeb5d", "type": "github" }, "original": { diff --git a/home/tmux/default.nix b/home/tmux/default.nix index edc4bb1..62cdc58 100644 --- a/home/tmux/default.nix +++ b/home/tmux/default.nix @@ -2,7 +2,7 @@ { programs.tmux = { shell = "${pkgs.zsh}/bin/zsh"; - terminal = "tmux-256color"; + terminal = "screen-256color"; enable = true; clock24 = true; shortcut = "a"; @@ -19,25 +19,27 @@ extraConfig = '' set -ogq @catppuccin_flavor "mocha" set -ogq @catppuccin_window_status_style "rounded" - set -ogq @catppuccin_window_current_number_color "#1F2430" - set -ogq @catppuccin_window_current_text_color "#0F7FCF" - set -ogq @catppuccin_window_number_color "#181825" - set -ogq @catppuccin_window_text_color "#5a5d70" - set -ogq @catppuccin_window_current_text " #{b:pane_current_path}" - set -ogq @catppuccin_window_text " #{b:pane_current_path}" set -ogq @catppuccin_pane_border_style "fg=#181825" set -ogq @catppuccin_pane_active_border_style "fg=#023269" - set -ogq @catppuccin_directory_color "#0F7FCF" - set -ogq @catppuccin_date_time_text "%Y-%m-%d %H:%M:%S" set -ogq @catppuccin_menu_selected_style "fg=#{@thm_gray},bg=#0F7FCF" - set -ogq @catppuccin_status_background "default" + set -g @catppuccin_window_current_number_color "#0F7FCF" + set -g @catppuccin_window_current_text_color "#1F2430" + set -g @catppuccin_window_text_color "#1F2430" + set -g @catppuccin_window_number_color "#707072" set -ogq status-right "#{E:@catppuccin_status_directory}" + + # Make the status line pretty and add some modules + set -g status-right-length 100 + set -g status-left-length 100 + set -g status-left "" + set -g status-right "#{E:@catppuccin_status_application}" + set -ag status-right "#{E:@catppuccin_status_session}" ''; } ]; extraConfig = '' - set -ag terminal-overrides ",xterm-256color:RGB" + set -ag terminal-overrides ",screen-256color:Tc" set-window-option -g mode-keys vi bind-key -T copy-mode-vi 'v' send -X begin-selection bind-key -T copy-mode-vi 'y' send -X copy-selection @@ -48,9 +50,14 @@ unbind '"' unbind % + # Renumber windows starting from 1 set -g base-index 1 setw -g pane-base-index 1 set-option -g renumber-windows on + + # Transparent bar + set -g status-bg default + set -g status-style "bg=default" ''; }; }