mirror of
https://github.com/ivuorinen/dotfiles.git
synced 2026-02-05 22:49:37 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7d2fc55791 | |||
| 74fb12f093 | |||
|
|
d7988bcad7 | ||
| 320ae35dcd |
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"diagnostics.globals": [
|
"diagnostics.globals": [
|
||||||
"vim"
|
"vim"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,13 @@ repos:
|
|||||||
- repo: https://github.com/pre-commit/pre-commit-hooks
|
- repo: https://github.com/pre-commit/pre-commit-hooks
|
||||||
rev: v5.0.0
|
rev: v5.0.0
|
||||||
hooks:
|
hooks:
|
||||||
|
- id: requirements-txt-fixer
|
||||||
|
- id: detect-private-key
|
||||||
- id: trailing-whitespace
|
- id: trailing-whitespace
|
||||||
args: [--markdown-linebreak-ext=md]
|
args: [--markdown-linebreak-ext=md]
|
||||||
- id: check-case-conflict
|
- id: check-case-conflict
|
||||||
- id: check-merge-conflict
|
- id: check-merge-conflict
|
||||||
|
- id: check-executables-have-shebangs
|
||||||
- id: check-shebang-scripts-are-executable
|
- id: check-shebang-scripts-are-executable
|
||||||
- id: check-symlinks
|
- id: check-symlinks
|
||||||
- id: check-toml
|
- id: check-toml
|
||||||
@@ -29,11 +32,6 @@ repos:
|
|||||||
hooks:
|
hooks:
|
||||||
- id: yamllint
|
- id: yamllint
|
||||||
|
|
||||||
- repo: https://github.com/pre-commit/mirrors-prettier
|
|
||||||
rev: v4.0.0-alpha.8
|
|
||||||
hooks:
|
|
||||||
- id: prettier
|
|
||||||
|
|
||||||
- repo: https://github.com/shellcheck-py/shellcheck-py
|
- repo: https://github.com/shellcheck-py/shellcheck-py
|
||||||
rev: v0.10.0.1
|
rev: v0.10.0.1
|
||||||
hooks:
|
hooks:
|
||||||
|
|||||||
@@ -1,12 +1,14 @@
|
|||||||
|
# vim: ft=gitignore
|
||||||
.mypy_cache/*
|
.mypy_cache/*
|
||||||
Brewfile.lock.json
|
Brewfile.lock.json
|
||||||
config/cheat/cheatsheets/community
|
config/cheat/cheatsheets/community
|
||||||
config/cheat/cheatsheets/tldr
|
config/cheat/cheatsheets/tldr
|
||||||
config/fzf/*
|
config/fzf/*
|
||||||
config/nvim-kickstart/*
|
config/nvim/*
|
||||||
config/tmux/plugins/*
|
config/tmux/plugins/*
|
||||||
config/zsh/*
|
config/zsh/*
|
||||||
lazy-lock.json
|
lazy-lock.json
|
||||||
local/bin/antigen.zsh
|
local/bin/antigen.zsh
|
||||||
local/bin/asdf
|
local/bin/asdf
|
||||||
|
tools/antidote/*
|
||||||
tools/dotbot*
|
tools/dotbot*
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ n('<esc><esc>', ':nohlsearch<cr>', { desc = 'Clear Search Highlighting' })
|
|||||||
-- Buffer operations
|
-- Buffer operations
|
||||||
-- Mappings for buffer management operations like switching, deleting, etc.
|
-- Mappings for buffer management operations like switching, deleting, etc.
|
||||||
-- Convention: All mappings start with 'b' followed by the operation
|
-- Convention: All mappings start with 'b' followed by the operation
|
||||||
|
nld('ba', ':%bd|e#|bd#<cr>', 'Close all except current')
|
||||||
nld('bd', ':lua MiniBufremove.delete()<CR>', 'Delete')
|
nld('bd', ':lua MiniBufremove.delete()<CR>', 'Delete')
|
||||||
nld('bh', ':bprev<cr>', 'Prev')
|
nld('bh', ':bprev<cr>', 'Prev')
|
||||||
nld('bj', ':bfirst<cr>', 'First')
|
nld('bj', ':bfirst<cr>', 'First')
|
||||||
|
|||||||
@@ -13,9 +13,11 @@ vim.loader.enable() -- Enable the plugin loader
|
|||||||
-- vim.global
|
-- vim.global
|
||||||
g.mapleader = ' ' -- Space as the leader key
|
g.mapleader = ' ' -- Space as the leader key
|
||||||
g.maplocalleader = ' ' -- Space as the local leader key
|
g.maplocalleader = ' ' -- Space as the local leader key
|
||||||
|
|
||||||
g.colors_theme = 'tokyonight' -- Set the colorscheme
|
g.colors_theme = 'tokyonight' -- Set the colorscheme
|
||||||
g.colors_variant_light = 'tokyonight-day' -- Set the light variant
|
g.colors_variant_light = 'tokyonight-day' -- Set the light variant
|
||||||
g.colors_variant_dark = 'tokyonight-storm' -- Set the dark variant
|
g.colors_variant_dark = 'tokyonight-storm' -- Set the dark variant
|
||||||
|
|
||||||
g.editorconfig = true -- Make sure editorconfig support is enabled
|
g.editorconfig = true -- Make sure editorconfig support is enabled
|
||||||
g.loaded_perl_provider = 0 -- Disable perl provider
|
g.loaded_perl_provider = 0 -- Disable perl provider
|
||||||
g.loaded_ruby_provider = 0 -- Disable ruby provider
|
g.loaded_ruby_provider = 0 -- Disable ruby provider
|
||||||
|
|||||||
@@ -12,7 +12,20 @@ return {
|
|||||||
notify = { enabled = true },
|
notify = { enabled = true },
|
||||||
notifier = { enabled = true },
|
notifier = { enabled = true },
|
||||||
quickfile = { enabled = true },
|
quickfile = { enabled = true },
|
||||||
statuscolumn = { enabled = true },
|
statuscolumn = {
|
||||||
|
enabled = true,
|
||||||
|
left = { "mark", "sign" }, -- priority of signs on the left (high to low)
|
||||||
|
right = { "fold", "git" }, -- priority of signs on the right (high to low)
|
||||||
|
folds = {
|
||||||
|
open = true, -- show open fold icons
|
||||||
|
git_hl = false, -- use Git Signs hl for fold icons
|
||||||
|
},
|
||||||
|
git = {
|
||||||
|
-- patterns to match Git signs
|
||||||
|
patterns = { "GitSign", "MiniDiffSign" },
|
||||||
|
},
|
||||||
|
refresh = 50, -- refresh at most every 50ms
|
||||||
|
},
|
||||||
words = { enabled = true },
|
words = { enabled = true },
|
||||||
styles = {
|
styles = {
|
||||||
notification = {
|
notification = {
|
||||||
|
|||||||
@@ -21,6 +21,11 @@ return {
|
|||||||
local miniclue = require 'mini.clue'
|
local miniclue = require 'mini.clue'
|
||||||
|
|
||||||
miniclue.setup {
|
miniclue.setup {
|
||||||
|
window = {
|
||||||
|
config = {
|
||||||
|
width = 'auto',
|
||||||
|
},
|
||||||
|
},
|
||||||
triggers = {
|
triggers = {
|
||||||
-- Leader triggers
|
-- Leader triggers
|
||||||
{ mode = 'n', keys = '<Leader>' },
|
{ mode = 'n', keys = '<Leader>' },
|
||||||
@@ -53,8 +58,8 @@ return {
|
|||||||
{ mode = 'x', keys = 'z' },
|
{ mode = 'x', keys = 'z' },
|
||||||
},
|
},
|
||||||
|
|
||||||
|
-- These mark the sections in the popup
|
||||||
clues = {
|
clues = {
|
||||||
-- Enhance this by adding descriptions for <Leader> mapping groups
|
|
||||||
miniclue.gen_clues.builtin_completion(),
|
miniclue.gen_clues.builtin_completion(),
|
||||||
miniclue.gen_clues.g(),
|
miniclue.gen_clues.g(),
|
||||||
miniclue.gen_clues.marks(),
|
miniclue.gen_clues.marks(),
|
||||||
@@ -176,6 +181,9 @@ return {
|
|||||||
-- Text edit operators
|
-- Text edit operators
|
||||||
{ 'echasnovski/mini.operators', version = '*', opts = {} },
|
{ 'echasnovski/mini.operators', version = '*', opts = {} },
|
||||||
|
|
||||||
|
-- Session management (read, write, delete)
|
||||||
|
{ 'echasnovski/mini.sessions', version = '*', opts = {} },
|
||||||
|
|
||||||
-- Split and join arguments, lists, and other sequences
|
-- Split and join arguments, lists, and other sequences
|
||||||
-- Replaced Wansmer/treesj
|
-- Replaced Wansmer/treesj
|
||||||
{ 'echasnovski/mini.splitjoin', version = '*', opts = {} },
|
{ 'echasnovski/mini.splitjoin', version = '*', opts = {} },
|
||||||
@@ -197,8 +205,8 @@ return {
|
|||||||
local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 })
|
local mode, mode_hl = MiniStatusline.section_mode({ trunc_width = 120 })
|
||||||
local git = MiniStatusline.section_git({ trunc_width = 75 })
|
local git = MiniStatusline.section_git({ trunc_width = 75 })
|
||||||
local diagnostics = MiniStatusline.section_diagnostics({ trunc_width = 75 })
|
local diagnostics = MiniStatusline.section_diagnostics({ trunc_width = 75 })
|
||||||
local filename = MiniStatusline.section_filename({ trunc_width = 140 })
|
local filename = MiniStatusline.section_filename({ trunc_width = 50 })
|
||||||
local fileinfo = MiniStatusline.section_fileinfo({ trunc_width = 120 })
|
-- local fileinfo = MiniStatusline.section_fileinfo({ trunc_width = 120 })
|
||||||
local location = MiniStatusline.section_location({ trunc_width = 75 })
|
local location = MiniStatusline.section_location({ trunc_width = 75 })
|
||||||
return MiniStatusline.combine_groups({
|
return MiniStatusline.combine_groups({
|
||||||
{ hl = mode_hl, strings = { mode } },
|
{ hl = mode_hl, strings = { mode } },
|
||||||
@@ -206,7 +214,7 @@ return {
|
|||||||
'%<', -- Mark general truncate point
|
'%<', -- Mark general truncate point
|
||||||
{ hl = 'MiniStatuslineFilename', strings = { filename } },
|
{ hl = 'MiniStatuslineFilename', strings = { filename } },
|
||||||
'%=', -- End left alignment
|
'%=', -- End left alignment
|
||||||
{ hl = 'MiniStatuslineFileinfo', strings = { fileinfo } },
|
-- { hl = 'MiniStatuslineFileinfo', strings = { fileinfo } },
|
||||||
{ hl = mode_hl, strings = { location } },
|
{ hl = mode_hl, strings = { location } },
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
{
|
{
|
||||||
"type": "session",
|
"type": "session",
|
||||||
"style": "plain",
|
"style": "plain",
|
||||||
"template": " {{ if .SSHSession }} {{ .UserName }}@{{ end }}{{ .HostName }}"
|
"template": " {{ if .SSHSession }}\ueba9 {{ .UserName }}@{{ end }}{{ .HostName }}"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"foreground": "cyan",
|
"foreground": "cyan",
|
||||||
@@ -27,14 +27,14 @@
|
|||||||
"template": " {{ .Path }} ",
|
"template": " {{ .Path }} ",
|
||||||
"type": "path",
|
"type": "path",
|
||||||
"mapped_locations": {
|
"mapped_locations": {
|
||||||
"~/Code/*": "\uF09B"
|
"~/Code/*": "\uf09b"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"style": "plain",
|
"style": "plain",
|
||||||
"foreground": "lightGreen",
|
"foreground": "lightGreen",
|
||||||
"template": "{{ .UpstreamIcon }}{{ if or (.Staging.Changed) (.Working.Changed) }}({{if .Behind }}\u2193 {{ .Behind }} {{ end }}{{if .Staging.Changed }}\uF046 {{ .Staging.String }} {{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }}| {{ end }}{{ if .Working.Changed }} {{ .Working.String }}{{ end }}){{ end }}",
|
"template": "{{ .UpstreamIcon }}{{ if or (.Staging.Changed) (.Working.Changed) }}({{if .Behind }}\u2193 {{ .Behind }} {{ end }}{{if .Staging.Changed }}\uf046 {{ .Staging.String }} {{ end }}{{ if and (.Staging.Changed) (.Working.Changed) }}| {{ end }}{{ if .Working.Changed }}\uf044 {{ .Working.String }}{{ end }}){{ end }}",
|
||||||
"properties": {
|
"properties": {
|
||||||
"fetch_status": true,
|
"fetch_status": true,
|
||||||
"fetch_upstream_icon": true,
|
"fetch_upstream_icon": true,
|
||||||
@@ -100,7 +100,7 @@
|
|||||||
{
|
{
|
||||||
"type": "php",
|
"type": "php",
|
||||||
"style": "plain",
|
"style": "plain",
|
||||||
"template": " {{ .Full }} "
|
"template": " \ue73d {{ .Full }} "
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"type": "prompt"
|
"type": "prompt"
|
||||||
|
|||||||
@@ -27,13 +27,13 @@ servers = (
|
|||||||
family = "inet";
|
family = "inet";
|
||||||
},
|
},
|
||||||
{ address = "irc.efnet.net"; chatnet = "EFNet"; port = "6667"; },
|
{ address = "irc.efnet.net"; chatnet = "EFNet"; port = "6667"; },
|
||||||
{
|
{
|
||||||
address = "irc.undernet.org";
|
address = "irc.undernet.org";
|
||||||
chatnet = "Undernet";
|
chatnet = "Undernet";
|
||||||
port = "6667";
|
port = "6667";
|
||||||
},
|
},
|
||||||
{ address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
|
{ address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; },
|
||||||
{
|
{
|
||||||
address = "irc.quakenet.org";
|
address = "irc.quakenet.org";
|
||||||
chatnet = "QuakeNet";
|
chatnet = "QuakeNet";
|
||||||
port = "6667";
|
port = "6667";
|
||||||
@@ -50,7 +50,7 @@ chatnets = {
|
|||||||
max_whois = "4";
|
max_whois = "4";
|
||||||
max_query_chans = "5";
|
max_query_chans = "5";
|
||||||
};
|
};
|
||||||
EFNet = {
|
EFNet = {
|
||||||
type = "IRC";
|
type = "IRC";
|
||||||
max_kicks = "4";
|
max_kicks = "4";
|
||||||
max_msgs = "3";
|
max_msgs = "3";
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
# vim: ft=gitconfig sw=2 ts=2 et
|
||||||
[include]
|
[include]
|
||||||
path = ~/.dotfiles/config/git/shared
|
path = ~/.dotfiles/config/git/shared
|
||||||
|
|
||||||
@@ -7,19 +8,19 @@
|
|||||||
[user]
|
[user]
|
||||||
name = Ismo Vuorinen
|
name = Ismo Vuorinen
|
||||||
email = ismo.vuorinen@vincit.fi
|
email = ismo.vuorinen@vincit.fi
|
||||||
signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDLyOvkr1nRqMVv3UAizmk6C+q40H4khvw7qIXXXyOyFmzjwYx/Cuxoi4uZVjX+q4qFYJ+c312uu6YXiEtfyoCao3wub8r1cLBQ3eIvuyWp2K8Ixcd9JmFmLmoeiENpJxqyr0WPZLDkrCWUZCsQQh8zzGFnfciUdUdTiZ7s21AEhhmFRSdFlVfQSlGMFxU321psg1YilcP80bDwFd1FsL4TssSkwlbgP/twqnpZ4436TTo7kp0UnH/RZkfRdDWScKHaWgncBG0CZeQxGWnRp8fvZn/7gDnthcZhvnDALVBE7QFuZ90GxqVw3IGpHryV0mFO6EGQ9Ke9YX7pKVZPUXZjeCN4SVKsqFdVJ6AjaSJ9K7nL98rYK7qNzndT3cKqPNgPteyXWRulH68A51ecQqHrjTttZcdN9hKt9uBHpzuXsby2QObT+VB4MNjZapa+YYF/WgwJCml4lzn2xMFg1vYZD78pfoJ9e5f2cL1MMlUSDb0TNxmEXfDQ77H/pRpKDz0=
|
signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDLyOvkr1nRqMVv3UAizmk6C+q40H4khvw7qIXXXyOyFmzjwYx/Cuxoi4uZVjX+q4qFYJ+c312uu6YXiEtfyoCao3wub8r1cLBQ3eIvuyWp2K8Ixcd9JmFmLmoeiENpJxqyr0WPZLDkrCWUZCsQQh8zzGFnfciUdUdTiZ7s21AEhhmFRSdFlVfQSlGMFxU321psg1YilcP80bDwFd1FsL4TssSkwlbgP/twqnpZ4436TTo7kp0UnH/RZkfRdDWScKHaWgncBG0CZeQxGWnRp8fvZn/7gDnthcZhvnDALVBE7QFuZ90GxqVw3IGpHryV0mFO6EGQ9Ke9YX7pKVZPUXZjeCN4SVKsqFdVJ6AjaSJ9K7nL98rYK7qNzndT3cKqPNgPteyXWRulH68A51ecQqHrjTttZcdN9hKt9uBHpzuXsby2QObT+VB4MNjZapa+YYF/WgwJCml4lzn2xMFg1vYZD78pfoJ9e5f2cL1MMlUSDb0TNxmEXfDQ77H/pRpKDz0=
|
||||||
|
|
||||||
[gpg "ssh"]
|
[gpg "ssh"]
|
||||||
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
|
program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign
|
||||||
allowedSignersFile = ~/.ssh/allowed_signers
|
allowedSignersFile = ~/.ssh/allowed_signers
|
||||||
|
|
||||||
[commit]
|
[commit]
|
||||||
gpgsign = true
|
gpgsign = true
|
||||||
|
|
||||||
[credential "https://github.com"]
|
[credential "https://github.com"]
|
||||||
helper =
|
helper =
|
||||||
helper = !/opt/homebrew/bin/gh auth git-credential
|
helper = !/opt/homebrew/bin/gh auth git-credential
|
||||||
|
|
||||||
[credential "https://gist.github.com"]
|
[credential "https://gist.github.com"]
|
||||||
helper =
|
helper =
|
||||||
helper = !/opt/homebrew/bin/gh auth git-credential
|
helper = !/opt/homebrew/bin/gh auth git-credential
|
||||||
|
|||||||
6
install
6
install
@@ -25,9 +25,9 @@ git submodule update --init --recursive "${DOTBOT_DIR}"
|
|||||||
if [ "${DOTBOT_HOST}" != "" ]; then
|
if [ "${DOTBOT_HOST}" != "" ]; then
|
||||||
DOTBOT_HOST_CONFIG="${BASEDIR}/hosts/${DOTBOT_HOST}/${CONFIG}"
|
DOTBOT_HOST_CONFIG="${BASEDIR}/hosts/${DOTBOT_HOST}/${CONFIG}"
|
||||||
echo "-> Trying if host config can be found: ${DOTBOT_HOST_CONFIG}"
|
echo "-> Trying if host config can be found: ${DOTBOT_HOST_CONFIG}"
|
||||||
[ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] \
|
[ -r "$DOTBOT_HOST_CONFIG" ] && [ -f "$DOTBOT_HOST_CONFIG" ] &&
|
||||||
&& echo "(!) Found $DOTBOT_HOST_CONFIG" \
|
echo "(!) Found $DOTBOT_HOST_CONFIG" &&
|
||||||
&& "$DOTBOT_BIN_PATH" \
|
"$DOTBOT_BIN_PATH" \
|
||||||
-d "$BASEDIR" \
|
-d "$BASEDIR" \
|
||||||
--plugin-dir=tools/dotbot-brew \
|
--plugin-dir=tools/dotbot-brew \
|
||||||
--plugin-dir=tools/dotbot-include \
|
--plugin-dir=tools/dotbot-include \
|
||||||
|
|||||||
Submodule tools/dotbot updated: 6489f28311...7e6ec66718
Reference in New Issue
Block a user