Compare commits

..

1 Commits

Author SHA1 Message Date
798650bd87 gitconfig: added new command retag 2025-02-13 23:50:24 +01:00
39 changed files with 635 additions and 1171 deletions

82
.alacritty.yml Normal file
View File

@@ -0,0 +1,82 @@
font:
bold:
family: Comic Code
style: Bold
antialias: true
bold_italic:
family: Comic Code
style: Bold Italic
antialias: true
italic:
family: Comic Code
style: Italic
antialias: true
normal:
family: Comic Code
style: Medium
antialias: true
size: 16
offset:
x: 0
y: 0
glyph_offset:
x: 0
y: 0
use_thin_strokes: true
mouse:
hints:
launcher:
program: open
modifiers: Command
key_bindings:
- { key: Return, mods: Control|Shift, action: SpawnNewInstance }
- { key: F, mods: Control, action: SearchForward }
- { key: V, mods: Control|Shift, action: Paste }
- { key: Space, mods: Control, chars: "\x00" }
selection:
save_to_clipboard: true
colors:
search:
focused_match:
foreground: "#181818"
background: "#ab4642"
matches:
foreground: "#181818"
background: "#f4bf75"
footer_bar:
background: "#262626"
foreground: "#d0d0d0"
# Default colors
primary:
background: "0x000000"
foreground: "0xffffff"
# Bright colors:
bright:
black: "0x7f7f7f"
blue: "0x5c5cff"
cyan: "0x00ffff"
green: "0x00ff00"
magenta: "0xff00ff"
red: "0xff0000"
white: "0xffffff"
yellow: "0xffff00"
# Normal colors
normal:
black: "0x000000"
blue: "0x0000ee"
cyan: "0x00cdcd"
green: "0x00cd00"
magenta: "0xcd00cd"
red: "0xcd0000"
white: "0xe5e5e5"
yellow: "0xcdcd00"
import:
- C:\Users\marcin.wozniak\AppData\Roaming\alacritty\dracula.yml

View File

@@ -1,78 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleAllowMixedLocalizations</key>
<true/>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>CFBundleExecutable</key>
<string>applet</string>
<key>CFBundleIconFile</key>
<string>applet</string>
<key>CFBundleIconName</key>
<string>applet</string>
<key>CFBundleIdentifier</key>
<string>com.apple.ScriptEditor.id.Copy-Firefox-Link--Jira</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>Copy Firefox Link (Jira)</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleSignature</key>
<string>aplt</string>
<key>LSMinimumSystemVersionByArchitecture</key>
<dict>
<key>x86_64</key>
<string>10.6</string>
</dict>
<key>LSRequiresCarbon</key>
<true/>
<key>NSAppleEventsUsageDescription</key>
<string>This script needs to control other applications to run.</string>
<key>NSAppleMusicUsageDescription</key>
<string>This script needs access to your music to run.</string>
<key>NSCalendarsUsageDescription</key>
<string>This script needs access to your calendars to run.</string>
<key>NSCameraUsageDescription</key>
<string>This script needs access to your camera to run.</string>
<key>NSContactsUsageDescription</key>
<string>This script needs access to your contacts to run.</string>
<key>NSHomeKitUsageDescription</key>
<string>This script needs access to your HomeKit Home to run.</string>
<key>NSMicrophoneUsageDescription</key>
<string>This script needs access to your microphone to run.</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>This script needs access to your photos to run.</string>
<key>NSRemindersUsageDescription</key>
<string>This script needs access to your reminders to run.</string>
<key>NSSiriUsageDescription</key>
<string>This script needs access to Siri to run.</string>
<key>NSSystemAdministrationUsageDescription</key>
<string>This script needs access to administer this system to run.</string>
<key>OSAAppletShowStartupScreen</key>
<false/>
<key>WindowState</key>
<dict>
<key>bundleDividerCollapsed</key>
<true/>
<key>bundlePositionOfDivider</key>
<real>0.0</real>
<key>dividerCollapsed</key>
<false/>
<key>eventLogLevel</key>
<integer>2</integer>
<key>name</key>
<string>ScriptWindowState</string>
<key>positionOfDivider</key>
<real>394</real>
<key>savedFrame</key>
<string>952 453 700 682 0 0 2560 1409 </string>
<key>selectedTab</key>
<string>result</string>
</dict>
</dict>
</plist>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 362 B

View File

@@ -1,5 +0,0 @@
{\rtf1\ansi\ansicpg1252\cocoartf2865
\cocoatextscaling0\cocoaplatform0{\fonttbl}
{\colortbl;\red255\green255\blue255;}
{\*\expandedcolortbl;;}
}

View File

@@ -1,192 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>files</key>
<dict>
<key>Resources/Assets.car</key>
<data>
OdbufcoyP2ZXC+wmwYcwMi/2x24=
</data>
<key>Resources/Scripts/main.scpt</key>
<data>
c++jyUmQRxdpGX36L8PJaNpf6uM=
</data>
<key>Resources/applet.icns</key>
<data>
sINd6lbiqHD5dL8c6u79cFvVXhw=
</data>
<key>Resources/applet.rsrc</key>
<data>
DlWDU4NYiJFhmwpseexPiRYHzFI=
</data>
<key>Resources/description.rtfd/TXT.rtf</key>
<data>
C1nXIy6FYUr4wNNlSEP/8NzzT/E=
</data>
</dict>
<key>files2</key>
<dict>
<key>Resources/Assets.car</key>
<dict>
<key>hash</key>
<data>
OdbufcoyP2ZXC+wmwYcwMi/2x24=
</data>
<key>hash2</key>
<data>
cVUhSsEaVhMGFs9io544X4XEevDHVtRiVGUTdZ4ZHX4=
</data>
</dict>
<key>Resources/Scripts/main.scpt</key>
<dict>
<key>hash</key>
<data>
c++jyUmQRxdpGX36L8PJaNpf6uM=
</data>
<key>hash2</key>
<data>
o+Lp+bYlQlPNZa8JmZ6wdvY55TCtjUxce100Dttj5vY=
</data>
</dict>
<key>Resources/applet.icns</key>
<dict>
<key>hash</key>
<data>
sINd6lbiqHD5dL8c6u79cFvVXhw=
</data>
<key>hash2</key>
<data>
J7weZ6vlnv9r32tS5HFcyuPXl2StdDnfepLxAixlryk=
</data>
</dict>
<key>Resources/applet.rsrc</key>
<dict>
<key>hash</key>
<data>
DlWDU4NYiJFhmwpseexPiRYHzFI=
</data>
<key>hash2</key>
<data>
/UdIZRcpe3tND6vnHQP/IG8Vvt3+ZFQS5SQ+h1kescY=
</data>
</dict>
<key>Resources/description.rtfd/TXT.rtf</key>
<dict>
<key>hash</key>
<data>
C1nXIy6FYUr4wNNlSEP/8NzzT/E=
</data>
<key>hash2</key>
<data>
Y3Q9y0mIEZh55w+oHoEyN1W1UzIxrILMub7rktKsd1I=
</data>
</dict>
</dict>
<key>rules</key>
<dict>
<key>^Resources/</key>
<true/>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^version.plist$</key>
<true/>
</dict>
<key>rules2</key>
<dict>
<key>.*\.dSYM($|/)</key>
<dict>
<key>weight</key>
<real>11</real>
</dict>
<key>^(.*/)?\.DS_Store$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>2000</real>
</dict>
<key>^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^.*</key>
<true/>
<key>^Info\.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^PkgInfo$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^Resources/.*\.lproj/</key>
<dict>
<key>optional</key>
<true/>
<key>weight</key>
<real>1000</real>
</dict>
<key>^Resources/.*\.lproj/locversion.plist$</key>
<dict>
<key>omit</key>
<true/>
<key>weight</key>
<real>1100</real>
</dict>
<key>^Resources/Base\.lproj/</key>
<dict>
<key>weight</key>
<real>1010</real>
</dict>
<key>^[^/]+$</key>
<dict>
<key>nested</key>
<true/>
<key>weight</key>
<real>10</real>
</dict>
<key>^embedded\.provisionprofile$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
<key>^version\.plist$</key>
<dict>
<key>weight</key>
<real>20</real>
</dict>
</dict>
</dict>
</plist>

View File

