From 28451c7f31666206f4eee9798481583a4b2538d1 Mon Sep 17 00:00:00 2001 From: Never Gude Date: Wed, 11 Feb 2026 20:06:51 +0100 Subject: [PATCH] new --- .config/fish/config.fish | 75 +++++++++++++++++-------- .config/fish/fish_variables | 46 +++++++-------- .config/fish/functions/fish_prompt.fish | 8 +-- .config/nvim/init.lua | 4 +- 4 files changed, 80 insertions(+), 53 deletions(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 1e59934..d695cf0 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,25 +1,56 @@ if status is-interactive # Commands to run in interactive sessions can go here + abbr --add ll ll -a + abbr --add adl album-dl.fish + abbr --add vv nvim + abbr --add tr gio trash + abbr --add --set-cursor tldr curl cheat.sh/% + + function alacritty + command alacritty msg create-window $argv + end + + function mvi --description 'Launches \d mpv with mvi configuration' + mpv --config-dir=$HOME/.config/mvi/ $argv + end + + # Colorscheme + set -U fish_color_normal normal + set -U fish_color_command brgreen --bold + set -U fish_color_keyword brred + set -U fish_color_quote green --italics + set -U fish_color_redirection yellow + set -U fish_color_end cyan + set -U fish_color_error red --underline=curly + set -U fish_color_param normal + set -U fish_color_comment brblack + set -U fish_color_selection normal --bold --background brblack + set -U fish_color_search_match + set -U fish_color_history_current + set -U fish_color_operator yellow + set -U fish_color_escape white --bold + set -U fish_color_cwd green + set -U fish_color_cwd_root red + set -U fish_color_option brblue + set -U fish_color_valid_path --underline + set -U fish_color_autosuggestion white + set -U fish_color_user brgreen + set -U fish_color_host normal + set -U fish_color_host_remote yellow + set -U fish_color_history_current --bold + set -U fish_color_status red + set -U fish_color_cancel white --bold + set -U fish_pager_color_prefix normal --bold --underline + set -U fish_pager_color_progress normal --bold --reverse + set -U fish_pager_color_completion normal + set -U fish_pager_color_description yellow --italics + set -U fish_pager_color_selected_background --background brblue + set -U fish_pager_color_secondary_background + set -U fish_pager_color_selected_completion black --bold + set -U fish_pager_color_background + set -U fish_pager_color_selected_description bryellow --bold --italics + set -U fish_pager_color_secondary_prefix + set -U fish_pager_color_secondary_description + set -U fish_pager_color_selected_prefix black --bold --underline + set -U fish_pager_color_secondary_completion end - -abbr --add ll ll -a -abbr --add adl album-dl.fish -abbr --add vv nvim -abbr --add tr gio trash -abbr --add --set-cursor tldr curl cheat.sh/% - -function alacritty - command alacritty msg create-window $argv -end - -function mvi --description 'Launches mpv with mvi configuration' - mpv --config-dir=$HOME/.config/mvi/ $argv -end - -# BEGIN opam configuration -# This is useful if you're using opam as it adds: -# - the correct directories to the PATH -# - auto-completion for the opam binary -# This section can be safely removed at any time if needed. -test -r '/home/never/.opam/opam-init/init.fish' && source '/home/never/.opam/opam-init/init.fish' > /dev/null 2> /dev/null; or true -# END opam configuration diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index c561a45..294d23b 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -4,44 +4,44 @@ SETUVAR --export EDITOR:nvim SETUVAR LESS:\x1d SETUVAR --export QT_QPA_PLATFORMTHEME:qt6ct SETUVAR __fish_initialized:3800 -SETUVAR fish_color_autosuggestion:585858 -SETUVAR fish_color_cancel:\x2d\x2dreverse -SETUVAR fish_color_command:a1b56c -SETUVAR fish_color_comment:f7ca88 +SETUVAR fish_color_autosuggestion:white +SETUVAR fish_color_cancel:white\x1e\x2d\x2dbold +SETUVAR fish_color_command:brgreen\x1e\x2d\x2dbold +SETUVAR fish_color_comment:brblack SETUVAR fish_color_cwd:green SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:ba8baf -SETUVAR fish_color_error:ab4642 -SETUVAR fish_color_escape:86c1b9 +SETUVAR fish_color_end:cyan +SETUVAR fish_color_error:red\x1e\x2d\x2dunderline\x3dcurly +SETUVAR fish_color_escape:white\x1e\x2d\x2dbold SETUVAR fish_color_history_current:\x2d\x2dbold SETUVAR fish_color_host:normal SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_keyword:a1b56c +SETUVAR fish_color_keyword:brred SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:7cafc2 -SETUVAR fish_color_option:d8d8d8 -SETUVAR fish_color_param:d8d8d8 -SETUVAR fish_color_quote:f7ca88 -SETUVAR fish_color_redirection:d8d8d8 -SETUVAR fish_color_search_match:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_operator:yellow +SETUVAR fish_color_option:brblue +SETUVAR fish_color_param:normal +SETUVAR fish_color_quote:green\x1e\x2d\x2ditalics +SETUVAR fish_color_redirection:yellow +SETUVAR fish_color_search_match:\x1d +SETUVAR fish_color_selection:normal\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x1ebrblack SETUVAR fish_color_status:red SETUVAR fish_color_user:brgreen -SETUVAR fish_color_valid_path:\x2d\x2dunderline\x3dsingle +SETUVAR fish_color_valid_path:\x2d\x2dunderline SETUVAR fish_greeting:\x1d SETUVAR fish_key_bindings:fish_vi_key_bindings SETUVAR fish_pager_color_background:\x1d SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:B3A06D -SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline\x3dsingle -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dcyan +SETUVAR fish_pager_color_description:yellow\x1e\x2d\x2ditalics +SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline +SETUVAR fish_pager_color_progress:normal\x1e\x2d\x2dbold\x1e\x2d\x2dreverse SETUVAR fish_pager_color_secondary_background:\x1d SETUVAR fish_pager_color_secondary_completion:\x1d SETUVAR fish_pager_color_secondary_description:\x1d SETUVAR fish_pager_color_secondary_prefix:\x1d -SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dbrblack -SETUVAR fish_pager_color_selected_completion:\x1d -SETUVAR fish_pager_color_selected_description:\x1d -SETUVAR fish_pager_color_selected_prefix:\x1d +SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x1ebrblue +SETUVAR fish_pager_color_selected_completion:black\x1e\x2d\x2dbold +SETUVAR fish_pager_color_selected_description:bryellow\x1e\x2d\x2dbold\x1e\x2d\x2ditalics +SETUVAR fish_pager_color_selected_prefix:black\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_user_paths:/home/never/\x2elocal/scripts\x1e/usr/local/texlive/2025/bin/x86_64\x2dlinux diff --git a/.config/fish/functions/fish_prompt.fish b/.config/fish/functions/fish_prompt.fish index 813259b..ff26ac0 100644 --- a/.config/fish/functions/fish_prompt.fish +++ b/.config/fish/functions/fish_prompt.fish @@ -2,14 +2,12 @@ function fish_prompt if not set -q VIRTUAL_ENV_DISABLE_PROMPT set -g VIRTUAL_ENV_DISABLE_PROMPT true end - - set_color brwhite - set_color --background 504945 + + set_color brwhite --background 504945 set -g __fish_git_prompt_show_informative_status true printf '%s' (fish_git_prompt " %s ") - set_color white - set_color --background 3c3836 + set_color white --background 3c3836 printf ' %s ' (prompt_pwd -D 8) echo diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 0539d3a..5ade680 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -40,7 +40,6 @@ vim.o.undofile = true -- instead raise a dialog asking if you wish to save the current file(s) See `:help 'confirm'` vim.o.confirm = true -vim.o.termguicolors = true vim.cmd.colorscheme("gruvbox") -- [[ Set up keymaps ]] See `:h vim.keymap.set()`, `:h mapping`, `:h keycodes` @@ -114,7 +113,7 @@ vim.pack.add({ "https://github.com/nvim-treesitter/nvim-treesitter" }) require("nvim-treesitter").setup() vim.api.nvim_create_autocmd('FileType', { - pattern = { "lua", "tex", "c", "java", "ocaml" }, + pattern = { "lua", "tex", "c", "java", "ocaml", "fish" }, callback = function() -- syntax highlighting, provided by Neovim vim.treesitter.start() @@ -166,7 +165,6 @@ vim.api.nvim_create_user_command("DapInit", function() vim.keymap.set("n", "bb", dap.toggle_breakpoint, { desc = "Toggle breakpoint" }) vim.keymap.set("n", "bc", dap.continue, { desc = "Continue execution" }) - dap.listeners.on_session["debug"] = function() vim.keymap.set("n", "bs", dap_sidebar_s.toggle, { desc = "Show scopes" }) vim.keymap.set("n", "bf", dap_sidebar_f.toggle, { desc = "Show frames" })