two line tmux status bar

.tmux.conf

@@ -1,11 +1,32 @@
-#Switch to screen prefix
+# Switch to screen prefix
+# Ctrl-a
 unbind C-b
 set -g prefix C-a
 bind-key b send-prefix
 
+
+set -g base-index 1           # start windows numbering at 1
+setw -g pane-base-index 1     # make pane numbering consistent with windows
+
+setw -g automatic-rename on   # rename window to reflect current program
+set -g renumber-windows on    # renumber windows when a window is closed
+
+set -g set-titles on          # set terminal title
+
+
+## Commonly found settings not 100% sure on the point
+setw -g monitor-activity on
+set -g  visual-activity on
+
 #Double cntl-a goes to last window
 bind-key C-a last-window
 
+# Turn on mouse support
+set-option -g mouse on
+
+bind-key -n C-S-Left swap-pane -t :-
+bind-key -n C-S-Right swap-pane -t :+
+
 #Cntl-a Backspace goes to previous window
 unbind BSpace
 bind BSpace previous-window
@@ -15,30 +36,37 @@ bind % split-window -c "#{pane_current_path}" -h
 bind '"' split-window -c "#{pane_current_path}" -v
 bind c new-window -c "#{pane_current_path}"
 
-
 #kill window/server with confirm
 bind-key k confirm kill-window
 bind-key K confirm kill-server
 
-#Status bar
-set -g status-bg cyan
-set-option -g status-justify centre
 
-#Left
-set -g status-left-length 30
-set -g status-left '#[fg=blue]%H:%M %d-%b-%y'
+# Status bar
+# Enable two lines for the status bar
+set-option -g status 2
+set-option -g status-position bottom
 
+# First line: Center (Window List)
+set-option -g status-format[0] '#[align=centre]#{W:#{E:window-status-format} ,#{E:window-status-current-format} }'
 
-set -g status-right '#[fg=blue]#h #[fg=yellow]#(acpi -i)'
+# Second line: Center (Time/Date, ACPI, CPU/Mem, Hostname)
+set-option -g status-format[1] "#[align=centre][#[fg=cyan]%H:%M %d-%b-%y] [#[fg=yellow]#(acpi -b | awk -F', ' '{print $2, $3}')] [#[fg=green,bg=default,bright]#(tmux-mem-cpu-load)] [#[fg=blue]#h]"
 
-#change numbering to start from 1
-set -g base-index 1
+# Ensure window list is properly justified
+set-option -g status-justify centre # Changed to centre
 
+# Background color for status bar (Blue)
+set -g status-bg colour24
+set -g status-fg colour231
+
+# Window list formatting
+set-window-option -g window-status-format '#[fg=colour117,bg=colour24] #I:#W #[fg=colour24,bg=colour24]'
+set-window-option -g window-status-current-format '#[fg=colour16,bg=colour231] #I:#W #[fg=colour24,bg=colour24]'
 
 # Bind function keys to windows
 bind -n F1 select-window -t 1
 bind -n F2 select-window -t 2
-bind -n F3 select-window -t 3 
+bind -n F3 select-window -t 3
 bind -n F4 select-window -t 4
 bind -n F5 select-window -t 5
 bind -n F6 select-window -t 6
@@ -50,12 +78,13 @@ bind -n F10 select-window -t 10
 #start programs
 new -s mysession -n "sys-mon" glances
 neww -n "Log" "journalctl -f"
-neww  
+neww
 #neww -n "Music" ncmpcpp
 #neww -n "Deluge" deluge-console
 
 #reload tmux config
 bind R source-file ~/.tmux.conf \; display-message "Config reloaded..."
+bind r source-file ~/.tmux.conf \; display-message "Config reloaded..."
 
 #vi keybindings
 set -g mode-keys vi
@@ -77,8 +106,4 @@ bind F12 send-keys F12
 # renumber windows after closing one
 set -g renumber-windows on
 