@@ -1,11 +0,0 @@
#!/bin/bash
DIR=$(dirname "$0")
for app in "$DIR"/*.app; do
echo "Installing $(basename "$app")..."
cp -rv "$app" "$HOME"/Applications/
xattr -dr com.apple.quarantine "/Applications/$(basename "$app")"
done
open "x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility"

View File

@@ -3,26 +3,17 @@ coreutils
dockutil dockutil
duti duti
fastfetch fastfetch
ffmpeg
git git
gnu-sed gnu-sed
htop htop
imagemagick imagemagick
ipcalc ipcalc
iperf3
mtr
neovim neovim
newsboat newsboat
parallel parallel
pinentry-mac
ranger
ripgrep ripgrep
rsync rsync
telnet
texinfo
tmux tmux
tree tree
watch
wget wget
zoxide
zsh zsh

View File

@@ -1,34 +1,38 @@
alacritty alfred
brave
chatterino chatterino
dbeaver-community dbeaver-community
discord
displaylink displaylink
docker docker
firefox@nightly firefox@nightly
font-hack-nerd-font font-hack-nerd-font
gimp gimp
hiddenbar
iterm2
jordanbaird-ice
karabiner-elements karabiner-elements
keepassxc keepassxc
macfuse
megasync megasync
microsoft-auto-update
microsoft-teams microsoft-teams
mongodb-compass mongodb-compass
mpv mpv
mysides
obsidian obsidian
platypus platypus
postman
qbittorrent qbittorrent
rustdesk qview
scroll-reverser scroll-reverser
signal signal
skype
spotify spotify
stats stats
telegram telegram
the-unarchiver the-unarchiver
transfer transfer
twingate twingate
visual-studio-code
vlc vlc
whatsapp
winbox winbox
wine-crossover
wireshark wireshark
zed@preview

View File

@@ -1 +0,0 @@
example

File diff suppressed because one or more lines are too long

View File

@@ -1,110 +0,0 @@
# use_thin_strokes = true
[env]
TERM = "xterm-256color"
[general]
import = ["~/.config/alacritty/dracula.toml"]
[keyboard]
bindings = [
{ key = "F", mods = "Control", action = "SearchForward" },
{ key = "Left", mods = "Alt", chars = "\u001BB" },
{ key = "Return", mods = "Control|Shift", action = "SpawnNewInstance" },
{ key = "Right", mods = "Alt", chars = "\u001BF" },
{ key = "Space", mods = "Control", chars = "\u0000" },
{ key = "V", mods = "Control|Shift", action = "Paste" },
]
[window]
opacity = 0.95
[font]
size = 20
# [font.normal]
# family = "Terminess Nerd Font"
# style = "Regular"
# # [font.bold]
# # family = "Teminess Nerd Font"
# # style = "Bold"
# [font.bold_italic]
# family = "Terminess Nerd Font"
# style = "Bold Italic"
# [font.italic]
# family = "Terminess Nerd Font"
# style = "Italic"
# Comic code
[font.normal]
family = "Comic Code Ligatures"
style = "Regular"
# [font.bold]
# family = "Teminess Nerd Font"
# style = "Bold"
[font.bold_italic]
family = "Comic Code"
style = "Bold Italic"
[font.italic]
family = "Comic Code"
style = "Italic"
[font.offset]
x = 0
y = -6
[font.glyph_offset]
x = 0
y = -2
# [mouse.hints]
# modifiers = "Command"
# [mouse.hints.launcher]
# program = "open"
[selection]
save_to_clipboard = true
# Unused
[colors.bright]
black = "0x7f7f7f"
blue = "0x5c5cff"
cyan = "0x00ffff"
green = "0x00ff00"
magenta = "0xff00ff"
red = "0xff0000"
white = "0xffffff"
yellow = "0xffff00"
[colors.normal]
black = "0x000000"
blue = "0x0000ee"
cyan = "0x00cdcd"
green = "0x00cd00"
magenta = "0xcd00cd"
red = "0xcd0000"
white = "0xe5e5e5"
yellow = "0xcdcd00"
[colors.primary]
background = "0x000000"
foreground = "0xffffff"
[colors.search.focused_match]
background = "#ab4642"
foreground = "#181818"
# [colors.search.footer_bar]
# background = "#262626"
# foreground = "#d0d0d0"
[colors.search.matches]
background = "#f4bf75"
foreground = "#181818"

View File

@@ -1,76 +0,0 @@
# Dracula theme for Alacritty
# https://draculatheme.com/alacritty
#
# Color palette
# https://spec.draculatheme.com
#
# Instructions
# https://github.com/alacritty/alacritty/blob/master/extra/man/alacritty.5.scd
[colors.primary]
background = "#282a36"
foreground = "#f8f8f2"
bright_foreground = "#ffffff"
[colors.cursor]
text = "#282a36"
cursor = "#f8f8f2"
[colors.vi_mode_cursor]
text = "CellBackground"
cursor = "CellForeground"
[colors.selection]
text = "CellForeground"
background = "#44475a"
[colors.normal]
black = "#21222c"
red = "#ff5555"
green = "#50fa7b"
yellow = "#f1fa8c"
blue = "#bd93f9"
magenta = "#ff79c6"
cyan = "#8be9fd"
white = "#f8f8f2"
[colors.bright]
black = "#6272a4"
red = "#ff6e6e"
green = "#69ff94"
yellow = "#ffffa5"
blue = "#d6acff"
magenta = "#ff92df"
cyan = "#a4ffff"
white = "#ffffff"
[colors.search.matches]
foreground = "#44475a"
background = "#50fa7b"
[colors.search.focused_match]
foreground = "#44475a"
background = "#ffb86c"
[colors.footer_bar]
background = "#282a36"
foreground = "#f8f8f2"
[colors.hints.start]
foreground = "#282a36"
background = "#f1fa8c"
[colors.hints.end]
foreground = "#f1fa8c"
background = "#282a36"

1
.config/iterm2/AppSupport Symbolic link
View File

@@ -0,0 +1 @@
/Users/yorune/Library/Application Support/iTerm2

View File

@@ -256,14 +256,6 @@
{ {
"from": { "consumer_key_code": "eject" }, "from": { "consumer_key_code": "eject" },
"to": [{ "consumer_key_code": "al_terminal_lock_or_screensaver" }] "to": [{ "consumer_key_code": "al_terminal_lock_or_screensaver" }]
},
{
"from": { "key_code": "right_command" },
"to": [{ "key_code": "right_option" }]
},
{
"from": { "key_code": "right_option" },
"to": [{ "key_code": "right_command" }]
} }
] ]
}, },
@@ -371,17 +363,7 @@
"is_keyboard": true, "is_keyboard": true,
"product_id": 785, "product_id": 785,
"vendor_id": 13364 "vendor_id": 13364
}, }
"simple_modifications": [
{
"from": { "key_code": "grave_accent_and_tilde" },
"to": [{ "key_code": "non_us_backslash" }]
},
{
"from": { "key_code": "right_control" },
"to": [{ "key_code": "grave_accent_and_tilde" }]
}
]
}, },
{ {
"identifiers": { "identifiers": {
@@ -413,6 +395,10 @@
"from": { "key_code": "caps_lock" }, "from": { "key_code": "caps_lock" },
"to": [{ "key_code": "escape" }] "to": [{ "key_code": "escape" }]
}, },
{
"from": { "key_code": "grave_accent_and_tilde" },
"to": [{ "key_code": "non_us_backslash" }]
},
{ {
"from": { "key_code": "left_command" }, "from": { "key_code": "left_command" },
"to": [{ "key_code": "right_command" }] "to": [{ "key_code": "right_command" }]

View File

@@ -1,7 +1,6 @@
refresher: refresher:
refreshInterval: 60 refreshInterval: 60
gui: gui:
useHunkModeInStagingView: false
mainPanelSplitMode: "horizontal" mainPanelSplitMode: "horizontal"
theme: theme:
selectedLineBgColor: selectedLineBgColor:

View File

@@ -14,7 +14,6 @@ keep-open=yes
# Always save the current playback position on exit # Always save the current playback position on exit
save-position-on-quit=yes save-position-on-quit=yes
# ontop=yes
# Geometry settings # Geometry settings
geometry=50%:50% geometry=50%:50%

View File

@@ -178,89 +178,178 @@ call plug#end()
lua<<EOF lua<<EOF
local opts = { noremap=true, silent=true } local opts = { noremap=true, silent=true }
-- capabilities for nvim-cmp local capabilities = vim.lsp.protocol.make_client_capabilities()
local capabilities = require('cmp_nvim_lsp').default_capabilities() capabilities = require('cmp_nvim_lsp').default_capabilities()
local lspconfig = require('lspconfig')
-- Prefer LspAttach instead of per-server on_attach local on_attach = function(client, bufnr)
vim.api.nvim_create_autocmd('LspAttach', { vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
callback = function(args) vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
local bufnr = args.buf vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, 'n', 'ge', '<cmd>lua vim.diagnostic.setqflist()<CR>', opts)
--vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
--vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
--vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
--vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
--vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
end
vim.bo[bufnr].omnifunc = 'v:lua.vim.lsp.omnifunc' -- LSP settings (for overriding per client)
local handlers = {
["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {border = border}),
["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {border = border }),
}
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, { buffer = bufnr, silent = true }) -- Use a loop to conveniently call 'setup' on multiple servers and
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { buffer = bufnr, silent = true }) -- map buffer local keybindings when the language server attaches
vim.keymap.set('n', '<space>K', vim.lsp.buf.hover, { buffer = bufnr, silent = true }) local servers = { 'clangd', 'bashls', 'yamlls', 'ansiblels', 'gopls', 'solargraph', 'terraformls', 'tflint', 'marksman', 'rust_analyzer' }
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { buffer = bufnr, silent = true }) for _, lsp in pairs(servers) do
vim.keymap.set('n', 'ge', vim.diagnostic.setqflist, { buffer = bufnr, silent = true }) require('lspconfig')[lsp].setup {
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, { buffer = bufnr, silent = true }) on_attach = on_attach,
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, { buffer = bufnr, silent = true }) handlers=handlers,
vim.keymap.set('n', 'gr', vim.lsp.buf.references, { buffer = bufnr, silent = true }) capabilities = capabilities,
end, flags = {
}) debounce_text_changes = 150,
}
}
end
-- If you want borders, define one (your old code referenced `border` but never defined it)
local border = 'rounded'
vim.lsp.config('*', { -- Handlers when you are in the insert mode you see the errors
capabilities = capabilities, vim.lsp.handlers["textDocument/publishDiagnostics"] =
handlers = { vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics,
["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = border }), {update_in_insert = true})
["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = border }),
},
})
-- Server-specific overrides -- Setup a yamlls plugin
vim.lsp.config('yamlls', { require'lspconfig'.yamlls.setup{
settings = { settings = {
json = { json = {
schemas = { schemas = {
["https://raw.githubusercontent.com/quantumblacklabs/kedro/develop/static/jsonschema/kedro-catalog-0.17.json"]= "conf/**/*catalog*", ["https://raw.githubusercontent.com/quantumblacklabs/kedro/develop/static/jsonschema/kedro-catalog-0.17.json"]= "conf/**/*catalog*",
["https://json.schemastore.org/github-workflow.json"] = "/.github/workflows/*", ["https://json.schemastore.org/github-workflow.json"] = "/.github/workflows/*",
["https://github.com/ansible/schemas/blob/main/f/ansible.json"] = "*.yaml,*.yml", ["https://github.com/ansible/schemas/blob/main/f/ansible.json"] = "*.yaml,*.yml"
} }
}, },
yaml = { keyOrdering = false }, yaml = {
}, keyOrdering = false
})
vim.lsp.config('gopls', {
cmd = {"gopls", "serve"},
filetypes = { "go", "gomod", "gowork", "gotmpl" },
settings = {
gopls = {
analyses = { unusedparams = true },
staticcheck = true,
linksInHover = false,
codelenses = {
generate = true,
gc_details = true,
regenerate_cgo = true,
tidy = true,
upgrade_depdendency = true,
vendor = true,
},
completeUnimported = true,
usePlaceholders = true,
}, },
}
}
-- Setup GoLang
require'lspconfig'.gopls.setup {
cmd = {"gopls", "serve"},
filetypes = { "go", "gomod", "gowork", "gotmpl" },
on_attach = on_attach,
handlers=handlers,
capabilities = capabilities,
settings = {
gopls = {
analyses = {
unusedparams = true,
},
staticcheck = true,
linksInHover = false,
codelenses = {
generate = true,
gc_details = true,
regenerate_cgo = true,
tidy = true,
upgrade_depdendency = true,
vendor = true,
},
completeUnimported = true,
usePlaceholders = true,
analyses = {
unusedparams = true,
},
},
},
}
-- Setup Python (ruff)
require('lspconfig').ruff.setup({})
-- luasnip setup
local luasnip = require 'luasnip'
-- nvim-cmp setup
local cmp = require 'cmp'
cmp.setup {
snippet = {
expand = function(args)
luasnip.lsp_expand(args.body)
end,
}, },
})
vim.lsp.config('ruff', {}) -- keep as you had it
-- Finally, enable servers (this replaces the setup() loop)
vim.lsp.enable({
'clangd', 'bashls', 'yamlls', 'ansiblels', 'gopls', 'solargraph',
'terraformls', 'tflint', 'marksman', 'rust_analyzer', 'ruff',
})
local cmp = require('cmp')
cmp.setup({
mapping = cmp.mapping.preset.insert({ mapping = cmp.mapping.preset.insert({
['<C-a>'] = cmp.mapping.scroll_docs(-4),
['<C-s>'] = cmp.mapping.scroll_docs(4),
['<C-Space>'] = cmp.mapping.complete(), ['<C-Space>'] = cmp.mapping.complete(),
['<CR>'] = cmp.mapping.confirm {
behavior = cmp.ConfirmBehavior.Replace,
select = true,
},
['<Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif luasnip.expand_or_jumpable() then
luasnip.expand_or_jump()
else
fallback()
end
end, { 'i', 's' }),
['<S-Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif luasnip.jumpable(-1) then
luasnip.jump(-1)
else
fallback()
end
end, { 'i', 's' }),
}), }),
sources = { { name = 'buffer' } }, sources = {
{ name = 'nvim_lsp' },
{ name = 'luasnip' },
{ name = 'vsnip' },
{ name = 'ultisnips' },
{ name = 'snippy' },
{ name = 'path' },
{ name = 'buffer' }
},
}
cmp.setup.cmdline(':', {
mapping = cmp.mapping.preset.cmdline(),
sources = cmp.config.sources({
{ name = 'path' }
}, {
{ name = 'cmdline' }
})
}) })
cmp.setup.cmdline('/', {
mapping = cmp.mapping.preset.cmdline(),
sources = {
{ name = 'buffer' }
}
})
require("nvim-tree").setup({
})
require'treesitter-context'.setup{}
require("nvim-autopairs").setup {}
require'lspconfig'.rust_analyzer.setup {}
EOF EOF
" Added popout window to see diagnostic " Added popout window to see diagnostic
@@ -268,8 +357,8 @@ set updatetime=250
autocmd! CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false, scope="cursor"}) autocmd! CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false, scope="cursor"})
" CoPilot " CoPilot
" imap <silent><script><expr> <F1> copilot#Accept("\<CR>") imap <silent><script><expr> <F1> copilot#Accept("\<CR>")
" let g:copilot_no_tab_map = v:true let g:copilot_no_tab_map = v:true
" Neoformat " Neoformat
let g:neoformat_try_formatprg = 1 let g:neoformat_try_formatprg = 1
@@ -548,13 +637,10 @@ autocmd BufRead,BufNewFile /tmp/neomutt* map ZZ :Goyo\|x!<CR>
autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q!<CR> autocmd BufRead,BufNewFile /tmp/neomutt* map ZQ :Goyo\|q!<CR>
" Yaml " Yaml
autocmd BufRead,BufNewFile *.yaml,*.yml let g:indentLine_enabled = 1 autocmd BufRead,BufNewFile *.yaml let g:indentLine_enabled = 1
autocmd BufRead,BufNewFile *.yaml,*.yml let g:indentLine_char = '⦙' autocmd BufRead,BufNewFile *.yaml let g:indentLine_char = '⦙'
au BufRead,BufNewFile *.yaml,*.yml if search('hosts:\|tasks:', 'nw') | set ft=yaml.ansible | endif au BufRead,BufNewFile *.yaml,*.yml if search('hosts:\|tasks:', 'nw') | set ft=yaml.ansible | endif
autocmd BufWritePre *.yaml,*.yml silent! undojoin | Neoformat prettier autocmd BufWritePre *.yaml silent! undojoin | Neoformat prettier
" JSON
autocmd BufWritePre *.json silent! undojoin | Neoformat prettier
" GoLang " GoLang
autocmd BufRead *.go set noexpandtab autocmd BufRead *.go set noexpandtab

