From 1e422e39767a2c042f160e172fc29d8608839d86 Mon Sep 17 00:00:00 2001 From: William Ball Date: Sat, 1 Mar 2025 13:16:39 -0800 Subject: [PATCH] some tweaks --- fish/.config/fish/fish_plugins | 1 - fish/.config/fish/fish_variables | 9 +++--- fish/.config/fish/functions/__z.fish | 8 ++--- .../fish/themes/Catppuccin Frappe.theme | 30 ------------------- .../fish/themes/Catppuccin Latte.theme | 30 ------------------- .../fish/themes/Catppuccin Macchiato.theme | 30 ------------------- .../fish/themes/Catppuccin Mocha.theme | 30 ------------------- gtk/.config/gtk-4.0/gtk.css | 1 + nvim/.config/nvim/after/ftplugin/haskell.lua | 12 ++++++++ nvim/.config/nvim/lua/options.lua | 2 ++ .../nvim/lua/plugins/languages/coq.lua | 1 - .../nvim/lua/plugins/languages/typst.lua | 8 +++++ nvim/.config/nvim/lua/plugins/lsp.lua | 8 +++++ 13 files changed, 40 insertions(+), 130 deletions(-) delete mode 100644 fish/.config/fish/themes/Catppuccin Frappe.theme delete mode 100644 fish/.config/fish/themes/Catppuccin Latte.theme delete mode 100644 fish/.config/fish/themes/Catppuccin Macchiato.theme delete mode 100644 fish/.config/fish/themes/Catppuccin Mocha.theme create mode 100644 nvim/.config/nvim/lua/plugins/languages/typst.lua diff --git a/fish/.config/fish/fish_plugins b/fish/.config/fish/fish_plugins index 08afdc3..15c8c9b 100644 --- a/fish/.config/fish/fish_plugins +++ b/fish/.config/fish/fish_plugins @@ -1,4 +1,3 @@ jorgebucaran/fisher jethrokuan/z patrickf1/fzf.fish -catppuccin/fish diff --git a/fish/.config/fish/fish_variables b/fish/.config/fish/fish_variables index e587024..b9b5365 100644 --- a/fish/.config/fish/fish_variables +++ b/fish/.config/fish/fish_variables @@ -1,17 +1,18 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR --export FZF_DEFAULT_OPTS:\x2d\x2dcolor\x3dbg\x2b\x3a\x23313244\x2cbg\x3a\x231e1e2e\x2cspinner\x3a\x23f5e0dc\x2chl\x3a\x23f38ba8\x20\x2d\x2dcolor\x3dfg\x3a\x23cdd6f4\x2cheader\x3a\x23f38ba8\x2cinfo\x3a\x23cba6f7\x2cpointer\x3a\x23f5e0dc\x20\x2d\x2dcolor\x3dmarker\x3a\x23f5e0dc\x2cfg\x2b\x3a\x23cdd6f4\x2cprompt\x3a\x23cba6f7\x2chl\x2b\x3a\x23f38ba8 +SETUVAR --export SSH_AGENT_PID:786479 +SETUVAR --export SSH_AUTH_SOCK:/tmp/ssh\x2dXXXXXXkRTHwG/agent\x2e786475 SETUVAR ZO_CMD:zo SETUVAR Z_CMD:z SETUVAR Z_DATA:/home/wball/\x2elocal/share/z/data SETUVAR Z_DATA_DIR:/home/wball/\x2elocal/share/z SETUVAR Z_EXCLUDE:\x5e/home/wball\x24 -SETUVAR __fish_initialized:3400 -SETUVAR _fisher_catppuccin_2F_fish_files:\x7e/\x2econfig/fish/themes/Catppuccin\x20Frappe\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Latte\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Macchiato\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Mocha\x2etheme +SETUVAR __fish_initialized:3800 SETUVAR _fisher_jethrokuan_2F_z_files:\x7e/\x2econfig/fish/functions/__z\x2efish\x1e\x7e/\x2econfig/fish/functions/__z_add\x2efish\x1e\x7e/\x2econfig/fish/functions/__z_clean\x2efish\x1e\x7e/\x2econfig/fish/functions/__z_complete\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/z\x2efish SETUVAR _fisher_jorgebucaran_2F_fisher_files:\x7e/\x2econfig/fish/functions/fisher\x2efish\x1e\x7e/\x2econfig/fish/completions/fisher\x2efish SETUVAR _fisher_patrickf1_2F_fzf_2E_fish_files:\x7e/\x2econfig/fish/functions/_fzf_configure_bindings_help\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_extract_var_info\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_changed_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_preview_file\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_diff_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_report_file_type\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_directory\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_log\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_git_status\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_history\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_processes\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_search_variables\x2efish\x1e\x7e/\x2econfig/fish/functions/_fzf_wrapper\x2efish\x1e\x7e/\x2econfig/fish/functions/fzf_configure_bindings\x2efish\x1e\x7e/\x2econfig/fish/conf\x2ed/fzf\x2efish\x1e\x7e/\x2econfig/fish/completions/fzf_configure_bindings\x2efish -SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejethrokuan/z\x1epatrickf1/fzf\x2efish\x1ecatppuccin/fish +SETUVAR _fisher_plugins:jorgebucaran/fisher\x1ejethrokuan/z\x1epatrickf1/fzf\x2efish SETUVAR _fisher_upgraded_to_4_4:\x1d SETUVAR fish_color_autosuggestion:8e908c SETUVAR fish_color_cancel:\x2d\x2dreverse @@ -34,7 +35,7 @@ SETUVAR fish_color_option:\x1d SETUVAR fish_color_param:4271ae SETUVAR fish_color_quote:718c00 SETUVAR fish_color_redirection:3e999f -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack +SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_status:f38ba8 SETUVAR fish_color_user:brgreen diff --git a/fish/.config/fish/functions/__z.fish b/fish/.config/fish/functions/__z.fish index f72ff0e..0b02005 100644 --- a/fish/.config/fish/functions/__z.fish +++ b/fish/.config/fish/functions/__z.fish @@ -14,7 +14,7 @@ function __z -d "Jump to a recent directory." function __z_legacy_escape_regex # taken from escape_string_pcre2 in fish # used to provide compatibility with fish 2 - for c in (string split '' $argv) + for c in (string split -- '' $argv) if contains $c (string split '' '.^$*+()?[{}\\|-]') printf \\ end @@ -123,15 +123,15 @@ function __z -d "Jump to a recent directory." for arg in $argv set -l escaped $arg if string escape --style=regex '' >/dev/null 2>&1 # use builtin escape if available - set escaped (string escape --style=regex $escaped) + set escaped (string escape --style=regex -- $escaped) else set escaped (__z_legacy_escape_regex $escaped) end # Need to escape twice, see https://www.math.utah.edu/docs/info/gawk_5.html#SEC32 - set escaped (string replace --all \\ \\\\ $escaped) + set escaped (string replace --all -- \\ \\\\ $escaped) set qs $qs $escaped end - set -l q (string join '.*' $qs) + set -l q (string join -- '.*' $qs) if set -q _flag_list # Handle list separately as it can print common path information to stderr diff --git a/fish/.config/fish/themes/Catppuccin Frappe.theme b/fish/.config/fish/themes/Catppuccin Frappe.theme deleted file mode 100644 index b4c1994..0000000 --- a/fish/.config/fish/themes/Catppuccin Frappe.theme +++ /dev/null @@ -1,30 +0,0 @@ -# name: 'Catppuccin Frappé' -# url: 'https://github.com/catppuccin/fish' -# preferred_background: 303446 - -fish_color_normal c6d0f5 -fish_color_command 8caaee -fish_color_param eebebe -fish_color_keyword e78284 -fish_color_quote a6d189 -fish_color_redirection f4b8e4 -fish_color_end ef9f76 -fish_color_comment 838ba7 -fish_color_error e78284 -fish_color_gray 737994 -fish_color_selection --background=414559 -fish_color_search_match --background=414559 -fish_color_option a6d189 -fish_color_operator f4b8e4 -fish_color_escape ea999c -fish_color_autosuggestion 737994 -fish_color_cancel e78284 -fish_color_cwd e5c890 -fish_color_user 81c8be -fish_color_host 8caaee -fish_color_host_remote a6d189 -fish_color_status e78284 -fish_pager_color_progress 737994 -fish_pager_color_prefix f4b8e4 -fish_pager_color_completion c6d0f5 -fish_pager_color_description 737994 \ No newline at end of file diff --git a/fish/.config/fish/themes/Catppuccin Latte.theme b/fish/.config/fish/themes/Catppuccin Latte.theme deleted file mode 100644 index 002dace..0000000 --- a/fish/.config/fish/themes/Catppuccin Latte.theme +++ /dev/null @@ -1,30 +0,0 @@ -# name: 'Catppuccin Latte' -# url: 'https://github.com/catppuccin/fish' -# preferred_background: eff1f5 - -fish_color_normal 4c4f69 -fish_color_command 1e66f5 -fish_color_param dd7878 -fish_color_keyword d20f39 -fish_color_quote 40a02b -fish_color_redirection ea76cb -fish_color_end fe640b -fish_color_comment 8c8fa1 -fish_color_error d20f39 -fish_color_gray 9ca0b0 -fish_color_selection --background=ccd0da -fish_color_search_match --background=ccd0da -fish_color_option 40a02b -fish_color_operator ea76cb -fish_color_escape e64553 -fish_color_autosuggestion 9ca0b0 -fish_color_cancel d20f39 -fish_color_cwd df8e1d -fish_color_user 179299 -fish_color_host 1e66f5 -fish_color_host_remote 40a02b -fish_color_status d20f39 -fish_pager_color_progress 9ca0b0 -fish_pager_color_prefix ea76cb -fish_pager_color_completion 4c4f69 -fish_pager_color_description 9ca0b0 \ No newline at end of file diff --git a/fish/.config/fish/themes/Catppuccin Macchiato.theme b/fish/.config/fish/themes/Catppuccin Macchiato.theme deleted file mode 100644 index c8be912..0000000 --- a/fish/.config/fish/themes/Catppuccin Macchiato.theme +++ /dev/null @@ -1,30 +0,0 @@ -# name: 'Catppuccin Macchiato' -# url: 'https://github.com/catppuccin/fish' -# preferred_background: 24273a - -fish_color_normal cad3f5 -fish_color_command 8aadf4 -fish_color_param f0c6c6 -fish_color_keyword ed8796 -fish_color_quote a6da95 -fish_color_redirection f5bde6 -fish_color_end f5a97f -fish_color_comment 8087a2 -fish_color_error ed8796 -fish_color_gray 6e738d -fish_color_selection --background=363a4f -fish_color_search_match --background=363a4f -fish_color_option a6da95 -fish_color_operator f5bde6 -fish_color_escape ee99a0 -fish_color_autosuggestion 6e738d -fish_color_cancel ed8796 -fish_color_cwd eed49f -fish_color_user 8bd5ca -fish_color_host 8aadf4 -fish_color_host_remote a6da95 -fish_color_status ed8796 -fish_pager_color_progress 6e738d -fish_pager_color_prefix f5bde6 -fish_pager_color_completion cad3f5 -fish_pager_color_description 6e738d \ No newline at end of file diff --git a/fish/.config/fish/themes/Catppuccin Mocha.theme b/fish/.config/fish/themes/Catppuccin Mocha.theme deleted file mode 100644 index 892a000..0000000 --- a/fish/.config/fish/themes/Catppuccin Mocha.theme +++ /dev/null @@ -1,30 +0,0 @@ -# name: 'Catppuccin Mocha' -# url: 'https://github.com/catppuccin/fish' -# preferred_background: 1e1e2e - -fish_color_normal cdd6f4 -fish_color_command 89b4fa -fish_color_param f2cdcd -fish_color_keyword f38ba8 -fish_color_quote a6e3a1 -fish_color_redirection f5c2e7 -fish_color_end fab387 -fish_color_comment 7f849c -fish_color_error f38ba8 -fish_color_gray 6c7086 -fish_color_selection --background=313244 -fish_color_search_match --background=313244 -fish_color_option a6e3a1 -fish_color_operator f5c2e7 -fish_color_escape eba0ac -fish_color_autosuggestion 6c7086 -fish_color_cancel f38ba8 -fish_color_cwd f9e2af -fish_color_user 94e2d5 -fish_color_host 89b4fa -fish_color_host_remote a6e3a1 -fish_color_status f38ba8 -fish_pager_color_progress 6c7086 -fish_pager_color_prefix f5c2e7 -fish_pager_color_completion cdd6f4 -fish_pager_color_description 6c7086 \ No newline at end of file diff --git a/gtk/.config/gtk-4.0/gtk.css b/gtk/.config/gtk-4.0/gtk.css index 64c61fd..1ed6b73 100644 --- a/gtk/.config/gtk-4.0/gtk.css +++ b/gtk/.config/gtk-4.0/gtk.css @@ -10,3 +10,4 @@ window.csd, /* gtk4? */ window.csd decoration { /* gtk3 */ box-shadow: none; } +@import 'colors.css'; \ No newline at end of file diff --git a/nvim/.config/nvim/after/ftplugin/haskell.lua b/nvim/.config/nvim/after/ftplugin/haskell.lua index 4ce8999..aac69d4 100644 --- a/nvim/.config/nvim/after/ftplugin/haskell.lua +++ b/nvim/.config/nvim/after/ftplugin/haskell.lua @@ -1 +1,13 @@ require('haskell-tools').lsp.start() + +local ht = require('haskell-tools') +local bufnr = vim.api.nvim_get_current_buf() +local opts = { noremap = true, silent = true, buffer = bufnr, } +vim.keymap.set('n', 'cl', vim.lsp.codelens.run, opts) +vim.keymap.set('n', 'hs', ht.hoogle.hoogle_signature, opts) +vim.keymap.set('n', 'ea', ht.lsp.buf_eval_all, opts) +vim.keymap.set('n', 'rr', ht.repl.toggle, opts) +vim.keymap.set('n', 'rf', function() + ht.repl.toggle(vim.api.nvim_buf_get_name(0)) +end, opts) +vim.keymap.set('n', 'rq', ht.repl.quit, opts) diff --git a/nvim/.config/nvim/lua/options.lua b/nvim/.config/nvim/lua/options.lua index fbe552d..d818128 100644 --- a/nvim/.config/nvim/lua/options.lua +++ b/nvim/.config/nvim/lua/options.lua @@ -34,3 +34,5 @@ vim.api.nvim_create_autocmd('TermOpen', { vim.opt.relativenumber = false end }) + +vim.cmd([[call digraph_set('|-', '⊢')]]) diff --git a/nvim/.config/nvim/lua/plugins/languages/coq.lua b/nvim/.config/nvim/lua/plugins/languages/coq.lua index 12aef56..b8fbfcd 100644 --- a/nvim/.config/nvim/lua/plugins/languages/coq.lua +++ b/nvim/.config/nvim/lua/plugins/languages/coq.lua @@ -5,7 +5,6 @@ return { init = function() vim.g.loaded_coqtail = 1 vim.g['coqtail#supported'] = 0 - vim.cmd([[call digraph_set('|-', '⊢')]]) end }, { diff --git a/nvim/.config/nvim/lua/plugins/languages/typst.lua b/nvim/.config/nvim/lua/plugins/languages/typst.lua new file mode 100644 index 0000000..4c86ca5 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/languages/typst.lua @@ -0,0 +1,8 @@ +return { + { + 'chomosuke/typst-preview.nvim', + ft = typst, + version = '1.*', + opts = {}, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua index b4187c5..7e0e82b 100644 --- a/nvim/.config/nvim/lua/plugins/lsp.lua +++ b/nvim/.config/nvim/lua/plugins/lsp.lua @@ -10,6 +10,14 @@ return { capabilities = capabilities }) + lspconfig.tinymist.setup({ + settings = { + formatterMode = "typstyle", + exportPdf = "onType", + semanticTokens = "disable", + } + }) + vim.api.nvim_create_autocmd('LspAttach', { group = vim.api.nvim_create_augroup('UserLspConfig', {}), callback = function(ev)