Merge branch 'master' of ssh://git.beckmeyer.us:8101/TnSb/dotfiles
This commit is contained in:
commit
0a0186fe64
@ -5,6 +5,7 @@
|
||||
ui = auto
|
||||
[push]
|
||||
default = current
|
||||
autoSetupRemote = true
|
||||
[filesystem "N/A|13.0.2|/dev/sda2"]
|
||||
timestampResolution = 10000 nanoseconds
|
||||
minRacyThreshold = 6379 microseconds
|
||||
|
||||
@ -37,6 +37,9 @@ vim.keymap.set('i', '<S-Tab>', function()
|
||||
return '<S-Tab>'
|
||||
end, { expr=true })
|
||||
|
||||
-- Code search? https://news.ycombinator.com/item?id=41739452
|
||||
vim.keymap.set('n', 'gv', '<c-w>v<cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||
|
||||
-- Tab stuff
|
||||
vim.opt.shiftwidth = 2
|
||||
vim.opt.softtabstop = 2
|
||||
|
||||
@ -1,119 +0,0 @@
|
||||
-- Automatically generated packer.nvim plugin loader code
|
||||
|
||||
if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then
|
||||
vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"')
|
||||
return
|
||||
end
|
||||
|
||||
vim.api.nvim_command('packadd packer.nvim')
|
||||
|
||||
local no_errors, error_msg = pcall(function()
|
||||
|
||||
_G._packer = _G._packer or {}
|
||||
_G._packer.inside_compile = true
|
||||
|
||||
local time
|
||||
local profile_info
|
||||
local should_profile = false
|
||||
if should_profile then
|
||||
local hrtime = vim.loop.hrtime
|
||||
profile_info = {}
|
||||
time = function(chunk, start)
|
||||
if start then
|
||||
profile_info[chunk] = hrtime()
|
||||
else
|
||||
profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6
|
||||
end
|
||||
end
|
||||
else
|
||||
time = function(chunk, start) end
|
||||
end
|
||||
|
||||
local function save_profiles(threshold)
|
||||
local sorted_times = {}
|
||||
for chunk_name, time_taken in pairs(profile_info) do
|
||||
sorted_times[#sorted_times + 1] = {chunk_name, time_taken}
|
||||
end
|
||||
table.sort(sorted_times, function(a, b) return a[2] > b[2] end)
|
||||
local results = {}
|
||||
for i, elem in ipairs(sorted_times) do
|
||||
if not threshold or threshold and elem[2] > threshold then
|
||||
results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms'
|
||||
end
|
||||
end
|
||||
if threshold then
|
||||
table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)')
|
||||
end
|
||||
|
||||
_G._packer.profile_output = results
|
||||
end
|
||||
|
||||
time([[Luarocks path setup]], true)
|
||||
local package_path_str = "/home/joel/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/joel/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/joel/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/joel/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
|
||||
local install_cpath_pattern = "/home/joel/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
|
||||
if not string.find(package.path, package_path_str, 1, true) then
|
||||
package.path = package.path .. ';' .. package_path_str
|
||||
end
|
||||
|
||||
if not string.find(package.cpath, install_cpath_pattern, 1, true) then
|
||||
package.cpath = package.cpath .. ';' .. install_cpath_pattern
|
||||
end
|
||||
|
||||
time([[Luarocks path setup]], false)
|
||||
time([[try_loadstring definition]], true)
|
||||
local function try_loadstring(s, component, name)
|
||||
local success, result = pcall(loadstring(s), name, _G.packer_plugins[name])
|
||||
if not success then
|
||||
vim.schedule(function()
|
||||
vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {})
|
||||
end)
|
||||
end
|
||||
return result
|
||||
end
|
||||
|
||||
time([[try_loadstring definition]], false)
|
||||
time([[Defining packer_plugins]], true)
|
||||
_G.packer_plugins = {
|
||||
["coc.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/joel/.local/share/nvim/site/pack/packer/start/coc.nvim",
|
||||
url = "https://github.com/neoclide/coc.nvim"
|
||||
},
|
||||
["gruvbox.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/joel/.local/share/nvim/site/pack/packer/start/gruvbox.nvim",
|
||||
url = "https://github.com/ellisonleao/gruvbox.nvim"
|
||||
},
|
||||
["indent-blankline.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/joel/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim",
|
||||
url = "https://github.com/lukas-reineke/indent-blankline.nvim"
|
||||
},
|
||||
["nvim-treesitter"] = {
|
||||
loaded = true,
|
||||
path = "/home/joel/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
|
||||
url = "https://github.com/nvim-treesitter/nvim-treesitter"
|
||||
},
|
||||
["packer.nvim"] = {
|
||||
loaded = true,
|
||||
path = "/home/joel/.local/share/nvim/site/pack/packer/start/packer.nvim",
|
||||
url = "https://github.com/wbthomason/packer.nvim"
|
||||
}
|
||||
}
|
||||
|
||||
time([[Defining packer_plugins]], false)
|
||||
|
||||
_G._packer.inside_compile = false
|
||||
if _G._packer.needs_bufread == true then
|
||||
vim.cmd("doautocmd BufRead")
|
||||
end
|
||||
_G._packer.needs_bufread = false
|
||||
|
||||
if should_profile then save_profiles() end
|
||||
|
||||
end)
|
||||
|
||||
if not no_errors then
|
||||
error_msg = error_msg:gsub('"', '\\"')
|
||||
vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None')
|
||||
end
|
||||
@ -1,3 +1,4 @@
|
||||
Net/SoundThemeName "ocean"
|
||||
Gdk/UnscaledDPI 98304
|
||||
Gdk/WindowScalingFactor 1
|
||||
Gtk/ButtonImages 1
|
||||
@ -7,8 +8,8 @@ Gtk/DecorationLayout "icon:minimize,maximize,close"
|
||||
Gtk/EnableAnimations 1
|
||||
Gtk/FontName "Noto Sans, 10"
|
||||
Gtk/MenuImages 1
|
||||
Gtk/PrimaryButtonWarpsSlider 0
|
||||
Gtk/PrimaryButtonWarpsSlider 1
|
||||
Gtk/ToolbarStyle 3
|
||||
Net/IconThemeName "breeze-dark"
|
||||
Net/ThemeName "Breeze"
|
||||
Net/ThemeName "Breeze-Dark"
|
||||
|
||||
|
||||
@ -33,7 +33,6 @@ zstyle ':vcs_info:*' formats ' %F{green}%b'
|
||||
PROMPT='%F{yellow}%n@%m %F{white}%1~%(?.. %?) $ '
|
||||
RPROMPT='%f$vcs_info_msg_0_ '
|
||||
|
||||
alias adb='HOME="$XDG_DATA_HOME"/android adb'
|
||||
alias boinctui='boinctui --boinchost=localhost'
|
||||
alias bt='bluetoothctl'
|
||||
alias c='clear'
|
||||
@ -58,13 +57,29 @@ if [[ -n "$WSL_DISTRO_NAME" ]]; then
|
||||
fi
|
||||
|
||||
# GPG setup (and SSH)
|
||||
ssh-add ~/.ssh/id_rsa
|
||||
# SSH setup
|
||||
# I finally figured out how to export my id_rsa from GPG using
|
||||
# https://superuser.com/a/1681454 (copied/summarized here to avoid link rot):
|
||||
# 0. Run `gpg -K --with-keygrip` and note the desired keygrip (probably the one
|
||||
# with [A] for auth).
|
||||
# 1. Run `gpgsm --gen-key -o tempcert`:
|
||||
# a. Select "Existing Key".
|
||||
# b. Enter the keygrip from step 0.
|
||||
# c. Select "(1) sign, encrypt". This and following steps don't really apply
|
||||
# for our use case, but we need to do it to make the tool happy.
|
||||
# d. Enter some valid X.509 subject, e.g. "C=US".
|
||||
# e. Press enter for rest of fields.
|
||||
# f. "y" to create self-signed certificate.
|
||||
# g. "y" to proceed with creation.
|
||||
# 2. `gpgsm --import tempcert` and `gpgsm -K` to get the (new) keyid.
|
||||
# 3. `gpgsm --export-secret-key-p8 -a -o id_rsa $keyid`
|
||||
# 4. (optional) `rm tempcert`, probably don't want that sitting around.
|
||||
# 5. (optional) Trim the phony metadata we gave to gpgsm that is prepended to
|
||||
# the exported PEM cert (id_rsa).
|
||||
if command -v keychain >/dev/null; then
|
||||
alias keychain="keychain --nolock --absolute --dir $XDG_RUNTIME_DIR"
|
||||
eval "$(keychain --quick --eval --agents gpg D7F966B85D985743C76A17AC5A9572AE7B2E7E1C)"
|
||||
fi
|
||||
if command -v gpgconf >/dev/null; then
|
||||
SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
|
||||
export SSH_AUTH_SOCK
|
||||
eval "$(keychain --quick --eval)"
|
||||
fi
|
||||
### End user configuration
|
||||
|
||||
|
||||
36
dot_ideavimrc
Normal file
36
dot_ideavimrc
Normal file
@ -0,0 +1,36 @@
|
||||
" .ideavimrc is a configuration file for IdeaVim plugin. It uses
|
||||
" the same commands as the original .vimrc configuration.
|
||||
" You can find a list of commands here: https://jb.gg/h38q75
|
||||
" Find more examples here: https://jb.gg/share-ideavimrc
|
||||
|
||||
|
||||
"" -- Suggested options --
|
||||
" Show a few lines of context around the cursor. Note that this makes the
|
||||
" text scroll if you mouse-click near the start or end of the window.
|
||||
set scrolloff=5
|
||||
|
||||
" Do incremental searching.
|
||||
set incsearch
|
||||
|
||||
" Don't use Ex mode, use Q for formatting.
|
||||
map Q gq
|
||||
|
||||
" --- Enable IdeaVim plugins https://jb.gg/ideavim-plugins
|
||||
|
||||
" Highlight copied text
|
||||
Plug 'machakann/vim-highlightedyank'
|
||||
" Commentary plugin
|
||||
Plug 'tpope/vim-commentary'
|
||||
|
||||
|
||||
"" -- Map IDE actions to IdeaVim -- https://jb.gg/abva4t
|
||||
"" Map \r to the Reformat Code action
|
||||
"map \r <Action>(ReformatCode)
|
||||
|
||||
"" Map <leader>d to start debug
|
||||
"map <leader>d <Action>(Debug)
|
||||
|
||||
"" Map \b to toggle the breakpoint on the current line
|
||||
"map \b <Action>(ToggleLineBreakpoint)
|
||||
|
||||
set clipboard+=unnamedplus
|
||||
4
dot_local/bin/executable_xxupdatephp
Normal file
4
dot_local/bin/executable_xxupdatephp
Normal file
@ -0,0 +1,4 @@
|
||||
#!/bin/bash
|
||||
xxautobump php8.{1,2,3}{-{apcu,ast,igbinary,imagick,mongodb,redis},} composer8.{1,2,3}
|
||||
git add .
|
||||
xbump :
|
||||
Loading…
Reference in New Issue
Block a user