View File

@@ -1,2 +0,0 @@
[global]
break-system-packages = true

View File

@@ -1,12 +1,5 @@
default-stream "1080p60,1080p,720p60,720p"
default-stream best
hls-live-edge 2
hls-segment-stream-data
player-no-close
player=mpv player=mpv
retry-max 100
retry-open 10
retry-streams 10
stream-segment-threads=4
twitch-disable-ads twitch-disable-ads
twitch-low-latency twitch-low-latency
default-stream best
player-no-close

View File

@@ -32,7 +32,6 @@
c = commit --author='Marcin Woźniak <y0rune@aol.com> -s' c = commit --author='Marcin Woźniak <y0rune@aol.com> -s'
cw = commit --author='Marcin Woźniak <marcin.wozniak@wundermanthompson.com> -s' cw = commit --author='Marcin Woźniak <marcin.wozniak@wundermanthompson.com> -s'
retag = "!f() { if [ -z \"$1\" ]; then echo \"No version provided. Skipping git push.\"; else git tag --delete $1 2>/dev/null; git tag -a $1 -m \"Version $1\"; git push --tags -f; git push -f; fi; }; f" retag = "!f() { if [ -z \"$1\" ]; then echo \"No version provided. Skipping git push.\"; else git tag --delete $1 2>/dev/null; git tag -a $1 -m \"Version $1\"; git push --tags -f; git push -f; fi; }; f"
delete-branch = "!$HOME/.local/bin/git-delete-branch"
[url "git@github.com:"] [url "git@github.com:"]
insteadOf = "https://github.com/" insteadOf = "https://github.com/"

2
.gitignore vendored
View File

@@ -278,5 +278,3 @@ golang
Cisco Packet Tracer 8.0.0 Cisco Packet Tracer 8.0.0
.local/bin/kubectl .local/bin/kubectl
.rustup .rustup
.local/tss-sdk
.local/bin/tss

View File

