From de32d5ac39f04b2bcbe55f3d3047fb65ad0dcaae Mon Sep 17 00:00:00 2001 From: 0xrsydn Date: Tue, 28 Oct 2025 11:41:20 +0700 Subject: [PATCH] fix: starship prompt config, nvim config, tmux --- .../rsydn/programs/nvim/lua/plugins/lsp.lua | 2 +- .../rsydn/programs/nvim/lua/plugins/mini.lua | 6 + .../home/rsydn/shell/starship/starship.toml | 1 - .../rsydn/shell/starship/starship.toml.bak | 181 ++++++++++++++++++ modules/home/rsydn/shell/tmux.nix | 15 +- 5 files changed, 197 insertions(+), 8 deletions(-) create mode 100644 modules/home/rsydn/programs/nvim/lua/plugins/mini.lua create mode 100644 modules/home/rsydn/shell/starship/starship.toml.bak diff --git a/modules/home/rsydn/programs/nvim/lua/plugins/lsp.lua b/modules/home/rsydn/programs/nvim/lua/plugins/lsp.lua index e29cba4..1196cf1 100644 --- a/modules/home/rsydn/programs/nvim/lua/plugins/lsp.lua +++ b/modules/home/rsydn/programs/nvim/lua/plugins/lsp.lua @@ -1,7 +1,7 @@ -- Declare language servers provided via Nix so LazyVim skips Mason installs. return { { - "williamboman/mason.nvim", + "mason-org/mason.nvim", opts = function(_, opts) opts.ensure_installed = {} end, diff --git a/modules/home/rsydn/programs/nvim/lua/plugins/mini.lua b/modules/home/rsydn/programs/nvim/lua/plugins/mini.lua new file mode 100644 index 0000000..9167146 --- /dev/null +++ b/modules/home/rsydn/programs/nvim/lua/plugins/mini.lua @@ -0,0 +1,6 @@ +-- Override mini.pick with the new repository location +return { + { + "nvim-mini/mini.pick", + }, +} diff --git a/modules/home/rsydn/shell/starship/starship.toml b/modules/home/rsydn/shell/starship/starship.toml index 371a8ca..1bfc934 100644 --- a/modules/home/rsydn/shell/starship/starship.toml +++ b/modules/home/rsydn/shell/starship/starship.toml @@ -61,7 +61,6 @@ Fedora = "󰣛" Alpine = "" Amazon = "" Android = "" -AOSC = "" Arch = "󰣇" Artix = "󰣇" EndeavourOS = "" diff --git a/modules/home/rsydn/shell/starship/starship.toml.bak b/modules/home/rsydn/shell/starship/starship.toml.bak new file mode 100644 index 0000000..371a8ca --- /dev/null +++ b/modules/home/rsydn/shell/starship/starship.toml.bak @@ -0,0 +1,181 @@ +"$schema" = "https://starship.rs/config-schema.json" + +format = """ +[](color_orange)\ +$os\ +$username\ +[](bg:color_yellow fg:color_orange)\ +$directory\ +[](fg:color_yellow bg:color_aqua)\ +$git_branch\ +$git_status\ +[](fg:color_aqua bg:color_blue)\ +$c\ +$cpp\ +$rust\ +$golang\ +$nodejs\ +$php\ +$java\ +$kotlin\ +$haskell\ +$python\ +[](fg:color_blue bg:color_bg3)\ +$docker_context\ +$conda\ +$pixi\ +[](fg:color_bg3 bg:color_bg1)\ +$time\ +[ ](fg:color_bg1)\ +$line_break$character""" + +palette = "gruvbox_dark" + +[palettes.gruvbox_dark] +color_fg0 = "#fbf1c7" +color_bg1 = "#3c3836" +color_bg3 = "#665c54" +color_blue = "#458588" +color_aqua = "#689d6a" +color_green = "#98971a" +color_orange = "#d65d0e" +color_purple = "#b16286" +color_red = "#cc241d" +color_yellow = "#d79921" + +[os] +disabled = false +style = "bg:color_orange fg:color_fg0" + +[os.symbols] +Windows = "󰍲" +Ubuntu = "󰕈" +SUSE = "" +Raspbian = "󰐿" +Mint = "󰣭" +Macos = "󰀵" +Manjaro = "" +Linux = "󰌽" +Gentoo = "󰣨" +Fedora = "󰣛" +Alpine = "" +Amazon = "" +Android = "" +AOSC = "" +Arch = "󰣇" +Artix = "󰣇" +EndeavourOS = "" +CentOS = "" +Debian = "󰣚" +Redhat = "󱄛" +RedHatEnterprise = "󱄛" +Pop = "" + +[username] +show_always = true +style_user = "bg:color_orange fg:color_fg0" +style_root = "bg:color_orange fg:color_fg0" +format = "[ $user ]($style)" + +[directory] +style = "fg:color_fg0 bg:color_yellow" +format = "[ $path ]($style)" +truncation_length = 3 +truncation_symbol = "…/" + +[directory.substitutions] +Documents = "󰈙 " +Downloads = " " +Music = "󰝚 " +Pictures = " " +Developer = "󰲋 " + +[git_branch] +symbol = "" +style = "bg:color_aqua" +format = "[[ $symbol $branch ](fg:color_fg0 bg:color_aqua)]($style)" + +[git_status] +style = "bg:color_aqua" +format = "[[($all_status$ahead_behind )](fg:color_fg0 bg:color_aqua)]($style)" + +[nodejs] +symbol = "" +style = "bg:color_blue" +format = "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)" + +[c] +symbol = " " +style = "bg:color_blue" +format = "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)" + +[cpp] +symbol = " " +style = "bg:color_blue" +format = "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)" + +[rust] +symbol = "" +style = "bg:color_blue" +format = "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)" + +[golang] +symbol = "" +style = "bg:color_blue" +format = "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)" + +[php] +symbol = "" +style = "bg:color_blue" +format = "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)" + +[java] +symbol = "" +style = "bg:color_blue" +format = "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)" + +[kotlin] +symbol = "" +style = "bg:color_blue" +format = "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)" + +[haskell] +symbol = "" +style = "bg:color_blue" +format = "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)" + +[python] +symbol = "" +style = "bg:color_blue" +format = "[[ $symbol( $version) ](fg:color_fg0 bg:color_blue)]($style)" + +[docker_context] +symbol = "" +style = "bg:color_bg3" +format = "[[ $symbol( $context) ](fg:#83a598 bg:color_bg3)]($style)" + +[conda] +style = "bg:color_bg3" +format = "[[ $symbol( $environment) ](fg:#83a598 bg:color_bg3)]($style)" + +[pixi] +style = "bg:color_bg3" +format = "[[ $symbol( $version)( $environment) ](fg:color_fg0 bg:color_bg3)]($style)" + +[time] +disabled = false +time_format = "%R" +style = "bg:color_bg1" +format = "[[  $time ](fg:color_fg0 bg:color_bg1)]($style)" + +[line_break] +disabled = false + +[character] +disabled = false +success_symbol = "[](bold fg:color_green)" +error_symbol = "[](bold fg:color_red)" +vimcmd_symbol = "[](bold fg:color_green)" +vimcmd_replace_one_symbol = "[](bold fg:color_purple)" +vimcmd_replace_symbol = "[](bold fg:color_purple)" +vimcmd_visual_symbol = "[](bold fg:color_yellow)" diff --git a/modules/home/rsydn/shell/tmux.nix b/modules/home/rsydn/shell/tmux.nix index d27e614..d71adbc 100644 --- a/modules/home/rsydn/shell/tmux.nix +++ b/modules/home/rsydn/shell/tmux.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, ... }: { +{ config, lib, pkgs, ... }: { programs.tmux = { enable = lib.mkDefault true; clock24 = true; @@ -21,16 +21,19 @@ set -s extended-keys on set -as terminal-features 'xterm-ghostty:extkeys' set-option -g status-style "bg=#282a36 fg=#f8f8f2" - set -g status-interval 5 - setw -g automatic-rename on - set -g renumber-windows on - bind r source-file ~/.tmux.conf \; display-message "tmux reloaded" - bind | split-window -h + set -g status-interval 5 + setw -g automatic-rename on + set -g renumber-windows on + bind r source-file ~/.tmux.conf \; display-message "tmux reloaded" + bind | split-window -h bind - split-window -v unbind '"' unbind % set -g display-panes-time 1500 bind k send-keys -R \; send-keys C-l \; clear-history + # Ensure tmux panes spawn login nu so Starship integration runs + set -g default-shell "${config.home.profileDirectory}/bin/nu" + set -g default-command "${config.home.profileDirectory}/bin/nu --login" ''; }; }