diff --git a/home/.config/tmuxinator/Dotfiles.yml b/home/.config/tmuxinator/Dashboard.yml similarity index 71% rename from home/.config/tmuxinator/Dotfiles.yml rename to home/.config/tmuxinator/Dashboard.yml index 789d01f..dc04bab 100644 --- a/home/.config/tmuxinator/Dotfiles.yml +++ b/home/.config/tmuxinator/Dashboard.yml @@ -1,12 +1,12 @@ -# /home/th3r00t/.config/tmuxinator/Dotfiles.yml +# /home/th3r00t/.config/tmuxinator/Dashboard.yml -name: Nixos -root: /etc/nixos/ +name: Dashboard +root: ~/ # Optional tmux socket # socket_name: foo # Runs on project start, always -on_project_start: export BROWSER=w3m +# on_project_start: export BROWSER=qutebrowser # Run on project start, the first time # on_project_first_start: command @@ -21,7 +21,7 @@ on_project_start: export BROWSER=w3m # on_project_stop: command # Specifies (by name or index) which window will be selected on project startup. If not set, the first window is used. -startup_window: Editor +startup_window: Dash # Specifies (by index) which pane of the specified window will be selected on project startup. If not set, the first pane is used. # startup_pane: 1 @@ -30,7 +30,13 @@ startup_window: Editor # attach: false enable_pane_titles: true windows: - - Git: - - lazygit - - Editor: - - nvim + - Dash: + - clear;fastfetch;fortune|cowsay|lolcat + - IRC: + - irssi + - Email: + - mbsync -a;neomutt + - Music: + - musikcube + - Podcasts: + - castero diff --git a/home/.config/tmuxinator/Development.yml b/home/.config/tmuxinator/Development.yml index 15c7988..504f278 100644 --- a/home/.config/tmuxinator/Development.yml +++ b/home/.config/tmuxinator/Development.yml @@ -46,8 +46,10 @@ startup_window: Editor enable_pane_titles: true windows: - Editor: + layout: fce1,255x68,0,0[255x45,0,0,24,255x22,0,46,27] panes: - nvim + - ranger . - Debugger: panes: - clear;fastfetch;misfortune|cowsay|lolcat diff --git a/home/.config/tmuxinator/NVIMConfig.yml b/home/.config/tmuxinator/NVIMConfig.yml new file mode 100644 index 0000000..84369b5 --- /dev/null +++ b/home/.config/tmuxinator/NVIMConfig.yml @@ -0,0 +1,22 @@ +# /home/th3r00t/.config/tmuxinator/tmuxConfig.yml + +name: NVIMConfig +root: ~/Projects/nvim-config + +# Optional tmux socket +# socket_name: foo + +# Specifies (by name or index) which window will be selected on project startup. If not set, the first window is used. +startup_window: Git + +# Specifies (by index) which pane of the specified window will be selected on project startup. If not set, the first pane is used. +# startup_pane: 1 + +# Controls whether the tmux session should be attached to automatically. Defaults to true. +# attach: false +enable_pane_titles: true +windows: + - Git: + - lazygit + - nvim: + - nvim diff --git a/home/.config/tmuxinator/Nixos.yml b/home/.config/tmuxinator/Nixos.yml index 701da09..2b82c15 100644 --- a/home/.config/tmuxinator/Nixos.yml +++ b/home/.config/tmuxinator/Nixos.yml @@ -1,12 +1,12 @@ -# /home/th3r00t/.config/tmuxinator/Dashboard.yml +# /home/th3r00t/.config/tmuxinator/Dotfiles.yml -name: Dashboard -root: ~/ +name: Nixos +root: /etc/nixos/ # Optional tmux socket # socket_name: foo # Runs on project start, always -# on_project_start: export BROWSER=qutebrowser +on_project_start: export BROWSER=w3m # Run on project start, the first time # on_project_first_start: command @@ -21,7 +21,7 @@ root: ~/ # on_project_stop: command # Specifies (by name or index) which window will be selected on project startup. If not set, the first window is used. -startup_window: Dash +startup_window: Git # Specifies (by index) which pane of the specified window will be selected on project startup. If not set, the first pane is used. # startup_pane: 1 @@ -30,13 +30,7 @@ startup_window: Dash # attach: false enable_pane_titles: true windows: - - Dash: - - clear;fastfetch;misfortune|cowsay|lolcat - - IRC: - - irssi - - Email: - - mbsync -a;neomutt - - Music: - - musikcube - - Podcasts: - - castero + - Git: + - lazygit + - Editor: + - nvim diff --git a/home/.local/usr/bin/gettmuxLayout b/home/.local/usr/bin/gettmuxLayout index 27d8b81..78c66cc 100755 --- a/home/.local/usr/bin/gettmuxLayout +++ b/home/.local/usr/bin/gettmuxLayout @@ -1,3 +1,3 @@ -#!/usr/bin/bash +#!/usr/bin/env bash layout=$( tmux display-message -p "#{window_layout}" ) echo $layout diff --git a/home/.local/usr/bin/tmuxsessions.sh b/home/.local/usr/bin/tmuxsessions.sh index 09a1aa3..5782dee 100755 --- a/home/.local/usr/bin/tmuxsessions.sh +++ b/home/.local/usr/bin/tmuxsessions.sh @@ -3,7 +3,8 @@ # Description: A script to list and start tmuxinator projects using fzf. # Set the directory where your tmuxinator configuration files are located -TMUXINATOR_CONFIG_DIR="${HOME}/.config/tmuxinator/" +# TMUXINATOR_CONFIG_DIR="${HOME}/.config/tmuxinator/" +TMUXINATOR_CONFIG_DIR="/etc/nixos/home/.config/tmuxinator/" # Find all tmuxinator `.yml` files in the specified directory, remove path and extensions # project=$(find "$TMUXINATOR_CONFIG_DIR" -type f -name "*.yml" | sed 's|.*/||;s|\.yml$||' | \ diff --git a/home/common.nix b/home/common.nix index 75fcc71..c438562 100644 --- a/home/common.nix +++ b/home/common.nix @@ -59,6 +59,7 @@ luarocks lua5_1 lua-language-server + basedpyright go nodejs uv @@ -78,7 +79,6 @@ python-pkgs.ptpython python-pkgs.ipython python-pkgs.pillow - python-pkgs.basedpyright ] ) ) @@ -98,7 +98,7 @@ claude-code marksman unrar - helix + httpie ]; programs.neovim.plugins = [ diff --git a/modules/hyprland.nix b/modules/hyprland.nix index 4b0436b..f4a6249 100644 --- a/modules/hyprland.nix +++ b/modules/hyprland.nix @@ -80,7 +80,7 @@ $notes = kitty -T capture -e pytui -n $manpages = kitty -T capture -e pytui -m $sysmon = kitty -T system-monitor -e glances - $editor = neovide + $editor = kitty -T Editor -e tmuxinator start Development $screenshot = hyprshot -f ~/Pictures/Screenshots/%Y-%m-%d-%H%M%S.png bind = $mainMod SHIFT, M, exec, hyprvirtmon.py diff --git a/modules/tmux.nix b/modules/tmux.nix index 59a0428..c49670b 100644 --- a/modules/tmux.nix +++ b/modules/tmux.nix @@ -54,16 +54,16 @@ set -g @pass-copy-to-clipboard on ''; } - { - plugin = tmuxPlugins.tilish; - extraConfig = '' - set -g @tilish-navigator 'on' - set -g @tilish-default 'main-vertical' - set -g @tilish-enforce 'none' - set -g escape-time 0 - set -g @tilish-dmenu 'on' - ''; - } + # { + # plugin = tmuxPlugins.tilish; + # extraConfig = '' + # set -g @tilish-navigator 'on' + # set -g @tilish-default 'main-vertical' + # set -g @tilish-enforce 'none' + # set -g escape-time 0 + # set -g @tilish-dmenu 'on' + # ''; + # } ]; prefix = "C-a";