From e1085d7e6d3e0df80cca79cb468366f046e8cfed Mon Sep 17 00:00:00 2001 From: Alec Goncharow Date: Thu, 1 Feb 2024 22:57:14 -0500 Subject: neovide is kinda cool --- .config/nvim/init.lua | 4 ++++ .config/nvim/lua/autosession_conf.lua | 21 +++++++++++++++++++++ .config/nvim/lua/lspsaga_conf.lua | 3 ++- .config/nvim/lua/neovide_conf.lua | 18 ++++++++++++++++++ .config/nvim/lua/plugins.lua | 11 +---------- .config/nvim/lua/settings.lua | 24 +++++++++++++----------- .config/sway/config | 3 +++ .zimrc | 2 +- .zshrc | 2 ++ bin/zigup | 9 ++++++++- 10 files changed, 73 insertions(+), 24 deletions(-) create mode 100644 .config/nvim/lua/autosession_conf.lua create mode 100644 .config/nvim/lua/neovide_conf.lua diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 5b9d3fd..34a7ff8 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -13,7 +13,11 @@ require('jabs_conf') require('lspsaga_conf') require('nerdcommenter_conf') require('bqf_conf') +require('autosession_conf') +if vim.g.neovide then + require('neovide_conf') +end --- basic plugins setup require('autoclose').setup() diff --git a/.config/nvim/lua/autosession_conf.lua b/.config/nvim/lua/autosession_conf.lua new file mode 100644 index 0000000..5c2a76d --- /dev/null +++ b/.config/nvim/lua/autosession_conf.lua @@ -0,0 +1,21 @@ +local opts = { + log_level = 'error', + auto_session_enable_last_session = false, + auto_session_root_dir = vim.fn.stdpath('data') .. "/sessions/", + auto_session_enabled = true, + auto_save_enabled = true, + auto_restore_enabled = true, + auto_session_suppress_dirs = { "~/", "~/Downloads", "/" }, + auto_session_use_git_branch = nil, + -- the configs below are lua only + bypass_session_save_file_types = nil, + cwd_change_handling = { -- table: Config for handling the DirChangePre and DirChanged autocmds, can be set to nil to disable altogether + restore_upcoming_session = true, -- boolean: restore session for upcoming cwd on cwd change + pre_cwd_changed_hook = nil, -- function: This is called after auto_session code runs for the `DirChangedPre` autocmd + post_cwd_changed_hook = nil, -- function: This is called after auto_session code runs for the `DirChanged` autocmd + }, +} + +vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions" + +require('auto-session').setup(opts) diff --git a/.config/nvim/lua/lspsaga_conf.lua b/.config/nvim/lua/lspsaga_conf.lua index 4400dd3..2385b4a 100644 --- a/.config/nvim/lua/lspsaga_conf.lua +++ b/.config/nvim/lua/lspsaga_conf.lua @@ -89,7 +89,8 @@ require('lspsaga').setup({ }) Nmap('', ':Lspsaga outline') -Nmap('', ':Lspsaga show_buf_diagnostics') +-- Nmap('', ':Lspsaga show_buf_diagnostics') +Nmap('', ':Lspsaga show_buf_diagnostics') Nmap('', ':Lspsaga code_action') Nmap('ca', ':Lspsaga code_action') Nmap('gr', ':Lspsaga finder ref') diff --git a/.config/nvim/lua/neovide_conf.lua b/.config/nvim/lua/neovide_conf.lua new file mode 100644 index 0000000..46d732c --- /dev/null +++ b/.config/nvim/lua/neovide_conf.lua @@ -0,0 +1,18 @@ +vim.g.neovide_transparency = 0.95 +-- vim.g.neovide_refresh_rate = 144 +vim.g.neovide_cursor_vfx_mode = 'wireframe' +vim.g.neovide_cursor_animation_length = 0.03 +vim.g.neovide_cursor_trail_size = 0.9 +vim.o.guifont = "Fira Mono:h13" + +vim.cmd([[ + " ### Transparency ### + hi Normal guibg=#062625 + hi LineNr guibg=#062625 + hi Folded guibg=#062625 + hi NonText guibg=#062625 + hi SpecialKey guibg=#062625 + hi VertSplit guibg=#062625 + hi SignColumn guibg=#062625 + hi EndOfBuffer guibg=#062625 + ]]) diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 4e10a81..310c42f 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -123,16 +123,7 @@ return require('packer').startup(function() use 'tpope/vim-dadbod' -- SQL use 'nanotee/sqls.nvim' - use { - 'rmagatti/auto-session', - config = function() - vim.o.sessionoptions = "blank,buffers,curdir,folds,help,tabpages,winsize,winpos,terminal,localoptions" - require("auto-session").setup { - log_level = "error", - auto_session_suppress_dirs = { "~/", "~/Downloads", "/" }, - } - end - } + use 'rmagatti/auto-session' -- auto close delimiters because lazy use 'm4xshen/autoclose.nvim' end) diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua index 04dc1a1..3e9207d 100644 --- a/.config/nvim/lua/settings.lua +++ b/.config/nvim/lua/settings.lua @@ -105,18 +105,20 @@ autocmd Syntax * syntax keyword Todo note NOTE fixme FIXME todo TODO speed SPEED vim.cmd('colorscheme yaks') -vim.cmd([[ -" ### Transparency ### -hi Normal guibg=none ctermbg=none -hi LineNr guibg=none ctermbg=none -hi Folded guibg=none ctermbg=none -hi NonText guibg=none ctermbg=none -hi SpecialKey guibg=none ctermbg=none -hi VertSplit guibg=none ctermbg=none -hi SignColumn guibg=none ctermbg=none -hi EndOfBuffer guibg=none ctermbg=none -]]) +if not vim.g.neovide then + vim.cmd([[ + " ### Transparency ### + hi Normal guibg=none ctermbg=none + hi LineNr guibg=none ctermbg=none + hi Folded guibg=none ctermbg=none + hi NonText guibg=none ctermbg=none + hi SpecialKey guibg=none ctermbg=none + hi VertSplit guibg=none ctermbg=none + hi SignColumn guibg=none ctermbg=none + hi EndOfBuffer guibg=none ctermbg=none + ]]) +end -- Commands mode vim.o.wildmenu = true -- on TAB, complete options for system command vim.o.wildignore = diff --git a/.config/sway/config b/.config/sway/config index 947081a..b965ee7 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -28,6 +28,8 @@ floating_modifier $mod # start a terminal set $my-term alacritty bindsym $mod+Return exec --no-startup-id $my-term +bindsym $mod+t exec --no-startup-id $my-term +bindsym $mod+n exec --no-startup-id neovide # kill focused window bindsym $mod+Shift+q exec --no-startup-id ~/bin/safequit @@ -225,6 +227,7 @@ for_window { [class="firefox"] border none [app_id="firefox"] border none [app_id="Alacritty"] border pixel 2 + [app_id="neovide"] border pixel 2 [class="steam"] border none [class="Godot"] floating enable [window_role="pop-up"] floating enable diff --git a/.zimrc b/.zimrc index c6979b9..5a8dc08 100644 --- a/.zimrc +++ b/.zimrc @@ -47,7 +47,7 @@ zmodule zsh-users/zsh-autosuggestions # }}} End configuration added by Zim install # Adds aliases and better defaults for exa. -zmodule exa +# zmodule exa # Configures fzf for faster fetching of files and directories names. zmodule fzf # Provides a convenient way to load ssh-agent. diff --git a/.zshrc b/.zshrc index 1497cb3..7590429 100644 --- a/.zshrc +++ b/.zshrc @@ -143,6 +143,8 @@ source ~/.fzf/shell/completion.zsh source ~/.fzf/shell/key-bindings.zsh fpath=(~/code/github/zig/shell-completions $fpath) +export LS_COLORS="$(vivid generate catppuccin-mocha)" + if [[ -f "$HOME/.zig/env" ]]; then source ~/.zig/env fi diff --git a/bin/zigup b/bin/zigup index 20bc032..7aa7fca 100755 --- a/bin/zigup +++ b/bin/zigup @@ -97,6 +97,14 @@ fi cd "$(dirname "$0")" main() { + # Transform long options to short ones + for arg in "$@"; do + shift + case "$arg" in + '--force') set -- "$@" '-f' ;; + *) set -- "$@" "$arg" ;; + esac + done force=0 while getopts "f" o; do case "${o}" in @@ -162,7 +170,6 @@ esac if [[ $force == 0 && "$installed_zig_version" == "$zig_master_version" ]]; then echo "zig up to date" - exit 0 else echo "zig upgrade avaliable: $installed_zig_version -> $zig_master_version" if prompt_confirm "Proceed?"; then -- cgit v1.2.3-70-g09d2