@@ -1,4 +1,4 @@
#!/opt/homebrew/opt/bash/bin/bash #!/bin/bash
# shellcheck disable=2010,2045,2086,2155 # shellcheck disable=2010,2045,2086,2155
# Path to the zsh folder # Path to the zsh folder
@@ -17,21 +17,21 @@ NC='\033[0m'
TERRAFORM_VERSION="1.5.7" TERRAFORM_VERSION="1.5.7"
# Python # Python
if which python3 >/dev/null 2>&1; then if which python3 > /dev/null 2>&1; then
python="python3" python="python3"
pip="pip3" pip="pip3"
else else
export PYTHONVERSION=$(ls -la /opt/homebrew/opt/ | export PYTHONVERSION=$(ls -la /opt/homebrew/opt/ |
grep -iEo 'python@.* ->' | grep -iEo 'python@.* ->' |
sed 's/ ->//g' | sed 's/ ->//g' |
sort | sort |
tail -n1 | tail -n1 |
sed 's/python@//g') sed 's/python@//g')
python="/opt/homebrew/bin/python$PYTHONVERSION" python="/opt/homebrew/bin/python$PYTHONVERSION"
pip="/opt/homebrew/bin/pip$PYTHONVERSION" pip="/opt/homebrew/bin/pip$PYTHONVERSION"
fi fi
PIPEXT="--user --force --quiet --no-warn-script-location" PIPEXT="--user --force --quiet --break-system-packages --no-warn-script-location"
PIPEXTPRE="--pre $PIPEXT" PIPEXTPRE="--pre $PIPEXT"
# Gentoo release # Gentoo release
@@ -42,594 +42,487 @@ GENTOO="/etc/gentoo-release"
install="" install=""
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
install="brew install" install="brew install"
elif [[ -f $GENTOO ]]; then elif [[ -f $GENTOO ]]; then
install="sudo emerge --update" install="sudo emerge --update"
elif [[ -f /etc/debian_version ]]; then elif [[ -f /etc/debian_version ]]; then
sudo apt update sudo apt update
install="sudo apt install -y" install="sudo apt install -y"
elif [[ -f /etc/redhat-release ]]; then elif [[ -f /etc/redhat-release ]]; then
install="sudo dnf install" install="sudo dnf install"
fi fi
function timestamp() { function timestamp() {
echo -e "${GREEN}[+]${NC} $(date +'%F %T') [INFO] $*" echo -e "${GREEN}[+]${NC} $(date +'%F %T') [INFO] $*"
} }
function err() { function err() {
echo -e "${RED}[-] $(date +'%F %T') [ERROR] $*${NC}" >&2 echo -e "${RED}[-] $(date +'%F %T') [ERROR] $*${NC}" >&2
} }
function command_start() { function command_start() {
timestamp "Command $* has been started." timestamp "Command $* has been started."
if ! "$@"; then if ! "$*"; then
err "---------" err "---------"
err "Command $* went wrong." err "Command $* went wrong."
err "---------" err "---------"
# exit # exit
fi fi
timestamp "Command $* has been ended." timestamp "Command $* has been ended."
} }
function command_exists() { function command_exists() {
if command -v "$1" >/dev/null 2>&1; then if command -v "$1" > /dev/null 2>&1; then
timestamp "Command $1 has been found" timestamp "Command $1 has been found"
else else
err "Command $1 has been NOT found" err "Command $1 has been NOT found"
# Return false # Return false
return 1 return 1
fi fi
} }
function update_pip() { function update_pip() {
# Update the pip # Update the pip
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
$python -m pip install --upgrade pip --user --no-warn-script-location $python -m pip install --upgrade pip --user --no-warn-script-location --break
elif [[ -f $GENTOO ]]; then elif [[ -f $GENTOO ]]; then
$install dev-python/pip $install dev-python/pip
fi fi
} }
function install_neovim_module_for_python() { function install_neovim_module_for_python() {
# Python module in neovim # Python module in neovim
$pip install pynvim neovim imps $PIPEXTPRE $pip install pynvim neovim imps $PIPEXTPRE
} }
function install_node() { function install_node() {
if command_exists npm; then if command_exists npm; then
timestamp "Node has been found" timestamp "Node has been found"
else else
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
brew uninstall node --ignore-dependencies brew uninstall node --ignore-dependencies
sudo rm -rf /opt/homebrew/lib/node_modules/npm/ sudo rm -rf /opt/homebrew/lib/node_modules/npm/
$install node $install node
elif [[ -f $GENTOO ]]; then elif [[ -f $GENTOO ]]; then
$install dev-lang/nodejs $install dev-lang/nodejs
fi fi
fi fi
} }
function install_pyright() { function install_pyright() {
# Install pyright # Install pyright
sudo npm -s -g i pyright --force sudo npm -s -g i pyright --force
} }
function install_mdformat() { function install_mdformat() {
# Install mdformat # Install mdformat
$pip install mdformat $PIPEXTPRE $pip install mdformat $PIPEXTPRE
} }
function install_ruff() { function install_ruff() {
# Install ruff # Install ruff
$pip install ruff $PIPEXTPRE $pip install ruff $PIPEXTPRE
} }
function install_bash-language-server() { function install_bash-language-server() {
# Install bash-language-server # Install bash-language-server
sudo npm -s -g i bash-language-server --force sudo npm -s -g i bash-language-server --force
} }
function install_yaml-language-server() { function install_yaml-language-server() {
# Install yaml-language-server # Install yaml-language-server
sudo npm -s -g i yaml-language-server --force sudo npm -s -g i yaml-language-server --force
} }
function install_shfmt() { function install_shfmt() {
# Install shfmt # Install shfmt
GO111MODULE=on go install mvdan.cc/sh/v3/cmd/shfmt@latest GO111MODULE=on go install mvdan.cc/sh/v3/cmd/shfmt@latest
} }
function install_lazy() { function install_lazy() {
# Install shfmt # Install shfmt
GO111MODULE=on go install github.com/jesseduffield/lazygit@latest GO111MODULE=on go install github.com/jesseduffield/lazygit@latest
GO111MODULE=on go install github.com/jesseduffield/lazydocker@latest GO111MODULE=on go install github.com/jesseduffield/lazydocker@latest
} }
function install_dlv() { function install_dlv() {
GO111MODULE=on go install github.com/go-delve/delve/cmd/dlv@latest GO111MODULE=on go install github.com/go-delve/delve/cmd/dlv@latest
} }
function install_terraform_stable() { function install_terraform_stable() {
# Install terraform and terraform-ls # Install terraform and terraform-ls
GO111MODULE=on go install github.com/hashicorp/terraform-ls@latest GO111MODULE=on go install github.com/hashicorp/terraform-ls@latest
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
$install tflint -q $install tflint -q
$install tfenv -q $install tfenv -q
TFENV_ARCH=amd64 tfenv install "$TERRAFORM_VERSION" TFENV_ARCH=amd64 tfenv install "$TERRAFORM_VERSION"
tfenv use "$TERRAFORM_VERSION" tfenv use "$TERRAFORM_VERSION"
else else
GO111MODULE=on go install github.com/hashicorp/terraform@v"$TERRAFORM_VERSION" GO111MODULE=on go install github.com/hashicorp/terraform@v"$TERRAFORM_VERSION"
curl -s https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash curl -s https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
fi fi
} }
function install_terraform() { function install_terraform() {
# Install terraform and terraform-ls # Install terraform and terraform-ls
GO111MODULE=on go install github.com/hashicorp/terraform-ls@latest GO111MODULE=on go install github.com/hashicorp/terraform-ls@latest
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
$install tflint -q $install tflint -q
$install tfenv -q $install tfenv -q
TFENV_ARCH=amd64 tfenv install latest TFENV_ARCH=amd64 tfenv install latest
mapfile -t TFENV_VER_ARRAY < <(tfenv list | grep -ioE ' [0-9.]+' | sed -e '1,1d') mapfile -t TFENV_VER_ARRAY < <(tfenv list | grep -ioE ' [0-9.]+' | sed -e '1,1d')
if [ "${#TFENV_VER_ARRAY[@]}" -gt "2" ]; then if [ "${#TFENV_VER_ARRAY[@]}" -gt "2" ]; then
for i in "${TFENV_VER_ARRAY[@]}"; do for i in "${TFENV_VER_ARRAY[@]}"; do
tfenv uninstall "$i" && timestamp "Removed - terraform '$i' version" tfenv uninstall "$i" && timestamp "Removed - terraform '$i' version"
done done
fi fi
else else
GO111MODULE=on go install github.com/hashicorp/terraform@latest GO111MODULE=on go install github.com/hashicorp/terraform@latest
curl -s https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash curl -s https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
fi fi
} }
function install_terragrunt() { function install_terragrunt() {
# Install terragrunt # Install terragrunt
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
$install terragrunt -q $install terragrunt -q
else else
TERRAGRUNT=$HOME/.local/bin/terragrunt TERRAGRUNT=$HOME/.local/bin/terragrunt
REMOTE_VERSION=$(curl -s https://api.github.com/repos/gruntwork-io/terragrunt/releases/latest | grep -iEo '"tag_name":.*' | sed 's/"tag_name"://g;s/"//g;s/,//g;s/ //g') REMOTE_VERSION=$(curl -s https://api.github.com/repos/gruntwork-io/terragrunt/releases/latest | grep -iEo '"tag_name":.*' | sed 's/"tag_name"://g;s/"//g;s/,//g;s/ //g')
CURRENT_VERSION="0.0.0" CURRENT_VERSION="0.0.0"
[ -f $TERRAGRUNT ] && CURRENT_VERSION=$($TERRAGRUNT version) [ -f $TERRAGRUNT ] && CURRENT_VERSION=$($TERRAGRUNT version)
if [ "$REMOTE_VERSION" == "$CURRENT_VERSION" ]; then if [ "$REMOTE_VERSION" == "$CURRENT_VERSION" ]; then
timestamp "The current version of the TSS-SDK is the same as the newest version" timestamp "The current version of the TSS-SDK is the same as the newest version"
return 0 return 0
else else
brew install wget wget https://github.com/gruntwork-io/terragrunt/releases/latest/download/terragrunt_linux_amd64 -O $TERRAGRUNT
wget https://github.com/gruntwork-io/terragrunt/releases/latest/download/terragrunt_linux_amd64 -O $TERRAGRUNT chmod +x "$TERRAGRUNT"
chmod +x "$TERRAGRUNT" fi
fi fi
fi
} }
function install_shellcheck() { function install_shellcheck() {
# Install shellcheck # Install shellcheck
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
$install shellcheck -q $install shellcheck -q
else else
curl -s https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash curl -s https://raw.githubusercontent.com/terraform-linters/tflint/master/install_linux.sh | bash
fi fi
} }
function install_marksman() { function install_marksman() {
# Install marksman # Install marksman
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
$install marksman -q $install marksman -q
else else
wget https://github.com/artempyanykh/marksman/releases/latest/download/marksman-linux-x64 -O $HOME/.local/bin/marksman wget https://github.com/artempyanykh/marksman/releases/latest/download/marksman-linux-x64 -O $HOME/.local/bin/marksman
chmod +x $HOME/.local/bin/marksman chmod +x $HOME/.local/bin/marksman
fi fi
} }
function install_go() { function install_go() {
# Install the golang # Install the golang
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
$install golang -q $install golang -q
elif [[ -f $GENTOO ]]; then elif [[ -f $GENTOO ]]; then
$install dev-lang/go $install dev-lang/go
fi fi
} }
function install_gopls() { function install_gopls() {
# Install gopls # Install gopls
GO111MODULE=on go install golang.org/x/tools/gopls@latest GO111MODULE=on go install golang.org/x/tools/gopls@latest
} }
function install_ansible() { function install_ansible() {
# Install Ansible # Install Ansible
$pip install ansible ansible-lint ansible-core $PIPEXTPRE $pip install ansible ansible-lint ansible-core $PIPEXTPRE
$pip install ansible-parallel $PIPEXTPRE $pip install ansible-parallel $PIPEXTPRE
} }
function install_ansible-language-server() { function install_ansible-language-server() {
# Install ansible-language-server # Install ansible-language-server
sudo npm -s -g i @ansible/ansible-language-server --force sudo npm -s -g i @ansible/ansible-language-server --force
sudo npm -s -g i yaml-language-server --force sudo npm -s -g i yaml-language-server --force
} }
function install_meraki_ansible() { function install_meraki_ansible() {
# Install python, ansible module for meraki # Install python, ansible module for meraki
ansible-galaxy collection install cisco.meraki --force ansible-galaxy collection install cisco.meraki --force
$pip install meraki $PIPEXT $pip install meraki $PIPEXT
} }
function install_azure_cli() { function install_azure_cli() {
# Install azure_cli # Install azure_cli
$install azure-cli $install azure-cli
} }
function install_awscli() { function install_awscli() {
# Install awscli # Install awscli
$install awscli $install awscli
} }
function install_aws_adfs() { function install_aws_adfs() {
# Install aws-adfs # Install aws-adfs
$pip install aws-adfs $PIPEXTPRE $pip install aws-adfs $PIPEXTPRE
} }
function install_ytdlp() { function install_ytdlp() {
# Install yt-dlp # Install yt-dlp
$pip install yt-dlp $PIPEXTPRE $pip install yt-dlp $PIPEXTPRE
} }
function install_spotifydl() { function install_spotifydl() {
# Install spotify_dl # Install spotify_dl
$pip install spotdl $PIPEXTPRE $pip install spotdl $PIPEXTPRE
} }
function install_fzf() { function install_fzf() {
# Install fzf # Install fzf
FOLDER="$CONFIG/fzf" FOLDER="$CONFIG/fzf"
mkdir -p $FOLDER mkdir -p $FOLDER
if [ -d $FOLDER ]; then if [ -d $FOLDER ]; then
cd $CONFIG || err "Folder $CONFIG has been NOT found" cd $CONFIG || err "Folder $CONFIG has been NOT found"
git clone https://github.com/junegunn/fzf.git $FOLDER && timestamp "Cloning the FZF" git clone https://github.com/junegunn/fzf.git $FOLDER && timestamp "Cloning the FZF"
cd $FOLDER || err "Folder $FOLDER has been NOT found" cd $FOLDER || err "Folder $FOLDER has been NOT found"
git pull -q && timestamp "Pulled the $FOLDER configuration" git pull -q && timestamp "Pulled the $FOLDER configuration"
make install make install
fi fi
} }
function install_zsh_addons() { function install_zsh_addons() {
if [ ! -d $ZSHFOLDER/aws ]; then if [ ! -d $ZSHFOLDER/aws ]; then
mkdir -p "$ZSHFOLDER/azure-cli" "$ZSHFOLDER/aws" curl -s https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/plugins/aws/aws.plugin.zsh \
-o "$ZSHFOLDER"/aws/aws.plugin.zsh &&
timestamp "Downloaded the newest version of aws plugin for zsh"
curl -s https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/plugins/aws/aws.plugin.zsh \ curl -s https://raw.githubusercontent.com/Azure/azure-cli/dev/az.completion \
-o "$ZSHFOLDER"/aws/aws.plugin.zsh && -o "$ZSHFOLDER"/azure-cli/az.completion &&
timestamp "Downloaded the newest version of aws plugin for zsh" timestamp "Downloaded the newest version of az plugin for zsh"
curl -s https://raw.githubusercontent.com/Azure/azure-cli/dev/az.completion \ mkdir -p "$ZSHFOLDER/azure-cli" "$ZSHFOLDER/aws"
-o "$ZSHFOLDER"/azure-cli/az.completion && cd $ZSHFOLDER || err "Folder $ZSHFOLDER has been NOT found"
timestamp "Downloaded the newest version of az plugin for zsh" git clone https://github.com/popstas/zsh-command-time.git &&
timestamp "Cloning the zsh-command-time"
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git &&
timestamp "Cloning the zsh-syntax-highlighting"
git clone https://github.com/zsh-users/zsh-autosuggestions.git &&
timestamp "Cloning the zsh-autosuggestions"
fi
cd $ZSHFOLDER || err "Folder $ZSHFOLDER has been NOT found" for i in $(ls $ZSHFOLDER); do
git clone https://github.com/popstas/zsh-command-time.git && FOLDER="$ZSHFOLDER/$i"
timestamp "Cloning the zsh-command-time" if [ -d "$FOLDER/.git" ]; then
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git && cd "$FOLDER" || err "Folder $FOLDER has been NOT found"
timestamp "Cloning the zsh-syntax-highlighting" git pull -q && timestamp "Pulling the $FOLDER configuration"
git clone https://github.com/zsh-users/zsh-autosuggestions.git && fi
timestamp "Cloning the zsh-autosuggestions" done
fi
for i in $(ls $ZSHFOLDER); do if [ ! -d $OHMYZSH ]; then
FOLDER="$ZSHFOLDER/$i" cd $OHMYZSH || err "Folder $OHMYZSH has been NOT found"
if [ -d "$FOLDER/.git" ]; then git pull -q && timestamp "Pulling the $OHMYZSH configuration"
cd "$FOLDER" || err "Folder $FOLDER has been NOT found" fi
git pull -q && timestamp "Pulling the $FOLDER configuration"
fi
done
if [ ! -d $OHMYZSH ]; then curl -s https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/plugins/aws/aws.plugin.zsh -o "$ZSHFOLDER"/aws/aws.plugin.zsh && timestamp "Downloaded the newest version of aws plugin for zsh"
cd $OHMYZSH || err "Folder $OHMYZSH has been NOT found" curl -s https://raw.githubusercontent.com/Azure/azure-cli/dev/az.completion -o "$ZSHFOLDER"/azure-cli/az.completion && timestamp "Downloaded the newest version of az plugin for zsh"
git pull -q && timestamp "Pulling the $OHMYZSH configuration"
fi
curl -s https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/plugins/aws/aws.plugin.zsh -o "$ZSHFOLDER"/aws/aws.plugin.zsh && timestamp "Downloaded the newest version of aws plugin for zsh"
curl -s https://raw.githubusercontent.com/Azure/azure-cli/dev/az.completion -o "$ZSHFOLDER"/azure-cli/az.completion && timestamp "Downloaded the newest version of az plugin for zsh"
} }
function install_speedtest() { function install_speedtest() {
# Install speedtest-cli # Install speedtest-cli
$pip install speedtest-cli $PIPEXTPRE $pip install speedtest-cli $PIPEXTPRE
} }
function install_gh_cli() { function install_gh_cli() {
# Install gh-cli # Install gh-cli
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
$install gh $install gh
elif [[ -f $GENTOO ]]; then elif [[ -f $GENTOO ]]; then
$install dev-util/github-cli $install dev-util/github-cli
fi fi
} }
function install_kubernetes() { function install_kubernetes() {
# Install kubectl # Install kubectl
LINK="" LINK=""
CURRENT_VERSION="" CURRENT_VERSION=""
REMOTE_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt) REMOTE_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt)
KUBECTL_LOCATION="/opt/homebrew/bin/kubectl" KUBECTL_LOCATION="/opt/homebrew/bin/kubectl"
[ -f $KUBECTL_LOCATION ] && CURRENT_VERSION=$($KUBECTL_LOCATION version --client | grep --color=no -iEo 'Client Version: v[0-9\.]+' | grep -ioE --color=no 'v[0-9\.]+') [ -f $KUBECTL_LOCATION ] && CURRENT_VERSION=$($KUBECTL_LOCATION version --client | grep --color=no -iEo 'Client Version: v[0-9\.]+' | grep -ioE --color=no 'v[0-9\.]+')
if [ "$REMOTE_VERSION" == "$CURRENT_VERSION" ]; then if [ "$REMOTE_VERSION" == "$CURRENT_VERSION" ]; then
timestamp "The current version of the kubectl is the same as the newest version" timestamp "The current version of the kubectl is the same as the newest version"
return 0 return 0
fi fi
if [[ "$(uname)" == "Darwin" ]]; then if [[ "$(uname)" == "Darwin" ]]; then
LINK="http://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/darwin/amd64/kubectl" LINK="http://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/darwin/amd64/kubectl"
else else
LINK="http://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" LINK="http://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
fi fi
wget "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" -O $KUBECTL_LOCATION wget "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" -O $KUBECTL_LOCATION
chmod +x $KUBECTL_LOCATION chmod +x $KUBECTL_LOCATION
} }
function install_rust() { function install_rust() {
# Install rust # Install rust
if command_exists rustc; then if command_exists rustc; then
rustup update rustup update
rustup component add rust-analyzer rustup component add rust-analyzer
else else
curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | sh curl --proto '=https' --tlsv1.2 https://sh.rustup.rs -sSf | sh
fi fi
} }
function install_tss_client() { function install_tss_client() {
# Install tss # Install tss
TSS_VERSION_STABLE="$1" CURRENT_VERSION="1.5.7"
CURRENT_VERSION="1.5.7"
if [ -z "$TSS_VERSION_STABLE" ]; then # Example link: https://downloads.ss.thycotic.com/secretserversdk/1.5.7/secretserver-sdk-1.5.7-linux-x64.zip
TSS_VERSION_STABLE="" TSSDOCS="https://docs.delinea.com/online-help/secret-server/api-scripting/sdk-devops/sdk-downloads/index.htm"
timestamp "TSS_VERSION_STABLE variable is empty, the latest version will be installed" LINK=""
fi REMOTE_VERSION=""
# Example link: https://downloads.ss.thycotic.com/secretserversdk/1.5.7/secretserver-sdk-1.5.7-linux-x64.zip if [ "$(uname)" == "Darwin" ]; then
TSSDOCS="https://docs.delinea.com/online-help/secret-server/api-scripting/sdk-devops/sdk-downloads/index.htm" LINK=$(curl -s -L $TSSDOCS | grep -iEo 'href=".*-osx-x64.zip"' | sed 's/href\=//g;s/"//g' | sort -r | head -n1)
LINK="" REMOTE_VERSION=$(echo $LINK | grep -iEo '[0-9.]+-osx' | sed 's/-osx//g')
REMOTE_VERSION="" else
LINK=$(curl -s -L $TSSDOCS | grep -iEo 'href=".*-linux-x64.zip"' | sed 's/href\=//g;s/"//g' | sort -r | head -n1)
REMOTE_VERSION=$(echo $LINK | grep -iEo '[0-9.]+-linux' | sed 's/-linux//g')
fi
if [ "$(uname)" == "Darwin" ]; then TSSFOLDER="$HOME/.local/tss-sdk"
if [ -n "$TSS_VERSION_STABLE" ]; then TSSLINK="$HOME/.local/bin/tss"
LINK="https://downloads.ss.thycotic.com/secretserversdk/$TSS_VERSION_STABLE/secretserver-sdk-$TSS_VERSION_STABLE-osx-x64.zip"
REMOTE_VERSION=$TSS_VERSION
else
LINK=$(curl -s -L $TSSDOCS | grep -iEo 'href=".*-osx-x64.zip"' | sed 's/href\=//g;s/"//g' | sort -r | head -n1)
REMOTE_VERSION=$(echo $LINK | grep -iEo '[0-9.]+-osx' | sed 's/-osx//g')
fi
else
LINK=$(curl -s -L $TSSDOCS | grep -iEo 'href=".*-linux-x64.zip"' | sed 's/href\=//g;s/"//g' | sort -r | head -n1)
REMOTE_VERSION=$(echo $LINK | grep -iEo '[0-9.]+-linux' | sed 's/-linux//g')
fi
TSSFOLDER="$HOME/.local/tss-sdk" [ -f $TSSLINK ] && CURRENT_VERSION=$($TSSLINK version)
TSSLINK="$HOME/.local/bin/tss"
[ -f $TSSLINK ] && CURRENT_VERSION=$($TSSLINK version) timestamp "Current version of the TSS-SDK: $CURRENT_VERSION"
timestamp "Remote version of the TSS-SDK: $REMOTE_VERSION"
timestamp "Current version of the TSS-SDK: $CURRENT_VERSION" if [ "$REMOTE_VERSION" == "$CURRENT_VERSION" ]; then
timestamp "Remote version of the TSS-SDK: $REMOTE_VERSION" timestamp "The current version of the TSS-SDK is the same as the newest version"
return 0
if [ "$REMOTE_VERSION" == "$CURRENT_VERSION" ]; then else
timestamp "The current version of the TSS-SDK is the same as the newest version" rm -rfv $TSSFOLDER $TSSLINK
return 0 mkdir $TSSFOLDER
else timestamp "Downloading the newest version of the TSS-SDK"
rm -rfv $TSSFOLDER $TSSLINK timestamp "Link: $LINK"
mkdir $TSSFOLDER wget $LINK -P $TSSFOLDER
timestamp "Downloading the newest version of the TSS-SDK" unzip $TSSFOLDER/secretserver-sdk-*.zip -d $TSSFOLDER
timestamp "Link: $LINK" rm -rfv $TSSFOLDER/secretserver-sdk-*.zip
wget $LINK -P $TSSFOLDER ln -s $TSSFOLDER/tss $TSSLINK
unzip $TSSFOLDER/secretserver-sdk-*.zip -d $TSSFOLDER chmod +x $TSSLINK
rm -rfv $TSSFOLDER/secretserver-sdk-*.zip fi
ln -s $TSSFOLDER/tss $TSSLINK
chmod +x $TSSLINK
fi
} }
function install_taplo() { function install_taplo() {
# Install taplo # Install taplo
$install taplo $install taplo
} }
function install_precommit() { function install_precommit() {
# Install pre-commit # Install pre-commit
$pip install pre-commit $PIPEXTPRE $pip install pre-commit $PIPEXTPRE
} }
function install_streamlink() { function install_streamlink() {
# Install streamlink # Install streamlink
$pip install streamlink $PIPEXTPRE $pip install streamlink $PIPEXTPRE
} }
function install_brew_programs() { function install_brew_programs() {
# Install brew programs # Install brew programs
INSTALLED_PROGRAMS=$(brew list) INSTALLED_PROGRAMS=$(brew list)
while IFS='' read -r line; do LIST_OF_PROGRAMS+=("$line"); done < <(cat "$HOME"/.brew_programs) while IFS='' read -r line; do LIST_OF_PROGRAMS+=("$line"); done < <(cat "$HOME"/.brew_programs)
while IFS='' read -r line; do LIST_OF_PROGRAMS_CASK+=("$line"); done < <(cat "$HOME"/.brew_programs_cask) while IFS='' read -r line; do LIST_OF_PROGRAMS_CASK+=("$line"); done < <(cat "$HOME"/.brew_programs_cask)
while IFS='' read -r line; do LIST_OF_PROGRAMS_DISABLE+=("$line"); done < <(cat "$HOME"/.brew_programs_disable)
for i in "${LIST_OF_PROGRAMS[@]}"; do for i in "${LIST_OF_PROGRAMS[@]}"; do
if [[ ! " ${INSTALLED_PROGRAMS[*]} " =~ ${i} ]] && if [[ ! " ${INSTALLED_PROGRAMS[*]} " =~ ${i} ]]; then
[[ ! " ${LIST_OF_PROGRAMS_DISABLE[*]} " =~ ${i} ]]; then brew install $i --force
brew install $i --force fi
fi done
done
for i in "${LIST_OF_PROGRAMS_CASK[@]}"; do for i in "${LIST_OF_PROGRAMS_CASK[@]}"; do
if [[ ! " ${INSTALLED_PROGRAMS[*]} " =~ ${i} ]] && if [[ ! " ${INSTALLED_PROGRAMS[*]} " =~ ${i} ]]; then
[[ ! " ${LIST_OF_PROGRAMS_DISABLE[*]} " =~ ${i} ]]; then brew install $i --cask --force
brew install $i --cask --force fi
fi done
done
xattr -r -d com.apple.quarantine /Applications/Spotify.app xattr -r -d com.apple.quarantine /Applications/Spotify.app
xattr -r -d com.apple.quarantine /Applications/Stats.app xattr -r -d com.apple.quarantine /Applications/Stats.app
xattr -r -d com.apple.quarantine /opt/homebrew/bin/mpv /Applications/mpv.app xattr -r -d com.apple.quarantine /opt/homebrew/bin/mpv /Applications/mpv.app
duti -s io.mpv avi all duti -s io.mpv avi all
duti -s io.mpv mkv all duti -s io.mpv mkv all
duti -s io.mpv mp4 all duti -s io.mpv mp4 all
duti -s io.mpv ts all duti -s io.mpv ts all
xattr -r -d com.apple.quarantine /Applications/qView.app xattr -r -d com.apple.quarantine /Applications/qView.app
duti -s com.interversehq.qView public.jpeg all duti -s com.interversehq.qView public.jpeg all
duti -s com.interversehq.qView public.png all duti -s com.interversehq.qView public.png all
duti -s com.interversehq.qView com.compuserve.gif all duti -s com.interversehq.qView com.compuserve.gif all
duti -s com.interversehq.qView public.tiff all duti -s com.interversehq.qView public.tiff all
xattr -r -d com.apple.quarantine /Applications/chatterino.app xattr -r -d com.apple.quarantine /Applications/chatterino.app
brew cleanup --prune=all brew cleanup --prune=all
} }
function install_winbox_old() { function install_winbox_old() {
curl -o /tmp/winbox64.exe \ curl -o /tmp/winbox64.exe \
"$(curl --silent https://mikrotik.com/download | grep -o 'https:\/\/download.*winbox64.exe')" "$(curl --silent https://mikrotik.com/download | grep -o 'https:\/\/download.*winbox64.exe')"
mv -v /tmp/winbox64.exe ~/Applications/winbox.exe mv -v /tmp/winbox64.exe ~/Applications/winbox.exe
xattr -cr ~/Applications/winbox.exe xattr -cr ~/Applications/winbox.exe
}
function install_prettier() {
$install prettier
$install prettierd
}
function install_google_cloud_sdk() {
# Install google cloud sdk
if [[ "$(uname)" == "Darwin" ]]; then
$install google-cloud-sdk
else
curl -s https://sdk.cloud.google.com | bash
fi
}
function install_lib_wandio() {
local REPO="LibtraceTeam/wandio"
local REMOTE_VERSION=$(curl -s \
https://api.github.com/repos/$REPO/releases/latest |
grep -iEo '"tag_name":.*' |
sed 's/"tag_name"://g;s/"//g;s/,//g;s/ //g')
local RELEASE="${REMOTE_VERSION}.tar.gz"
local DEST="/tmp/wandio-$REMOTE_VERSION.tar.gz"
local DEST_FOLDER="/tmp/wandio-$REMOTE_VERSION"
$install autoconf automake libtool
wget https://github.com/$REPO/archive/refs/tags/$RELEASE -O $DEST
tar -xvf $DEST -C /tmp
cd $DEST_FOLDER || err "Folder $DEST_FOLDER has been NOT found"
./bootstrap.sh
./configure
make -j"$(nproc)"
sudo make install && timestamp "Installed the newest version of the $REPO"
rm -rfv $DEST $DEST_FOLDER
}
function install_bgpreader() {
local CURRENT_VERSION="0.0.0"
local REPO="CAIDA/libbgpstream"
local NAME="${REPO##*/}"
local REMOTE_VERSION=$(curl -s \
https://api.github.com/repos/$REPO/releases/latest |
grep -iEo '"tag_name":.*' |
sed 's/"tag_name"://g;s/"//g;s/,//g;s/ //g')
local RELEASE="$NAME-${REMOTE_VERSION/v/}.tar.gz"
local DEST="/tmp/$NAME-$REMOTE_VERSION.tar.gz"
local DEST_FOLDER="/tmp/$NAME-$REMOTE_VERSION"
if command_exists bgpreader; then
CURRENT_VERSION="v$(bgpreader -v 2>&1 | grep -ioE '[0-9\.]+')"
fi
if [ "$CURRENT_VERSION" == "$REMOTE_VERSION" ]; then
timestamp "The current version of the BGPREADER is the same as the newest version"
return 0
else
$install autoconf automake libtool
command_start install_lib_wandio
wget https://github.com/$REPO/releases/download/$REMOTE_VERSION/$RELEASE -O $DEST
tar -xvf $DEST -C /tmp
cd /tmp/$NAME-* || err "Folder /tmp/$NAME-* has been NOT found"
./configure --without-kafka
make -j"$(nproc)"
sudo make install && timestamp "Installed the newest version of the $REPO"
rm -rfv /tmp/$NAME-*
fi
}
function install_font_terminess() {
local REPO="ryanoasis/nerd-fonts"
local REMOTE_VERSION=$(curl -s \
https://api.github.com/repos/$REPO/releases/latest |
grep -iEo '"tag_name":.*' |
sed 's/"tag_name"://g;s/"//g;s/,//g;s/ //g')
local RELEASE="Terminus.zip"
local DEST="/tmp/Terminess"
if [ ! -f $HOME/Library/Fonts/TerminessNerdFont-Regular.ttf ]; then
mkdir -p $DEST
cd $DEST || err "Folder $DEST has been NOT found"
wget https://github.com/$REPO/releases/download/$REMOTE_VERSION/$RELEASE -O $DEST/$RELEASE
unzip $RELEASE -d $DEST
mv $DEST/*.ttf ~/Library/Fonts
cd $HOME || err "Folder $HOME has been NOT found"
rm -rfv $DEST
fi
} }
function main() { function main() {
# command_start update_pip command_start update_pip
# command_start install_neovim_module_for_python command_start install_neovim_module_for_python
# command_start install_node command_start install_node
# command_start install_go command_start install_go
# # command_start install_pyright # command_start install_pyright
# command_start install_mdformat command_start install_mdformat
# command_start install_ruff command_start install_ruff
# command_start install_lazy command_start install_lazy
# command_start install_dlv command_start install_dlv
# command_start install_bash-language-server command_start install_bash-language-server
# command_start install_yaml-language-server command_start install_yaml-language-server
# command_start install_marksman command_start install_marksman
# command_start install_shfmt command_start install_shfmt
# command_start install_shellcheck command_start install_shellcheck
# command_start install_gopls command_start install_gopls
# # command_start install_terraform # command_start install_terraform
command_start install_terraform_stable command_start install_terraform_stable
command_start install_terragrunt command_start install_terragrunt
command_start install_azure_cli command_start install_azure_cli
command_start install_ansible command_start install_ansible
command_start install_meraki_ansible command_start install_meraki_ansible
command_start install_ansible-language-server command_start install_ansible-language-server
command_start install_ytdlp command_start install_ytdlp
command_start install_spotifydl command_start install_spotifydl
command_start install_awscli command_start install_awscli
command_start install_aws_adfs command_start install_aws_adfs
command_start install_speedtest command_start install_speedtest
command_start install_gh_cli command_start install_gh_cli
command_start install_kubernetes command_start install_kubernetes
command_start install_rust command_start install_rust
command_start install_tss_client "1.5.9" command_start install_tss_client
command_start install_taplo command_start install_taplo
command_start install_precommit command_start install_precommit
command_start install_streamlink command_start install_streamlink
command_start install_fzf command_start install_fzf
command_start install_winbox_old command_start install_winbox_old
command_start install_prettier command_start install_zsh_addons
command_start install_google_cloud_sdk command_start install_brew_programs
command_start install_bgpreader
command_start install_font_terminess
command_start install_zsh_addons
command_start install_brew_programs
} }
main main

View File

@@ -6,7 +6,7 @@ export QT_IM_MODULE=ibus
KERNEL=$(uname -sr) KERNEL=$(uname -sr)
[[ $KERNEL =~ "icrosoft" ]] && "/mnt/c/Program Files/Mozilla Firefox/firefox.exe" "$@" [[ $KERNEL =~ "icrosoft" ]] && "/mnt/c/Program Files/Mozilla Firefox/firefox.exe" "$@"
[[ $KERNEL =~ "gentoo" ]] && GDK_DPI_SCALE="1.2" firefox "$@" [[ $KERNEL =~ "gentoo" ]] && GDK_DPI_SCALE="1.2" firefox "$@"
[[ $KERNEL =~ "Darwin" ]] && open -a Firefox\ Nightly "$@" [[ $KERNEL =~ "Darwin" ]] && open -a firefox -u "$2"
#[[ $KERNEL =~ "gentoo" ]] && __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 __GLX_VENDOR_LIBRARY_NAME=nvidia __GL_SYNC_TO_VBLANK=0 GDK_DPI_SCALE="1.2" firefox "$@" #[[ $KERNEL =~ "gentoo" ]] && __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 __GLX_VENDOR_LIBRARY_NAME=nvidia __GL_SYNC_TO_VBLANK=0 GDK_DPI_SCALE="1.2" firefox "$@"
# Firefox # Firefox

View File

@@ -1,22 +0,0 @@
#!/bin/bash
SERVER="$1"
if [ -z "$SERVER" ]; then
echo "Usage: $0 <server_ip>"
exit 1
fi
echo "Starting..."
echo
# Upload test (client sends data to server)
UPLOAD=$(iperf3 -c "$SERVER" -P5 -t 30 --json | jq '.end.sum_sent.bits_per_second / 1000000')
# Download test (client receives data from server)
DOWNLOAD=$(iperf3 -c "$SERVER" -P5 -t 30 -R --json | jq '.end.sum_received.bits_per_second / 1000000')
# Print summary
echo "SERVER: $SERVER"
echo "UPLOAD: $(printf "%.2f" "$UPLOAD") Mbps"
echo "DOWNLOAD: $(printf "%.2f" "$DOWNLOAD") Mbps"

View File

@@ -1,16 +0,0 @@
#!/bin/bash
FILE_FFMPEG="$1"
ffmpeg -i "$FILE_FFMPEG" \
-vf "scale=1920:1080" \
-c:v h264_videotoolbox \
-b:v 3000k \
-preset medium \
-movflags \
+faststart \
-c:a aac \
-b:a 192k \
-ac 2 \
-map 0:v \
-map 0:a \
-map 0:s \
-c:s copy resized.mkv

View File

@@ -1,24 +1,15 @@
#!/bin/bash #!/bin/bash
FOLDER_AUDIOBOOK="/Volumes/Music/Jellyfin/Playlist-Audiobook"
FOLDER_FAV="/Volumes/Music/Jellyfin/Playlist-Fav" FOLDER_FAV="/Volumes/Music/Jellyfin/Playlist-Fav"
FOLDER_DUB="/Volumes/Music/Jellyfin/Playlist-Dub" FOLDER_DUB="/Volumes/Music/Jellyfin/Playlist-Dub"
FOLDER_PIANO="/Volumes/Music/Jellyfin/Playlist-Piano"
FOLDER_DUB_SETS="/Volumes/Music/Jellyfin/Playlist-Dub-Sets"
# Check if folder exists # Check if folder exists
[ ! -d $FOLDER_AUDIOBOOK ] && exit 1
[ ! -d $FOLDER_DUB ] && exit 1 [ ! -d $FOLDER_DUB ] && exit 1
[ ! -d $FOLDER_FAV ] && exit 1 [ ! -d $FOLDER_FAV ] && exit 1
[ ! -d $FOLDER_PIANO ] && exit 1
[ ! -d $FOLDER_DUB_SETS ] && exit 1
# Remove old files # Remove old files
rm -rfv $FOLDER_AUDIOBOOK/errors.txt
rm -rfv $FOLDER_DUB/errors.txt rm -rfv $FOLDER_DUB/errors.txt
rm -rfv $FOLDER_FAV/errors.txt rm -rfv $FOLDER_FAV/errors.txt
rm -rfv $FOLDER_PIANO/errors.txt
rm -rfv $FOLDER_DUB_SETS/errors.txt
# Download new files for DUB # Download new files for DUB
cd $FOLDER_DUB || exit 1 cd $FOLDER_DUB || exit 1
@@ -41,31 +32,16 @@ spotdl --user-auth --keep-alive \
--yt-dlp-args no-check-certificates --yt-dlp-args no-check-certificates
# Sync to Jellyfin # Sync to Jellyfin
rsync -h --progress --recursive --ignore-existing \
$FOLDER_AUDIOBOOK/* docker-de:/mnt/HC_Volume_34966154/jellifin/media/music/Audiobook
rsync -h --progress --recursive --ignore-existing \ rsync -h --progress --recursive --ignore-existing \
$FOLDER_DUB/* docker-de:/mnt/HC_Volume_34966154/jellifin/media/music/Dub $FOLDER_DUB/* docker-de:/mnt/HC_Volume_34966154/jellifin/media/music/Dub
rsync -h --progress --recursive --ignore-existing \ rsync -h --progress --recursive --ignore-existing \
$FOLDER_FAV/* docker-de:/mnt/HC_Volume_34966154/jellifin/media/music/Fav $FOLDER_FAV/* docker-de:/mnt/HC_Volume_34966154/jellifin/media/music/Fav
rsync -h --progress --recursive --ignore-existing \
$FOLDER_PIANO/* docker-de:/mnt/HC_Volume_34966154/jellifin/media/music/Piano
rsync -h --progress --recursive --ignore-existing \
$FOLDER_DUB_SETS/* docker-de:/mnt/HC_Volume_34966154/jellifin/media/music/Dub-Sets
# Generate playlist # Generate playlist
ssh docker-de -t "cd /mnt/HC_Volume_34966154/jellifin/media/music/Audiobook; find . -type f \( -name '*.mp3' -o -name '*.flac' -o -name '*.loss' -o -name '*.aiff' -o -name '*.aif' \) -printf './%P\n' | sort > playlist.m3u"
ssh docker-de -t "cd /mnt/HC_Volume_34966154/jellifin/media/music/Dub; find . -type f \( -name '*.mp3' -o -name '*.flac' -o -name '*.loss' -o -name '*.aiff' -o -name '*.aif' \) -printf './%P\n' | sort > playlist.m3u" ssh docker-de -t "cd /mnt/HC_Volume_34966154/jellifin/media/music/Dub; find . -type f \( -name '*.mp3' -o -name '*.flac' -o -name '*.loss' -o -name '*.aiff' -o -name '*.aif' \) -printf './%P\n' | sort > playlist.m3u"
ssh docker-de -t "cd /mnt/HC_Volume_34966154/jellifin/media/music/Fav; find . -type f \( -name '*.mp3' -o -name '*.flac' -o -name '*.loss' -o -name '*.aiff' -o -name '*.aif' \) -printf './%P\n' | sort > playlist.m3u" ssh docker-de -t "cd /mnt/HC_Volume_34966154/jellifin/media/music/Fav; find . -type f \( -name '*.mp3' -o -name '*.flac' -o -name '*.loss' -o -name '*.aiff' -o -name '*.aif' \) -printf './%P\n' | sort > playlist.m3u"
ssh docker-de -t "cd /mnt/HC_Volume_34966154/jellifin/media/music/Piano; find . -type f \( -name '*.mp3' -o -name '*.flac' -o -name '*.loss' -o -name '*.aiff' -o -name '*.aif' \) -printf './%P\n' | sort > playlist.m3u"
ssh docker-de -t "cd /mnt/HC_Volume_34966154/jellifin/media/music/Dub-Sets; find . -type f \( -name '*.mp3' -o -name '*.flac' -o -name '*.loss' -o -name '*.aiff' -o -name '*.aif' \) -printf './%P\n' | sort > playlist.m3u"
# Fix permissions # Fix permissions
ssh docker-de -t 'chown docker-user: /mnt/HC_Volume_34966154/jellifin -R' ssh docker-de -t 'chown docker-user: /mnt/HC_Volume_34966154/jellifin -R'

View File

@@ -1,23 +1,13 @@
#!/bin/bash #!/bin/bash
~/.local/bin/sidebar-restore-macos ~/.local/bin/sidebar-restore-macos
open -gj "afp://10.0.0.14/Downloads" open -gj "afp://10.0.0.14/Downloads"
sleep 10
open -gj "afp://10.0.0.14/Anime" open -gj "afp://10.0.0.14/Anime"
sleep 2
open -gj "afp://10.0.0.14/Music" open -gj "afp://10.0.0.14/Music"
sleep 2
open -gj "afp://10.0.0.14/Video" open -gj "afp://10.0.0.14/Video"
sleep 2
open -gj "afp://10.0.0.14/Series" open -gj "afp://10.0.0.14/Series"
sleep 2
open -gj "afp://10.0.0.14/Photos" open -gj "afp://10.0.0.14/Photos"
sleep 2
open -gj "afp://10.0.0.14/Backups" open -gj "afp://10.0.0.14/Backups"
sleep 2
open -gj "afp://10.0.0.14/Recordings" open -gj "afp://10.0.0.14/Recordings"
sleep 2
open -gj "afp://10.0.0.14/Work"
sleep 2
/usr/local/bin/mysides add Synology file:///Volumes/Recordings/ /usr/local/bin/mysides add Synology file:///Volumes/Recordings/
/usr/local/bin/mysides add Synology file:///Volumes/Backups/ /usr/local/bin/mysides add Synology file:///Volumes/Backups/
@@ -27,4 +17,3 @@ sleep 2
/usr/local/bin/mysides add Synology file:///Volumes/Series/ /usr/local/bin/mysides add Synology file:///Volumes/Series/
/usr/local/bin/mysides add Synology file:///Volumes/Photos/ /usr/local/bin/mysides add Synology file:///Volumes/Photos/
/usr/local/bin/mysides add Synology file:///Volumes/Anime/ /usr/local/bin/mysides add Synology file:///Volumes/Anime/
/usr/local/bin/mysides add Synology file:///Volumes/Work

View File

@@ -2,4 +2,3 @@
KERNEL=$(uname -sr) KERNEL=$(uname -sr)
[[ $KERNEL =~ "icrosoft" ]] && $HOME/.local/bin/wsl-notify "$@" [[ $KERNEL =~ "icrosoft" ]] && $HOME/.local/bin/wsl-notify "$@"
[[ $KERNEL =~ "gentoo" ]] && /usr/bin/notify-send "$@" [[ $KERNEL =~ "gentoo" ]] && /usr/bin/notify-send "$@"
[[ $KERNEL =~ "Darwin" ]] && osascript -e "display notification \"$*\""

View File

@@ -1,10 +1,11 @@
#!/bin/bash #!/bin/bash
/usr/local/bin/mysides remove all /usr/local/bin/mysides remove all
/usr/local/bin/mysides add Home file://"$HOME"/ /usr/local/bin/mysides add yorune file:///Users/yorune/
/usr/local/bin/mysides add Git file://"$HOME"/git/ /usr/local/bin/mysides add Git file:///Users/yorune/git/
/usr/local/bin/mysides add Linux file://"$HOME"/MEGA/Systems/Linux/ /usr/local/bin/mysides add Linux file:///Users/yorune/MEGA/Systems/Linux/
/usr/local/bin/mysides add Downloads file://"$HOME"/Downloads/ /usr/local/bin/mysides add Downloads file:///Users/yorune/Downloads/
# /usr/local/bin/mysides add Aplications file:///Applications/ /usr/local/bin/mysides add Aplikacje file:///Applications/
# /usr/local/bin/mysides add Aplications file:///"$HOME"/Applications/ /usr/local/bin/mysides add Pictures file:///Users/yorune/Pictures/
/usr/local/bin/mysides add Screenshots file://"$HOME"/Screenshots/ /usr/local/bin/mysides add Screenshots file:///Users/yorune/Screenshots/
/usr/local/bin/mysides add Desktop file://"$HOME"/Desktop/ /usr/local/bin/mysides add Movies file:///Users/yorune/Movies/
/usr/local/bin/mysides add Desktop file:///Users/yorune/Desktop/

1
.local/bin/youtube-dl Symbolic link
View File

@@ -0,0 +1 @@
/usr/local/bin/yt-dlp

View File

@@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
yt-dlp --extract-audio --audio-format mp3 --embed-metadata --embed-thumbnail --add-metadata $1 yt-dlp --extract-audio --audio-format mp3 $1

View File

@@ -1 +0,0 @@
hidutil property --set '{"UserKeyMapping":[{"HIDKeyboardModifierMappingSrc":0x700000035,"HIDKeyboardModifierMappingDst":0x700000064},{"HIDKeyboardModifierMappingSrc":0x700000064,"HIDKeyboardModifierMappingDst":0x700000035}]}'

34
.zshrc
View File

@@ -4,11 +4,11 @@ CONFIG=$HOME/.config
parse_git_branch() { parse_git_branch() {
command=$(git branch \ command=$(git branch \
2> /dev/null | 2>/dev/null |
sed -n -e 's/^\* \(.*\)/\1/p' | sed -n -e 's/^\* \(.*\)/\1/p' |
awk 'NF{print $NF}' | awk 'NF{print $NF}' |
sed 's/)//g' \ sed 's/)//g' \
2> /dev/null) 2>/dev/null)
[ -z $command ] && echo -e "$ " || echo -e "$command $ " [ -z $command ] && echo -e "$ " || echo -e "$command $ "
} }
@@ -33,11 +33,11 @@ plugins=(rake ruby vagrant knife knife_ssh kitchen)
ZSH_DISABLE_COMPFIX=true ZSH_DISABLE_COMPFIX=true
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh
[ -d $CONFIG/zsh/zsh-autosuggestions ] && source $CONFIG/zsh/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh &>> /dev/null [ -d $CONFIG/zsh/zsh-autosuggestions ] && source $CONFIG/zsh/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh &>>/dev/null
[ -d $CONFIG/zsh/zsh-syntax-highlighting ] && source $CONFIG/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh &>> /dev/null [ -d $CONFIG/zsh/zsh-syntax-highlighting ] && source $CONFIG/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh &>>/dev/null
[ -d $CONFIG/zsh/zsh-command-time ] && source $CONFIG/zsh/zsh-command-time/command-time.plugin.zsh &>> /dev/null [ -d $CONFIG/zsh/zsh-command-time ] && source $CONFIG/zsh/zsh-command-time/command-time.plugin.zsh &>>/dev/null
[ -d $CONFIG/zsh/aws ] && source $CONFIG/zsh/aws/aws.plugin.zsh &>> /dev/null [ -d $CONFIG/zsh/aws ] && source $CONFIG/zsh/aws/aws.plugin.zsh &>>/dev/null
[ -d $CONFIG/zsh/azure-cli ] && source $CONFIG/zsh/azure-cli/az.completion &>> /dev/null [ -d $CONFIG/zsh/azure-cli ] && source $CONFIG/zsh/azure-cli/az.completion &>>/dev/null
[ -f $HOME/.password ] && source $HOME/.password [ -f $HOME/.password ] && source $HOME/.password
[ -f $CONFIG/fzf/shell/key-bindings.zsh ] && source $HOME/.config/fzf/shell/key-bindings.zsh [ -f $CONFIG/fzf/shell/key-bindings.zsh ] && source $HOME/.config/fzf/shell/key-bindings.zsh
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
@@ -160,25 +160,24 @@ if [[ "$(uname)" == "Darwin" ]]; then
alias lsblk="diskutil list" alias lsblk="diskutil list"
alias Update="$HOME/.local/bin/Update-pkg; brew update; brew upgrade; brew upgrade --greedy; sudo softwareupdate -i -a -R" alias Update="$HOME/.local/bin/Update-pkg; brew update; brew upgrade; brew upgrade --greedy; sudo softwareupdate -i -a -R"
alias ls="ls -Gh" alias ls="ls -Gh"
alias mpv="mpv --ytdl-raw-options="yes-playlist=" --no-resume-playback --ytdl-format='bestvideo+bestaudio/best'" alias mpv="mpv --ytdl-raw-options="yes-playlist=" --no-resume-playback --ytdl-format='bestvideo[height<=?1080]+bestaudio/best'"
alias code="open -a 'Visual Studio Code'" alias code="open -a 'Visual Studio Code'"
alias xclip="sed $'s,\x1b\\[[0-9;]*[a-zA-Z],,g' | pbcopy" alias xclip="pbcopy"
alias mtr="sudo /opt/homebrew/opt/mtr/sbin/mtr" alias mtr="sudo /opt/homebrew/opt/mtr/sbin/mtr"
alias sleep-lid-off="sudo pmset -b sleep 0; sudo pmset -b disablesleep 1" alias sleep-lid-off="sudo pmset -b sleep 0; sudo pmset -b disablesleep 1"
alias sleep-lid-on="sudo pmset -b sleep 5; sudo pmset -b disablesleep 0" alias sleep-lid-on="sudo pmset -b sleep 5; sudo pmset -b disablesleep 0"
alias restart-network-share="sudo pkill -i netauthsysagent" alias restart-network-share="sudo pkill -i netauthsysagent"
alias streamlink="streamlink --config $HOME/.config/streamlink/config"
# Terraform # Terraform
export TFENV_ARCH=amd64 export TFENV_ARCH=amd64
export TFENVVERSION=$(ls -la /opt/homebrew/Cellar/tfenv/ | export TFENVVERSION=$(ls -la /opt/homebrew/Cellar/tfenv/ |
grep -iEo '[0-9]+\.[0-9]+\.[0-9]+' | grep -iEo '[0-9]\.[0-9]\.[0-9]' |
sort | sort |
head -n1) tail -n1)
export TFVERSION=$(ls -la /opt/homebrew/Cellar/tfenv/*/versions | export TFVERSION=$(ls -la /opt/homebrew/Cellar/tfenv/*/versions |
grep -iEo '[0-9]+\.[0-9]+\.[0-9]+' | grep -iEo '[0-9]\.[0-9]\.[0-9]' |
sort | sort |
head -n1) tail -n1)
export PATH=$PATH:/opt/homebrew/Cellar/tfenv/$TFENVVERSION/versions/$TFVERSION/ export PATH=$PATH:/opt/homebrew/Cellar/tfenv/$TFENVVERSION/versions/$TFVERSION/
# Unset browser # Unset browser
@@ -189,7 +188,7 @@ if [[ "$(uname)" == "Darwin" ]]; then
fi fi
# Setting the right editor # Setting the right editor
if which nvim > /dev/null 2>&1; then if which nvim >/dev/null 2>&1; then
export VISUAL='nvim -u $HOME/.vimrc' export VISUAL='nvim -u $HOME/.vimrc'
export EDITOR='nvim -u $HOME/.vimrc' export EDITOR='nvim -u $HOME/.vimrc'
else else
@@ -225,11 +224,8 @@ alias aria2c="aria2c --seed-time=0 --disable-ipv6 --max-upload-limit=1k"
alias irc="ssh mikrus -t 'screen -r'" alias irc="ssh mikrus -t 'screen -r'"
alias neofetch=fastfetch alias neofetch=fastfetch
# Zoxide
[ -f $(which zoxide) ] && {eval "$(zoxide init zsh)"; alias cd='z'}
# GoLang # GoLang
alias go-mod="go mod edit -go=$(go version | grep -oE 'go[0-9]*\.[0-9]*\.[0-9]*' | sed 's/go//g'); go get -u; go mod verify; go get -x -v; go mod verify; go mod tidy" alias go-mod="go mod edit -go $(go version | grep -oE 'go[0-9]*\.[0-9]*\.[0-9]*' | sed 's/go//g'); go get -u; go mod verify; go get -x -v; go mod verify; go mod tidy"
# Resolve problem with - zsh: no matches found # Resolve problem with - zsh: no matches found
setopt +o nomatch setopt +o nomatch

View File

@@ -1,16 +0,0 @@
refresher:
refreshInterval: 60
gui:
useHunkModeInStagingView: false
mainPanelSplitMode: "horizontal"
theme:
selectedLineBgColor:
- "#413660"
git:
autoFetch: true
pagers:
- colorArg: always
commit:
signOff: true
pull:
mode: "rebase"