push changes
This commit is contained in:
parent
6ea10852a9
commit
9aa6f3fdbe
20 changed files with 573 additions and 277 deletions
|
|
@ -30,5 +30,5 @@
|
|||
"news": {
|
||||
"NEWS.md": "6520"
|
||||
},
|
||||
"version": 6
|
||||
"version": 7
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,37 +1,34 @@
|
|||
function confirm(opts)
|
||||
local cmp = require("blink.cmp")
|
||||
opts = vim.tbl_extend("force", { select = true }, opts or {})
|
||||
return function(fallback) end
|
||||
end
|
||||
|
||||
return {
|
||||
{
|
||||
"LazyVim/LazyVim",
|
||||
opts = {
|
||||
colorscheme = "catppuccin",
|
||||
news = { lazyvim = false },
|
||||
},
|
||||
},
|
||||
"f-person/git-blame.nvim",
|
||||
{ "nvim-lualine/lualine.nvim", enabled = false },
|
||||
-- {
|
||||
-- "nvim-neorg/neorg",
|
||||
-- lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default
|
||||
-- version = "*", -- Pin Neorg to the latest stable release
|
||||
-- config = true,
|
||||
-- opts = {
|
||||
-- load = {
|
||||
-- ["core.defaults"] = {},
|
||||
-- ["core.concealer"] = {},
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
{ "echasnovski/mini.statusline", opts = {} },
|
||||
{
|
||||
"L3MON4D3/LuaSnip",
|
||||
dependencies = {
|
||||
"rafamadriz/friendly-snippets",
|
||||
},
|
||||
config = function()
|
||||
require("luasnip.loaders.from_vscode").lazy_load()
|
||||
require("luasnip.loaders.from_vscode").lazy_load({
|
||||
paths = vim.fn.stdpath("config") .. "/snippets/",
|
||||
})
|
||||
end,
|
||||
},
|
||||
"direnv/direnv.vim",
|
||||
{
|
||||
"stevearc/conform.nvim",
|
||||
opts = {
|
||||
formatters_by_ft = {
|
||||
nix = { "alejandra" },
|
||||
typescript = { "prettierd" },
|
||||
typescriptreact = { "prettierd" },
|
||||
javascriptreact = { "prettierd" },
|
||||
javascript = { "prettierd" },
|
||||
},
|
||||
},
|
||||
|
|
@ -49,6 +46,13 @@ return {
|
|||
-- whitespace = { highlight = "Whitespace", "NonText" },
|
||||
-- },
|
||||
},
|
||||
-- lua with lazy.nvim
|
||||
{
|
||||
"max397574/better-escape.nvim",
|
||||
config = function()
|
||||
require("better_escape").setup()
|
||||
end,
|
||||
},
|
||||
{
|
||||
"jake-stewart/force-cul.nvim",
|
||||
config = function()
|
||||
|
|
|
|||
|
|
@ -5,85 +5,77 @@
|
|||
pkgs,
|
||||
...
|
||||
}:
|
||||
with lib;
|
||||
with lib.custom; let
|
||||
with lib; let
|
||||
cfg = config.apps.tools.starship;
|
||||
in {
|
||||
options.apps.tools.starship = with types; {
|
||||
enable = mkBoolOpt false "Enable Tmux";
|
||||
enable = mkEnableOption "Starship prompt";
|
||||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = [
|
||||
pkgs.custom.getgithost
|
||||
];
|
||||
|
||||
programs.starship = {
|
||||
enable = true;
|
||||
enableZshIntegration = config.programs.zsh.enable;
|
||||
settings = {
|
||||
add_newline = false;
|
||||
command_timeout = 1000;
|
||||
scan_timeout = 10;
|
||||
format = ''
|
||||
$username$shlvl$kubernetes''${custom.dir}''${custom.home_dir}$directory''${custom.git_host}$git_branch$git_commit$git_state$git_status$hg_branch$docker_context$package$cmake$dart$dotnet$elixir$elm$erlang$golang$helm$java$julia$kotlin$nim$nodejs$ocaml$perl$php$purescript$python$ruby$rust$swift$terraform$vagrant$zig$nix_shell$conda$aws$gcloud$openstack$env_var$crystal$custom$cmd_duration$lua$line_break$jobs$status$character
|
||||
'';
|
||||
character = {
|
||||
success_symbol = "[>](#89b4fa)[>](#f5c2e7)[>](#f2cdcd)";
|
||||
error_symbol = "[>>>](red)";
|
||||
format = "$username$directory$git_branch$git_status$python$rust$nodejs$nix_shell$cmd_duration$line_break$character";
|
||||
|
||||
# Username display
|
||||
username = {
|
||||
style_user = "blue bold";
|
||||
style_root = "red bold";
|
||||
format = "[$user]($style) ";
|
||||
show_always = true;
|
||||
};
|
||||
|
||||
# Modern minimal prompt character
|
||||
character = {
|
||||
success_symbol = "[>](blue)";
|
||||
error_symbol = "[>](red)";
|
||||
};
|
||||
|
||||
# Simplified directory display
|
||||
directory = {
|
||||
truncation_length = 1;
|
||||
format = "[ $path ]($style)[$read_only]($read_only_style) ";
|
||||
style = "fg:white bg:black bold";
|
||||
read_only = " ";
|
||||
read_only_style = "fg:black bg:red";
|
||||
style = "bold lavender";
|
||||
format = "[$path]($style) ";
|
||||
read_only = " ";
|
||||
};
|
||||
git_commit = {commit_hash_length = 7;};
|
||||
git_branch = {format = "[$symbol$branch]($style) ";};
|
||||
|
||||
# Streamlined git status indicators
|
||||
git_branch = {
|
||||
format = "[$symbol$branch]($style) ";
|
||||
style = "mauve";
|
||||
};
|
||||
|
||||
git_status = {
|
||||
conflicted = "[<](white)=[$count](bright-white bold)[>](white)";
|
||||
ahead = "[<](white)⇡[$count](bright-white bold)[>](white)";
|
||||
behind = "[<](white)⇣[$count](bright-white bold)[>](white)";
|
||||
diverged = "[<](white)⇕⇡[$ahead_count](bright-white bold)⇣[$behind_count](bright-white)[>](white)";
|
||||
untracked = "[<](white)?[$count](bright-white bold)[>](white)";
|
||||
stashed = "[<](white)$[$count](bright-white bold)[>](white)";
|
||||
modified = "[<](white)[>](white)";
|
||||
staged = "[<](white)+[$count](bright-white bold)[>](white)";
|
||||
renamed = "[<](white)»[$count](bright-white bold)[>](white)";
|
||||
deleted = "[<](white)✗[$count](bright-white bold)[>](white)";
|
||||
format = "[$all_status$ahead_behind]($style) ";
|
||||
style = "bold peach";
|
||||
conflicted = "=";
|
||||
ahead = "⇡";
|
||||
behind = "⇣";
|
||||
diverged = "⇕";
|
||||
untracked = "?";
|
||||
stashed = "$";
|
||||
modified = "!";
|
||||
staged = "+";
|
||||
renamed = "»";
|
||||
deleted = "✗";
|
||||
};
|
||||
custom = {
|
||||
home_dir = {
|
||||
command = "echo ";
|
||||
when = "[ \"$PWD\" == \"$HOME\" ]";
|
||||
shell = "[\"bash\",\"--norc\",\"--noprofile\"]";
|
||||
style = "fg:bright-white bg:bright-black";
|
||||
format = "[ $output ]($style)";
|
||||
};
|
||||
dir = {
|
||||
command = "echo ";
|
||||
when = "[ \"$PWD\" != \"$HOME\" ]";
|
||||
shell = "[\"bash\",\"--norc\",\"--noprofile\"]";
|
||||
style = "fg:blue bg:bright-black";
|
||||
format = "[ $output ]($style)";
|
||||
};
|
||||
git_host = {
|
||||
command = "getgithost";
|
||||
when = "git rev-parse --is-inside-work-tree 2> /dev/null";
|
||||
shell = "[\"bash\",\"--norc\",\"--noprofile\"]";
|
||||
style = "bright-yellow bold";
|
||||
format = "at [$output]($style)";
|
||||
};
|
||||
|
||||
# Language modules with minimal styling
|
||||
python.symbol = "[](yellow) ";
|
||||
rust.symbol = "[](peach) ";
|
||||
nodejs.symbol = "[](green) ";
|
||||
nix_shell.symbol = "[](blue) ";
|
||||
|
||||
# Command duration and line break
|
||||
cmd_duration = {
|
||||
format = "[$duration]($style) ";
|
||||
style = "yellow";
|
||||
};
|
||||
|
||||
line_break.disabled = false;
|
||||
lua.symbol = "[](blue) ";
|
||||
python.symbol = "[](blue) ";
|
||||
hostname = {
|
||||
ssh_only = true;
|
||||
format = "[$hostname](bold blue) ";
|
||||
disabled = false;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -35,24 +35,17 @@ in {
|
|||
set-window-option -g pane-base-index 1
|
||||
set-option -g renumber-windows on
|
||||
|
||||
set -g @catppuccin_window_left_separator ""
|
||||
set -g @catppuccin_window_right_separator " "
|
||||
set -g @catppuccin_window_middle_separator " █"
|
||||
set -g @catppuccin_window_number_position "right"
|
||||
set -g @catppuccin_window_default_fill "number"
|
||||
set -g @catppuccin_window_default_text "#W"
|
||||
set -g @catppuccin_window_current_fill "number"
|
||||
set -g @catppuccin_window_current_text "#W#{?window_zoomed_flag,(),}"
|
||||
set -g @catppuccin_status_modules_right "directory meetings cpu date_time uptime"
|
||||
set -g @catppuccin_status_modules_left "session"
|
||||
set -g @catppuccin_status_left_separator " "
|
||||
set -g @catppuccin_status_right_separator " "
|
||||
set -g @catppuccin_status_right_separator_inverse "no"
|
||||
set -g @catppuccin_status_fill "icon"
|
||||
set -g @catppuccin_status_connect_separator "no"
|
||||
set -g @catppuccin_directory_text "#{b:pane_current_path}"
|
||||
set -g @catppuccin_meetings_text "#($HOME/.config/tmux/scripts/cal.sh)"
|
||||
set -g @catppuccin_date_time_text "%H:%M"
|
||||
set -g @catppuccin_flavor "mocha"
|
||||
set -g @catppuccin_window_status_style "basic"
|
||||
set -g default-terminal "tmux-256color"
|
||||
|
||||
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 -agF status-right "#{E:@catppuccin_status_cpu}"
|
||||
set -ag status-right "#{E:@catppuccin_status_session}"
|
||||
set -ag status-right "#{E:@catppuccin_status_uptime}"
|
||||
|
||||
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue