Compare commits

...

8 Commits

Author SHA1 Message Date
9cb27eb9dc chore(deps): yarn package update
Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>
2025-03-31 21:06:27 +03:00
f1ed88a98e chore(config): vim plug update
Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>
2025-03-31 21:05:57 +03:00
ec35f1cb1e chore(config): wezterm font and config tweaks
Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>
2025-03-31 21:05:44 +03:00
dab8504cfd chore(deps): Brewfile update
Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>
2025-03-31 21:05:09 +03:00
0f9a76e36f chore(config): nvim config tweaks
Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>
2025-03-31 21:04:50 +03:00
github-actions[bot]
97244d5287 chore: update pre-commit hooks (#95)
Co-authored-by: ivuorinen <11024+ivuorinen@users.noreply.github.com>
2025-03-31 09:09:46 +03:00
50ea9bea89 fix(config): nvim theme tweaks
Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>
2025-03-28 09:47:53 +02:00
688469ad8b chore(config): wezterm font is now Operator Mono
Signed-off-by: Ismo Vuorinen <ismo@ivuorinen.net>
2025-03-28 09:47:21 +02:00
12 changed files with 9391 additions and 1118 deletions

1
.gitignore vendored
View File

@@ -45,3 +45,4 @@ config/fish/completions/asdf.fish
config/vim/.netrwhist config/vim/.netrwhist
config/vim/extra/* config/vim/extra/*
config/gh/hosts.yml config/gh/hosts.yml
dependency-check-report.html

View File

@@ -49,7 +49,7 @@ repos:
- id: actionlint - id: actionlint
- repo: https://github.com/renovatebot/pre-commit-hooks - repo: https://github.com/renovatebot/pre-commit-hooks
rev: 39.213.4 rev: 39.222.1
hooks: hooks:
- id: renovate-config-validator - id: renovate-config-validator

View File

@@ -107,6 +107,10 @@ brew "choose-rust"
brew "cmake" brew "cmake"
# Get a file from an HTTP, HTTPS or FTP server # Get a file from an HTTP, HTTPS or FTP server
brew "curl" brew "curl"
# OpenType text shaping engine
brew "harfbuzz"
# OWASP dependency-check
brew "dependency-check"
# Lightweight DNS forwarder and DHCP server # Lightweight DNS forwarder and DHCP server
brew "dnsmasq" brew "dnsmasq"
# .NET Core # .NET Core
@@ -121,8 +125,6 @@ brew "figlet"
brew "fish" brew "fish"
# Lock file during command # Lock file during command
brew "flock" brew "flock"
# Fast and simple Node.js version manager
brew "fnm"
# Libraries to talk to Microsoft SQL Server and Sybase databases # Libraries to talk to Microsoft SQL Server and Sybase databases
brew "freetds" brew "freetds"
# Monitor a directory for changes and run a shell command # Monitor a directory for changes and run a shell command
@@ -135,8 +137,6 @@ brew "gd"
brew "gdu" brew "gdu"
# GitHub command-line tool # GitHub command-line tool
brew "gh" brew "gh"
# OpenType text shaping engine
brew "harfbuzz"
# Secure hashing function # Secure hashing function
brew "libb2" brew "libb2"
# Framework for layout and rendering of i18n text # Framework for layout and rendering of i18n text
@@ -193,6 +193,8 @@ brew "jq"
brew "json-c" brew "json-c"
# Network authentication protocol # Network authentication protocol
brew "krb5" brew "krb5"
# Style and grammar checker
brew "languagetool"
# Tool to detect/remediate misconfig and security risks of GitHub/GitLab assets # Tool to detect/remediate misconfig and security risks of GitHub/GitLab assets
brew "legitify" brew "legitify"
# BSD-style licensed readline alternative # BSD-style licensed readline alternative
@@ -230,7 +232,9 @@ brew "openldap"
# ISO-C API and CLI for generating UUIDs # ISO-C API and CLI for generating UUIDs
brew "ossp-uuid" brew "ossp-uuid"
# General-purpose scripting language # General-purpose scripting language
brew "php@8.2", link: true brew "php"
# General-purpose scripting language
brew "php@8.2"
# General-purpose scripting language # General-purpose scripting language
brew "php@8.3" brew "php@8.3"
# Pins GitHub Actions to full hashes and versions # Pins GitHub Actions to full hashes and versions
@@ -336,6 +340,8 @@ cask "jetbrains-toolbox"
cask "keybase" cask "keybase"
# Kubernetes IDE # Kubernetes IDE
cask "lens" cask "lens"
# Neovim Client
cask "neovide"
# Reverse proxy, secure introspectable tunnels to localhost # Reverse proxy, secure introspectable tunnels to localhost
cask "ngrok" cask "ngrok"
# Simple application that will prevent iTunes or Apple Music from launching # Simple application that will prevent iTunes or Apple Music from launching

View File

@@ -26,6 +26,7 @@ g.loaded_java_provider = 0 -- Disable java provider
-- Most of the good defaults are provided by `mini.basics` -- Most of the good defaults are provided by `mini.basics`
-- See: lua/plugins/mini.lua -- See: lua/plugins/mini.lua
o.confirm = true -- Confirm before closing unsaved buffers o.confirm = true -- Confirm before closing unsaved buffers
o.dictionary = '/usr/share/dict/words' -- Add system dictionary
o.ignorecase = true -- Ignore case in search patterns o.ignorecase = true -- Ignore case in search patterns
o.inccommand = 'split' -- Preview substitutions live, as you type! o.inccommand = 'split' -- Preview substitutions live, as you type!
o.list = true -- Show invisible characters o.list = true -- Show invisible characters
@@ -37,7 +38,7 @@ o.scrolloff = 8 -- Show context around cursor
o.sidescrolloff = 8 -- Show context around cursor o.sidescrolloff = 8 -- Show context around cursor
o.signcolumn = 'yes' -- Keep signcolumn on by default o.signcolumn = 'yes' -- Keep signcolumn on by default
o.spell = true -- Enable spell checking o.spell = true -- Enable spell checking
o.spelllang = 'en_us' -- Set the spell checking language o.spelllang = 'fi,en_us' -- Set the spell checking language
o.splitbelow = true -- split to the bottom o.splitbelow = true -- split to the bottom
o.splitright = true -- vsplit to the right o.splitright = true -- vsplit to the right
o.termguicolors = true -- Enable GUI colors o.termguicolors = true -- Enable GUI colors

View File

@@ -5,8 +5,13 @@ return {
'folke/snacks.nvim', 'folke/snacks.nvim',
priority = 1000, priority = 1000,
lazy = false, lazy = false,
---@diagnostic disable-next-line: undefined-doc-name
---@type snacks.Config
opts = { opts = {
bigfile = { enabled = true }, bigfile = { enabled = true },
input = {
enabled = true,
},
gitbrowse = { enabled = true }, gitbrowse = { enabled = true },
quickfile = { enabled = true }, quickfile = { enabled = true },
statuscolumn = { statuscolumn = {

View File

@@ -108,17 +108,25 @@ local lsp_servers = {
-- These are automatically configured by WhoIsSethDaniel/mason-tool-installer.nvim -- These are automatically configured by WhoIsSethDaniel/mason-tool-installer.nvim
local mason_tools = { local mason_tools = {
'actionlint', 'actionlint',
'ast-grep',
'black',
'editorconfig-checker', 'editorconfig-checker',
'goimports', 'goimports',
'golangci-lint',
'golines',
'gopls',
'gotests', 'gotests',
'isort',
'phpcbf', 'phpcbf',
'phpmd', 'phpmd',
'phpstan', 'phpstan',
'pint', 'pint',
'prettierd', 'prettierd',
'revive',
'semgrep', 'semgrep',
'shellcheck', 'shellcheck',
'shfmt', 'shfmt',
'sonarlint-language-server',
'staticcheck', 'staticcheck',
'stylua', 'stylua',
'trivy', 'trivy',
@@ -323,7 +331,7 @@ return {
-- Disable autoformat for files in a certain paths -- Disable autoformat for files in a certain paths
local bufname = vim.api.nvim_buf_get_name(bufnr) local bufname = vim.api.nvim_buf_get_name(bufnr)
if bufname:match '/node_modules|vendor/' then return end if bufname:match '/dist|node_modules|vendor/' then return end
return { return {
timeout_ms = 500, timeout_ms = 500,

View File

@@ -41,7 +41,7 @@ return {
'document_symbols', 'document_symbols',
}, },
source_selector = { source_selector = {
winbar = true, winbar = false,
statusline = false, statusline = false,
separator = { left = '', right = '' }, separator = { left = '', right = '' },
show_separator_on_edge = true, show_separator_on_edge = true,

View File

@@ -1,12 +1,15 @@
return { return {
-- https://github.com/preservim/vim-colors-pencil -- https://github.com/rmehri01/onenord.nvim
{ {
'preservim/vim-colors-pencil', 'rmehri01/onenord.nvim',
priority = 1000, -- Make sure to load this before all the other start plugins. priority = 1000, -- Make sure to load this before all the other start plugins.
config = function() opts = {
vim.cmd 'colorscheme pencil' borders = true,
vim.api.nvim_set_option_value('pencil_terminal_italics', 1, {}) fade_nc = true,
end, disable = {
float_background = true,
},
},
}, },
-- Automatic dark mode -- Automatic dark mode

View File

@@ -372,8 +372,10 @@ function! plug#end()
for [cmd, names] in items(lod.cmd) for [cmd, names] in items(lod.cmd)
execute printf( execute printf(
\ 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, %s)', \ has('patch-7.4.1898')
\ cmd, string(cmd), string(names)) \ ? 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, <q-mods> ,%s)'
\ : 'command! -nargs=* -range -bang -complete=file %s call s:lod_cmd(%s, "<bang>", <line1>, <line2>, <q-args>, %s)'
\ , cmd, string(cmd), string(names))
endfor endfor
for [map, names] in items(lod.map) for [map, names] in items(lod.map)
@@ -651,11 +653,19 @@ function! s:lod_ft(pat, names)
call s:doautocmd('filetypeindent', 'FileType') call s:doautocmd('filetypeindent', 'FileType')
endfunction endfunction
function! s:lod_cmd(cmd, bang, l1, l2, args, names) if has('patch-7.4.1898')
call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) function! s:lod_cmd(cmd, bang, l1, l2, args, mods, names)
call s:dobufread(a:names) call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args) call s:dobufread(a:names)
endfunction execute printf('%s %s%s%s %s', a:mods, (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args)
endfunction
else
function! s:lod_cmd(cmd, bang, l1, l2, args, names)
call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
call s:dobufread(a:names)
execute printf('%s%s%s %s', (a:l1 == a:l2 ? '' : (a:l1.','.a:l2)), a:cmd, a:bang, a:args)
endfunction
endif
function! s:lod_map(map, names, with_prefix, prefix) function! s:lod_map(map, names, with_prefix, prefix)
call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin']) call s:lod(a:names, ['ftdetect', 'after/ftdetect', 'plugin', 'after/plugin'])
@@ -1075,12 +1085,16 @@ function! s:hash_match(a, b)
return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0 return stridx(a:a, a:b) == 0 || stridx(a:b, a:a) == 0
endfunction endfunction
function! s:disable_credential_helper()
return s:git_version_requirement(2) && get(g:, 'plug_disable_credential_helper', 1)
endfunction
function! s:checkout(spec) function! s:checkout(spec)
let sha = a:spec.commit let sha = a:spec.commit
let output = s:git_revision(a:spec.dir) let output = s:git_revision(a:spec.dir)
let error = 0 let error = 0
if !empty(output) && !s:hash_match(sha, s:lines(output)[0]) if !empty(output) && !s:hash_match(sha, s:lines(output)[0])
let credential_helper = s:git_version_requirement(2) ? '-c credential.helper= ' : '' let credential_helper = s:disable_credential_helper() ? '-c credential.helper= ' : ''
let output = s:system( let output = s:system(
\ 'git '.credential_helper.'fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir) \ 'git '.credential_helper.'fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir)
let error = v:shell_error let error = v:shell_error
@@ -1589,7 +1603,7 @@ while 1 " Without TCO, Vim stack is bound to explode
let [error, _] = s:git_validate(spec, 0) let [error, _] = s:git_validate(spec, 0)
if empty(error) if empty(error)
if pull if pull
let cmd = s:git_version_requirement(2) ? ['git', '-c', 'credential.helper=', 'fetch'] : ['git', 'fetch'] let cmd = s:disable_credential_helper() ? ['git', '-c', 'credential.helper=', 'fetch'] : ['git', 'fetch']
if has_tag && !empty(globpath(spec.dir, '.git/shallow')) if has_tag && !empty(globpath(spec.dir, '.git/shallow'))
call extend(cmd, ['--depth', '99999999']) call extend(cmd, ['--depth', '99999999'])
endif endif

View File

@@ -1,9 +1,18 @@
local wezterm = require 'wezterm' local wezterm = require 'wezterm'
local config = wezterm.config_builder() local config = wezterm.config_builder()
config.set_environment_variables = {
COLORTERM = 'truecolor',
}
-- Font and font size -- Font and font size
config.font_size = 14.0 config.font_size = 14.0
config.font = wezterm.font_with_fallback { config.font = wezterm.font_with_fallback {
{
family = 'Operator Mono',
weight = 'Book',
},
'Operator Mono',
'JetBrainsMonoNL NFM Light', 'JetBrainsMonoNL NFM Light',
'JetBrains Mono', 'JetBrains Mono',
'Symbols Nerd Font Mono', 'Symbols Nerd Font Mono',

View File

@@ -27,7 +27,8 @@
}, },
"homepage": "https://github.com/ivuorinen/dotfiles#readme", "homepage": "https://github.com/ivuorinen/dotfiles#readme",
"devDependencies": { "devDependencies": {
"@ivuorinen/base-configs": "^2.0.0" "@ivuorinen/base-configs": "^2.0.0",
"bundle-audit": "^0.1.0"
}, },
"packageManager": "yarn@1.22.22" "packageManager": "yarn@1.22.22"
} }

10411
yarn.lock

File diff suppressed because it is too large Load Diff