-
-#In order to use this file you can either 
-#####1. Put it in your home folder named .tmux.conf
-##2. Add an alias in your bashrc (or the equivilent file for your shell) for tmux doing tmux -f /location/of/this/file
-##3. Put this file in /etc/ named tmux.conf
+set -g history-limit 50000

.zfunc/_poetry

@@ -0,0 +1,217 @@
+#compdef poetry
+
+_poetry_0943c661d469fe49_complete()
+{
+    local state com cur
+    local -a opts
+    local -a coms
+
+    cur=${words[${#words[@]}]}
+
+    # lookup for command
+    for word in ${words[@]:1}; do
+        if [[ $word != -* ]]; then
+            com=$word
+            break
+        fi
+    done
+
+    if [[ ${cur} == --* ]]; then
+        state="option"
+        opts+=("--ansi:Force ANSI output." "--directory:The working directory for the Poetry command \(defaults to the current working directory\). All command-line arguments will be resolved relative to the given directory." "--help:Display help for the given command. When no command is given display help for the list command." "--no-ansi:Disable ANSI output." "--no-cache:Disables Poetry source caches." "--no-interaction:Do not ask any interactive question." "--no-plugins:Disables plugins." "--project:Specify another path as the project root. All command-line arguments will be resolved relative to the current working directory." "--quiet:Do not output any message." "--verbose:Increase the verbosity of messages: 1 for normal output, 2 for more verbose output and 3 for debug." "--version:Display this application version.")
+    elif [[ $cur == $com ]]; then
+        state="command"
+        coms+=("about:Shows information about Poetry." "add:Adds a new dependency to pyproject.toml and installs it." "build:Builds a package, as a tarball and a wheel by default." "'cache clear':Clears a Poetry cache by name." "'cache list':List Poetry\'s caches." "check:Validates the content of the pyproject.toml file and its consistency with the poetry.lock file." "config:Manages configuration settings." "'debug info':Shows debug information." "'debug resolve':Debugs dependency resolution." "'debug tags':Shows compatible tags for your project\'s current active environment." "'env activate':Print the command to activate a virtual environment." "'env info':Displays information about the current environment." "'env list':Lists all virtualenvs associated with the current project." "'env remove':Remove virtual environments associated with the project." "'env use':Activates or creates a new virtualenv for the current project." "help:Displays help for a command." "init:Creates a basic pyproject.toml file in the current directory." "install:Installs the project dependencies." "list:Lists commands." "lock:Locks the project dependencies." "new:Creates a new Python project at <path\>." "publish:Publishes a package to a remote repository." "'python install':Install the specified Python version from the Python Standalone Builds project. \(experimental feature\)" "'python list':Shows Python versions available for this environment. \(experimental feature\)" "'python remove':Remove the specified Python version if managed by Poetry. \(experimental feature\)" "remove:Removes a package from the project dependencies." "run:Runs a command in the appropriate environment." "search:Searches for packages on remote repositories." "'self add':Add additional packages to Poetry\'s runtime environment." "'self install':Install locked packages \(incl. addons\) required by this Poetry installation." "'self lock':Lock the Poetry installation\'s system requirements." "'self remove':Remove additional packages from Poetry\'s runtime environment." "'self show':Show packages from Poetry\'s runtime environment." "'self show plugins':Shows information about the currently installed plugins." "'self sync':Sync Poetry\'s own environment according to the locked packages \(incl. addons\) required by this Poetry installation." "'self update':Updates Poetry to the latest version." "show:Shows information about packages." "'source add':Add source configuration for project." "'source remove':Remove source configured for the project." "'source show':Show information about sources configured for the project." "sync:Update the project\'s environment according to the lockfile." "update:Update the dependencies as according to the pyproject.toml file." "version:Shows the version of the project or bumps it when a valid bump rule is provided.")
+    fi
+
+    case $state in
+        (command)
+            _describe 'command' coms
+        ;;
+        (option)
+            case "$com" in
+
+            (about)
+            opts+=()
+            ;;
+
+            (add)
+            opts+=("--allow-prereleases:Accept prereleases." "--dev:Add as a development dependency. \(shortcut for \'-G dev\'\)" "--dry-run:Output the operations but do not execute anything \(implicitly enables --verbose\)." "--editable:Add vcs/path dependencies as editable." "--extras:Extras to activate for the dependency." "--group:The group to add the dependency to." "--lock:Do not perform operations \(only update the lockfile\)." "--markers:Environment markers which describe when the dependency should be installed." "--optional:Add as an optional dependency to an extra." "--platform:Platforms for which the dependency must be installed." "--python:Python version for which the dependency must be installed." "--source:Name of the source to use to install the package.")
+            ;;
+
+            (build)
+            opts+=("--clean:Clean output directory before building." "--config-settings:Provide config settings that should be passed to backend in <key\>=<value\> format." "--format:Limit the format to either sdist or wheel." "--local-version:Add or replace a local version label to the build. \(Deprecated\)" "--output:Set output directory for build artifacts. Default is \`dist\`.")
+            ;;
+
+            ('cache clear')
+            opts+=("--all:Clear all entries in the cache.")
+            ;;
+
+            ('cache list')
+            opts+=()
+            ;;
+
+            (check)
+            opts+=("--lock:Checks that poetry.lock exists for the current version of pyproject.toml." "--strict:Fail if check reports warnings.")
+            ;;
+
+            (config)
+            opts+=("--list:List configuration settings." "--local:Set/Get from the project\'s local configuration." "--migrate:Migrate outdated configuration settings." "--unset:Unset configuration setting.")
+            ;;
+
+            ('debug info')
+            opts+=()
+            ;;
+
+            ('debug resolve')
+            opts+=("--extras:Extras to activate for the dependency." "--install:Show what would be installed for the current system." "--python:Python version\(s\) to use for resolution." "--tree:Display the dependency tree.")
+            ;;
+
+            ('debug tags')
+            opts+=()
+            ;;
+
+            ('env activate')
+            opts+=()
+            ;;
+
+            ('env info')
+            opts+=("--executable:Only display the environment\'s python executable path." "--path:Only display the environment\'s path.")
+            ;;
+
+            ('env list')
+            opts+=("--full-path:Output the full paths of the virtualenvs.")
+            ;;
+
+            ('env remove')
+            opts+=("--all:Remove all managed virtual environments associated with the project.")
+            ;;
+
+            ('env use')
+            opts+=()
+            ;;
+
+            (help)
+            opts+=()
+            ;;
+
+            (init)
+            opts+=("--author:Author name of the package." "--dependency:Package to require, with an optional version constraint, e.g. requests:\^2.10.0 or requests=2.11.1." "--description:Description of the package." "--dev-dependency:Package to require for development, with an optional version constraint, e.g. requests:\^2.10.0 or requests=2.11.1." "--license:License of the package." "--name:Name of the package." "--python:Compatible Python versions.")
+            ;;
+
+            (install)
+            opts+=("--all-extras:Install all extra dependencies." "--all-groups:Install dependencies from all groups." "--compile:Compile Python source files to bytecode." "--dry-run:Output the operations but do not execute anything \(implicitly enables --verbose\)." "--extras:Extra sets of dependencies to install." "--no-directory:Do not install any directory path dependencies\; useful to install dependencies without source code, e.g. for caching of Docker layers\)" "--no-root:Do not install the root package \(the current project\)." "--only:The only dependency groups to include." "--only-root:Exclude all dependencies." "--sync:Synchronize the environment with the locked packages and the specified groups. \(Deprecated\)" "--with:The optional dependency groups to include." "--without:The dependency groups to ignore.")
+            ;;
+
+            (list)
+            opts+=()
+            ;;
+
+            (lock)
+            opts+=("--regenerate:Ignore existing lock file and overwrite it with a new lock file created from scratch.")
+            ;;
+
+            (new)
+            opts+=("--author:Author name of the package." "--dependency:Package to require, with an optional version constraint, e.g. requests:\^2.10.0 or requests=2.11.1." "--description:Description of the package." "--dev-dependency:Package to require for development, with an optional version constraint, e.g. requests:\^2.10.0 or requests=2.11.1." "--flat:Use the flat layout for the project." "--interactive:Allow interactive specification of project configuration." "--license:License of the package." "--name:Set the resulting package name." "--python:Compatible Python versions." "--readme:Specify the readme file format. Default is md." "--src:Use the src layout for the project. Deprecated: This is the default option now.")
+            ;;
+
+            (publish)
+            opts+=("--build:Build the package before publishing." "--cert:Certificate authority to access the repository." "--client-cert:Client certificate to access the repository." "--dist-dir:Dist directory where built artifact are stored. Default is \`dist\`." "--dry-run:Perform all actions except upload the package." "--password:The password to access the repository." "--repository:The repository to publish the package to." "--skip-existing:Ignore errors from files already existing in the repository." "--username:The username to access the repository.")
+            ;;
+
+            ('python install')
+            opts+=("--clean:Clean up installation if check fails." "--free-threaded:Use free-threaded version if available." "--implementation:Python implementation to use. \(cpython, pypy\)" "--reinstall:Reinstall if installation already exists.")
+            ;;
+
+            ('python list')
+            opts+=("--all:List all versions, including those available for download." "--implementation:Python implementation to search for." "--managed:List only Poetry managed Python versions.")
+            ;;
+
+            ('python remove')
+            opts+=("--implementation:Python implementation to use. \(cpython, pypy\)")
+            ;;
+
+            (remove)
+            opts+=("--dev:Remove a package from the development dependencies. \(shortcut for \'-G dev\'\)" "--dry-run:Output the operations but do not execute anything \(implicitly enables --verbose\)." "--group:The group to remove the dependency from." "--lock:Do not perform operations \(only update the lockfile\).")
+            ;;
+
+            (run)
+            opts+=()
+            ;;
+
+            (search)
+            opts+=()
+            ;;
+
+            ('self add')
+            opts+=("--allow-prereleases:Accept prereleases." "--dry-run:Output the operations but do not execute anything \(implicitly enables --verbose\)." "--editable:Add vcs/path dependencies as editable." "--extras:Extras to activate for the dependency." "--source:Name of the source to use to install the package.")
+            ;;
+
+            ('self install')
+            opts+=("--dry-run:Output the operations but do not execute anything \(implicitly enables --verbose\)." "--sync:Synchronize the environment with the locked packages and the specified groups. \(Deprecated\)")
+            ;;
+
+            ('self lock')
+            opts+=("--regenerate:Ignore existing lock file and overwrite it with a new lock file created from scratch.")
+            ;;
+
+            ('self remove')
+            opts+=("--dry-run:Output the operations but do not execute anything \(implicitly enables --verbose\).")
+            ;;
+
+            ('self show')
+            opts+=("--addons:List only add-on packages installed." "--latest:Show the latest version." "--outdated:Show the latest version but only for packages that are outdated." "--tree:List the dependencies as a tree.")
+            ;;
+
+            ('self show plugins')
+            opts+=()
+            ;;
+
+            ('self sync')
+            opts+=("--dry-run:Output the operations but do not execute anything \(implicitly enables --verbose\).")
+            ;;
+
+            ('self update')
+            opts+=("--dry-run:Output the operations but do not execute anything \(implicitly enables --verbose\)." "--preview:Allow the installation of pre-release versions.")
+            ;;
+
+            (show)
+            opts+=("--all:Show all packages \(even those not compatible with current system\)." "--latest:Show the latest version." "--no-truncate:Do not truncate the output based on the terminal width." "--only:The only dependency groups to include." "--outdated:Show the latest version but only for packages that are outdated." "--top-level:Show only top-level dependencies." "--tree:List the dependencies as a tree." "--why:When showing the full list, or a --tree for a single package, display whether they are a direct dependency or required by other packages" "--with:The optional dependency groups to include." "--without:The dependency groups to ignore.")
+            ;;
+
+            ('source add')
+            opts+=("--priority:Set the priority of this source. One of: primary, supplemental, explicit. Defaults to primary, but will switch to supplemental in a later release.")
+            ;;
+
+            ('source remove')
+            opts+=()
+            ;;
+
+            ('source show')
+            opts+=()
+            ;;
+
+            (sync)
+            opts+=("--all-extras:Install all extra dependencies." "--all-groups:Install dependencies from all groups." "--compile:Compile Python source files to bytecode." "--dry-run:Output the operations but do not execute anything \(implicitly enables --verbose\)." "--extras:Extra sets of dependencies to install." "--no-directory:Do not install any directory path dependencies\; useful to install dependencies without source code, e.g. for caching of Docker layers\)" "--no-root:Do not install the root package \(the current project\)." "--only:The only dependency groups to include." "--only-root:Exclude all dependencies." "--with:The optional dependency groups to include." "--without:The dependency groups to ignore.")
+            ;;
+
+            (update)
+            opts+=("--dry-run:Output the operations but do not execute anything \(implicitly enables --verbose\)." "--lock:Do not perform operations \(only update the lockfile\)." "--only:The only dependency groups to include." "--sync:Synchronize the environment with the locked packages and the specified groups." "--with:The optional dependency groups to include." "--without:The dependency groups to ignore.")
+            ;;
+
+            (version)
+            opts+=("--dry-run:Do not update pyproject.toml file" "--next-phase:Increment the phase of the current version" "--short:Output the version number only")
+            ;;
+
+            esac
+
+            _describe 'option' opts
+        ;;
+        *)
+            # fallback to file completion
+            _arguments '*:file:_files'
+    esac
+}
+
+_poetry_0943c661d469fe49_complete "$@"
+compdef _poetry_0943c661d469fe49_complete /home/nick/poetry

.zshrc

@@ -28,14 +28,14 @@ setopt HIST_IGNORE_ALL_DUPS
 bindkey "^r" history-incremental-search-backward
 
 ##Variables
-export EDITOR="vim"
+export EDITOR="code"
 export USE_EDITOR=$EDITOR
 export VISUAL=$EDITOR
-export BROWSWER="vivaldi"
+#export BROWSWER="vivaldi"
 # fixes issue with atom 
-export ELECTRON_TRASH="kioclient5 atom"
-
-
+#export ELECTRON_TRASH="kioclient5 atom"
+# export GITEA_TOKEN=a2a8542ad8fcf4de4156e9b5a83c09f826e53dc0
+# export GITEA_TOKEN=55fa045ffdc1ffabbabcdc429e353e4883b04b17
 ##Alias
 source ~/.alias
 
@@ -45,11 +45,13 @@ bindkey -v
 
 zstyle :compinstall filename '/home/nick/.zshrc'
 
-autoload -U compinit
+autoload -Uz compinit
 compinit
 
 
 zstyle ':completion:*' rehash true
+fpath+=~/.zfunc
+
 ##Colored man pages
 
 man() {
@@ -181,3 +183,16 @@ bindkey "^[s" insert-sudo
 
 # Set the right-hand prompt
 RPS1='$(git_prompt_string)'
+
+# Created by `pipx` on 2025-03-03 18:34:12
+export PATH="$PATH:/home/nick/.local/bin"
+
+# requires direnv to be installed
+eval "$(direnv hook zsh)"
+
+show_venv() {
+	if [[ -n "$VIRTUAL_ENV" && -n "$DIRENV_DIR" ]]; then
+		echo "($(basename $VIRTUAL_ENV))"
+	fi
+}
+RPS1='$(show_venv)'$RPS1