diff --git a/.config/fish/functions/define_aliases.fish b/.config/fish/functions/define_aliases.fish index 8413c1f..51955bc 100644 --- a/.config/fish/functions/define_aliases.fish +++ b/.config/fish/functions/define_aliases.fish @@ -13,6 +13,7 @@ function define_aliases -a uname -d 'Defines aliases for commonly used commands' alias age-k 'age --decrypt --identity ~/.secrets/id_ed25519 ~/.secrets/age_keys.age' alias bb 'bun --bun' alias pn pnpm + alias nv 'neovide --fork; and clear' switch "$uname" case Linux diff --git a/.config/fish/functions/fish_user_key_bindings.fish b/.config/fish/functions/fish_user_key_bindings.fish index 659faf4..2e8c3e2 100644 --- a/.config/fish/functions/fish_user_key_bindings.fish +++ b/.config/fish/functions/fish_user_key_bindings.fish @@ -3,7 +3,7 @@ function fish_user_key_bindings bind --mode insert ,a 'ssh_add; commandline -f repaint' bind --mode insert ,p 'nvim +"Telescope git_files"; commandline -f repaint' bind --mode insert ,f 'nvim +"Telescope find_files"; commandline -f repaint' - bind --mode insert ,n 'nvim +Neotree; commandline -f repaint' + bind --mode insert ,n 'nvim .; commandline -f repaint' bind --mode insert ,s 'sysz; commandline -f repaint' bind --mode insert ,z 'zi; commandline -f repaint' bind --mode insert ,t 'fzf-file-widget' diff --git a/.config/fish/functions/sshre.fish b/.config/fish/functions/sshre.fish index 8a14add..47a6c4a 100644 --- a/.config/fish/functions/sshre.fish +++ b/.config/fish/functions/sshre.fish @@ -1,6 +1,6 @@ function sshre -d 'Remove list of hosts from ssh known_hosts' alias ssh-rm 'ssh-keygen -f ~/.ssh/known_hosts -R' - set -l hosts kamino khetanna marauder malevolence pi.hole git + set -l hosts 10.0.0.1 10.0.0.5 git.mjfs.us dns cloud net git set -l domains lan m if test -n "$argv" diff --git a/.config/nvim/config.vim b/.config/nvim/config.vim index 07db54a..27654e4 100644 --- a/.config/nvim/config.vim +++ b/.config/nvim/config.vim @@ -26,7 +26,8 @@ inoremap jj let mapleader = ',' nnoremap f ALEFix nnoremap a ALEToggle -nnoremap n Neotree +nnoremap nn Neotree toggle show git_status +nnoremap np Neotree float reveal_force_cwd nnoremap t Telescope nnoremap p Telescope git_files nnoremap Telescope find_files @@ -50,7 +51,9 @@ vnoremap // y/\V=escape(@",'/\') colorscheme kanagawa -let g:neovide_scale_factor = 0.7 +let g:neovide_scale_factor = 0.75 +let g:neovide_transparency = 0.7 +let g:neovide_cursor_vfx_mode = 'sonicboom' let g:ale_linters_explicit = 1 let g:ale_completion_enabled = 0 diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index e0817cc..1caa656 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -37,17 +37,27 @@ plug("nvim-treesitter/nvim-treesitter-context") vim.call("plug#end") -vim.opt.guifont = { "JetBrainsMono Nerd Font", "h13" } +vim.opt.guifont = "JetBrainsMono Nerd Font:h13" vim.g.coq_settings = { auto_start = true } +require("neo-tree").setup() + require("kanagawa").setup({ - transparent = true, + transparent = not vim.g.neovide, }) require("bufferline").setup({ options = { - separator_style = "slant", + separator_style = "slope", + offsets = { + { + filetype = "neo-tree", + text = "explorer", + highlight = "Directory", + separator = true, -- use a "true" to enable the default, or set your own character + }, + }, }, }) @@ -103,13 +113,15 @@ require("nvim-treesitter.configs").setup({ "c", "lua", "vim", + "regex", "fish", "typescript", "javascript", + "tsx", "go", "elixir", "vue", - "regex", + "groovy", }, -- Automatically install missing parsers when entering buffer diff --git a/.config/starship.toml b/.config/starship.toml index beb01b5..b4d8f70 100644 --- a/.config/starship.toml +++ b/.config/starship.toml @@ -13,181 +13,184 @@ magenta = '#957fb8' cyan = '#6a9589' white = '#c8c093' -[jobs] -symbol = "" - +#[jobs] +#symbol = "" +# [aws] disabled = true -symbol = " " - +#symbol = " " +# +[gcloud] +disabled = true +# [ruby] disabled = true -symbol = " " - +#symbol = " " +# [nodejs] disabled = false -symbol = " " - -[buf] -symbol = "Buf " - -[bun] -symbol = " " - -[c] -symbol = " " - -[conda] -symbol = " " - -[crystal] -symbol = " " - -[dart] -symbol = " " - -[directory] -read_only = " 󰌾" - -[docker_context] -symbol = " " - -[elixir] -symbol = " " - -[elm] -symbol = " " - -[fennel] -symbol = " " - -[fossil_branch] -symbol = " " - -[git_branch] -symbol = " " - -[git_status] -ahead = '^' -behind = 'v' -deleted = "x" - -[golang] -symbol = " " - -[guix_shell] -symbol = " " - -[haskell] -symbol = " " - -[haxe] -symbol = " " - -[hg_branch] -symbol = " " - -[hostname] -ssh_symbol = " " - -[java] -symbol = " " - -[julia] -symbol = " " - -[kotlin] -symbol = " " - -[lua] -symbol = " " - -[memory_usage] -symbol = "󰍛 " - -[meson] -symbol = "󰔷 " - -[nim] -symbol = "󰆥 " - -[nix_shell] -symbol = " " - -[ocaml] -symbol = " " - -[os.symbols] -Alpaquita = " " -Alpine = " " -AlmaLinux = " " -Amazon = " " -Android = " " -Arch = " " -Artix = " " -CentOS = " " -Debian = " " -DragonFly = " " -Emscripten = " " -EndeavourOS = " " -Fedora = " " -FreeBSD = " " -Garuda = "󰛓 " -Gentoo = " " -HardenedBSD = "󰞌 " -Illumos = "󰈸 " -Kali = " " -Linux = " " -Mabox = " " -Macos = " " -Manjaro = " " -Mariner = " " -MidnightBSD = " " -Mint = " " -NetBSD = " " -NixOS = " " -OpenBSD = "󰈺 " -openSUSE = " " -OracleLinux = "󰌷 " -Pop = " " -Raspbian = " " -Redhat = " " -RedHatEnterprise = " " -RockyLinux = " " -Redox = "󰀘 " -Solus = "󰠳 " -SUSE = " " -Ubuntu = " " -Unknown = " " -Void = " " -Windows = "󰍲 " - -[package] -symbol = "󰏗 " - -[perl] -symbol = " " - -[php] -symbol = " " - -[pijul_channel] -symbol = " " - -[python] -symbol = " " - -[rlang] -symbol = "󰟔 " - -[rust] -symbol = " " - -[scala] -symbol = " " - -[swift] -symbol = " " - -[zig] -symbol = " " +#symbol = " " +# +#[buf] +#symbol = "Buf " +# +#[bun] +#symbol = " " +# +#[c] +#symbol = " " +# +#[conda] +#symbol = " " +# +#[crystal] +#symbol = " " +# +#[dart] +#symbol = " " +# +#[directory] +#read_only = " 󰌾" +# +#[docker_context] +#symbol = " " +# +#[elixir] +#symbol = " " +# +#[elm] +#symbol = " " +# +#[fennel] +#symbol = " " +# +#[fossil_branch] +#symbol = " " +# +#[git_branch] +#symbol = " " +# +#[git_status] +#ahead = '^' +#behind = 'v' +#deleted = "x" +# +#[golang] +#symbol = " " +# +#[guix_shell] +#symbol = " " +# +#[haskell] +#symbol = " " +# +#[haxe] +#symbol = " " +# +#[hg_branch] +#symbol = " " +# +#[hostname] +#ssh_symbol = " " +# +#[java] +#symbol = " " +# +#[julia] +#symbol = " " +# +#[kotlin] +#symbol = " " +# +#[lua] +#symbol = " " +# +#[memory_usage] +#symbol = "󰍛 " +# +#[meson] +#symbol = "󰔷 " +# +#[nim] +#symbol = "󰆥 " +# +#[nix_shell] +#symbol = " " +# +#[ocaml] +#symbol = " " +# +#[os.symbols] +#Alpaquita = " " +#Alpine = " " +#AlmaLinux = " " +#Amazon = " " +#Android = " " +#Arch = " " +#Artix = " " +#CentOS = " " +#Debian = " " +#DragonFly = " " +#Emscripten = " " +#EndeavourOS = " " +#Fedora = " " +#FreeBSD = " " +#Garuda = "󰛓 " +#Gentoo = " " +#HardenedBSD = "󰞌 " +#Illumos = "󰈸 " +#Kali = " " +#Linux = " " +#Mabox = " " +#Macos = " " +#Manjaro = " " +#Mariner = " " +#MidnightBSD = " " +#Mint = " " +#NetBSD = " " +#NixOS = " " +#OpenBSD = "󰈺 " +#openSUSE = " " +#OracleLinux = "󰌷 " +#Pop = " " +#Raspbian = " " +#Redhat = " " +#RedHatEnterprise = " " +#RockyLinux = " " +#Redox = "󰀘 " +#Solus = "󰠳 " +#SUSE = " " +#Ubuntu = " " +#Unknown = " " +#Void = " " +#Windows = "󰍲 " +# +#[package] +#symbol = "󰏗 " +# +#[perl] +#symbol = " " +# +#[php] +#symbol = " " +# +#[pijul_channel] +#symbol = " " +# +#[python] +#symbol = " " +# +#[rlang] +#symbol = "󰟔 " +# +#[rust] +#symbol = " " +# +#[scala] +#symbol = " " +# +#[swift] +#symbol = " " +# +#[zig] +#symbol = " " diff --git a/.wezterm.lua b/.wezterm.lua index e39826b..629a45e 100644 --- a/.wezterm.lua +++ b/.wezterm.lua @@ -26,7 +26,7 @@ config.colors = { indexed = { [16] = "#ffa066", [17] = "#ff5d62" }, } -config.window_background_opacity = is_darwin() and 0.7 or 0.65 +config.window_background_opacity = 0.7 config.window_decorations = "RESIZE" config.font_size = is_darwin() and 13 or 11