Compare commits
1 Commits
master
..
c697587d9a
| Author | SHA1 | Date | |
|---|---|---|---|
|
c697587d9a
|
@@ -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.
@@ -1 +0,0 @@
|
|||||||
APPLaplt
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 362 B |
@@ -1,5 +0,0 @@
|
|||||||
{\rtf1\ansi\ansicpg1252\cocoartf2865
|
|
||||||
\cocoatextscaling0\cocoaplatform0{\fonttbl}
|
|
||||||
{\colortbl;\red255\green255\blue255;}
|
|
||||||
{\*\expandedcolortbl;;}
|
|
||||||
}
|
|
||||||
@@ -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>
|
|
||||||
@@ -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"
|
|
||||||
+1
-6
@@ -3,7 +3,6 @@ coreutils
|
|||||||
dockutil
|
dockutil
|
||||||
duti
|
duti
|
||||||
fastfetch
|
fastfetch
|
||||||
ffmpeg
|
|
||||||
git
|
git
|
||||||
gnu-sed
|
gnu-sed
|
||||||
htop
|
htop
|
||||||
@@ -12,17 +11,13 @@ ipcalc
|
|||||||
iperf3
|
iperf3
|
||||||
mtr
|
mtr
|
||||||
neovim
|
neovim
|
||||||
|
newsboat
|
||||||
parallel
|
parallel
|
||||||
pinentry-mac
|
|
||||||
ranger
|
ranger
|
||||||
ripgrep
|
ripgrep
|
||||||
rsync
|
rsync
|
||||||
taplo
|
|
||||||
telnet
|
|
||||||
texinfo
|
|
||||||
tmux
|
tmux
|
||||||
tree
|
tree
|
||||||
watch
|
|
||||||
wget
|
wget
|
||||||
zoxide
|
zoxide
|
||||||
zsh
|
zsh
|
||||||
|
|||||||
+14
-5
@@ -1,31 +1,40 @@
|
|||||||
|
alfred
|
||||||
alacritty
|
alacritty
|
||||||
chatterino
|
chatterino
|
||||||
dbeaver-community
|
dbeaver-community
|
||||||
discord
|
|
||||||
displaylink
|
displaylink
|
||||||
docker
|
docker
|
||||||
firefox
|
firefox@nightly
|
||||||
font-hack-nerd-font
|
font-hack-nerd-font
|
||||||
gimp
|
gimp
|
||||||
|
google-chrome
|
||||||
|
hiddenbar
|
||||||
|
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
|
|
||||||
postman
|
postman
|
||||||
|
platypus
|
||||||
qbittorrent
|
qbittorrent
|
||||||
rustdesk
|
qview
|
||||||
scroll-reverser
|
scroll-reverser
|
||||||
signal
|
signal
|
||||||
|
skype
|
||||||
spotify
|
spotify
|
||||||
|
stats
|
||||||
telegram
|
telegram
|
||||||
the-unarchiver
|
the-unarchiver
|
||||||
transfer
|
transfer
|
||||||
twingate
|
twingate
|
||||||
visual-studio-code
|
|
||||||
vlc
|
vlc
|
||||||
winbox
|
winbox
|
||||||
|
wine-crossover
|
||||||
wireshark
|
wireshark
|
||||||
|
zed@preview
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
example
|
|
||||||
displaylink
|
|
||||||
+13
-11
File diff suppressed because one or more lines are too long
@@ -15,32 +15,11 @@ bindings = [
|
|||||||
{ key = "V", mods = "Control|Shift", action = "Paste" },
|
{ key = "V", mods = "Control|Shift", action = "Paste" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[window]
|
|
||||||
opacity = 0.95
|
|
||||||
|
|
||||||
[font]
|
[font]
|
||||||
size = 20
|
size = 22
|
||||||
|
|
||||||
# [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]
|
[font.normal]
|
||||||
family = "Comic Code Ligatures"
|
family = "Terminess Nerd Font"
|
||||||
style = "Regular"
|
style = "Regular"
|
||||||
|
|
||||||
# [font.bold]
|
# [font.bold]
|
||||||
@@ -48,20 +27,16 @@ style = "Regular"
|
|||||||
# style = "Bold"
|
# style = "Bold"
|
||||||
|
|
||||||
[font.bold_italic]
|
[font.bold_italic]
|
||||||
family = "Comic Code"
|
family = "Terminess Nerd Font"
|
||||||
style = "Bold Italic"
|
style = "Bold Italic"
|
||||||
|
|
||||||
[font.italic]
|
[font.italic]
|
||||||
family = "Comic Code"
|
family = "Terminess Nerd Font"
|
||||||
style = "Italic"
|
style = "Italic"
|
||||||
|
|
||||||
[font.offset]
|
|
||||||
x = 0
|
|
||||||
y = -6
|
|
||||||
|
|
||||||
[font.glyph_offset]
|
[font.glyph_offset]
|
||||||
x = 0
|
x = 0
|
||||||
y = -2
|
y = 0
|
||||||
|
|
||||||
# [mouse.hints]
|
# [mouse.hints]
|
||||||
# modifiers = "Command"
|
# modifiers = "Command"
|
||||||
@@ -69,6 +44,10 @@ y = -2
|
|||||||
# [mouse.hints.launcher]
|
# [mouse.hints.launcher]
|
||||||
# program = "open"
|
# program = "open"
|
||||||
|
|
||||||
|
[font.offset]
|
||||||
|
x = 0
|
||||||
|
y = 0
|
||||||
|
|
||||||
[selection]
|
[selection]
|
||||||
save_to_clipboard = true
|
save_to_clipboard = true
|
||||||
|
|
||||||
|
|||||||
Symlink
+1
@@ -0,0 +1 @@
|
|||||||
|
/Users/yorune/Library/Application Support/iTerm2
|
||||||
@@ -371,17 +371,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": {
|
||||||
@@ -389,43 +379,17 @@
|
|||||||
"product_id": 666,
|
"product_id": 666,
|
||||||
"vendor_id": 76
|
"vendor_id": 76
|
||||||
},
|
},
|
||||||
"simple_modifications": [
|
|
||||||
{
|
|
||||||
"from": { "key_code": "right_command" },
|
|
||||||
"to": [{ "key_code": "right_option" }]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"identifiers": {
|
|
||||||
"is_keyboard": true,
|
|
||||||
"product_id": 666,
|
|
||||||
"vendor_id": 1452
|
|
||||||
},
|
|
||||||
"simple_modifications": [
|
|
||||||
{
|
|
||||||
"from": { "key_code": "right_command" },
|
|
||||||
"to": [{ "key_code": "right_option" }]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"identifiers": {
|
|
||||||
"is_keyboard": true,
|
|
||||||
"product_id": 34304,
|
|
||||||
"vendor_id": 1452
|
|
||||||
},
|
|
||||||
"ignore": true
|
"ignore": true
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"fn_function_keys": [
|
"fn_function_keys": [
|
||||||
{
|
|
||||||
"from": { "key_code": "f4" },
|
|
||||||
"to": [{ "apple_vendor_keyboard_key_code": "mission_control" }]
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"from": { "key_code": "f5" },
|
"from": { "key_code": "f5" },
|
||||||
"to": [{ "key_code": "f5" }]
|
"to": [{ "key_code": "f5" }]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": { "key_code": "f6" },
|
||||||
|
"to": [{ "key_code": "f13" }]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"name": "Default profile",
|
"name": "Default profile",
|
||||||
@@ -438,6 +402,18 @@
|
|||||||
{
|
{
|
||||||
"from": { "key_code": "caps_lock" },
|
"from": { "key_code": "caps_lock" },
|
||||||
"to": [{ "key_code": "escape" }]
|
"to": [{ "key_code": "escape" }]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": { "key_code": "left_command" },
|
||||||
|
"to": [{ "key_code": "right_command" }]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": { "key_code": "grave_accent_and_tilde" },
|
||||||
|
"to": [{ "key_code": "non_us_backslash" }]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": { "key_code": "non_us_backslash" },
|
||||||
|
"to": [{ "key_code": "grave_accent_and_tilde" }]
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"virtual_hid_keyboard": {
|
"virtual_hid_keyboard": {
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
refresher:
|
refresher:
|
||||||
refreshInterval: 60
|
refreshInterval: 60
|
||||||
gui:
|
gui:
|
||||||
useHunkModeInStagingView: false
|
|
||||||
mainPanelSplitMode: "horizontal"
|
mainPanelSplitMode: "horizontal"
|
||||||
theme:
|
theme:
|
||||||
selectedLineBgColor:
|
selectedLineBgColor:
|
||||||
|
|||||||
+171
-158
@@ -56,6 +56,7 @@ let g:indentLine_char_list = ['│', '│', '│', '│']
|
|||||||
runtime! macros/matchit.vim
|
runtime! macros/matchit.vim
|
||||||
|
|
||||||
" visual feedback
|
" visual feedback
|
||||||
|
set laststatus=2
|
||||||
set showmode
|
set showmode
|
||||||
set showcmd
|
set showcmd
|
||||||
|
|
||||||
@@ -171,169 +172,192 @@ call plug#begin('~/.config/nvim/plugged')
|
|||||||
" Autopair
|
" Autopair
|
||||||
Plug 'windwp/nvim-autopairs'
|
Plug 'windwp/nvim-autopairs'
|
||||||
|
|
||||||
" AI
|
|
||||||
Plug 'folke/snacks.nvim'
|
|
||||||
Plug 'coder/claudecode.nvim'
|
|
||||||
|
|
||||||
call plug#end()
|
call plug#end()
|
||||||
|
|
||||||
" LUA
|
" LUA
|
||||||
lua<<EOF
|
lua<<EOF
|
||||||
vim.filetype.add({
|
local opts = { noremap=true, silent=true }
|
||||||
-- Ansible
|
|
||||||
pattern = {
|
|
||||||
[".*playbooks/.*%.ya?ml"] = "yaml.ansible",
|
|
||||||
[".*tasks/.*%.ya?ml"] = "yaml.ansible",
|
|
||||||
[".*handlers/.*%.ya?ml"] = "yaml.ansible",
|
|
||||||
[".*roles/.*/.*%.ya?ml"] = "yaml.ansible",
|
|
||||||
},
|
|
||||||
-- Docker Compose + GitLab CI (merged into one filename table)
|
|
||||||
filename = {
|
|
||||||
["docker-compose.yml"] = "yaml.docker-compose",
|
|
||||||
["docker-compose.yaml"] = "yaml.docker-compose",
|
|
||||||
[".gitlab-ci.yml"] = "yaml.gitlab",
|
|
||||||
[".gitlab-ci.yaml"] = "yaml.gitlab",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- 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.bo[bufnr].omnifunc = 'v:lua.vim.lsp.omnifunc'
|
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.keymap.set('n', 'gD', vim.lsp.buf.declaration, { buffer = bufnr, silent = true })
|
--vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wa', '<cmd>lua vim.lsp.buf.add_workspace_folder()<CR>', opts)
|
||||||
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { buffer = bufnr, silent = true })
|
--vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wr', '<cmd>lua vim.lsp.buf.remove_workspace_folder()<CR>', opts)
|
||||||
vim.keymap.set('n', '<space>K', vim.lsp.buf.hover, { buffer = bufnr, silent = true })
|
--vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>wl', '<cmd>lua print(vim.inspect(vim.lsp.buf.list_workspace_folders()))<CR>', opts)
|
||||||
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, { buffer = bufnr, silent = true })
|
--vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
|
||||||
vim.keymap.set('n', 'ge', vim.diagnostic.setqflist, { buffer = bufnr, silent = true })
|
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>rn', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
||||||
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, { buffer = bufnr, silent = true })
|
vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
|
||||||
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, { buffer = bufnr, silent = true })
|
vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
|
||||||
vim.keymap.set('n', 'gr', vim.lsp.buf.references, { buffer = bufnr, silent = true })
|
--vim.api.nvim_buf_set_keymap(bufnr, 'n', '<space>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
local border = 'rounded'
|
|
||||||
|
|
||||||
vim.lsp.config('*', {
|
|
||||||
capabilities = capabilities,
|
|
||||||
})
|
|
||||||
|
|
||||||
vim.diagnostic.config({
|
|
||||||
float = { border = border },
|
|
||||||
})
|
|
||||||
|
|
||||||
vim.lsp.handlers["textDocument/hover"] = function(err, result, ctx, config)
|
|
||||||
config = config or {}
|
|
||||||
config.border = border
|
|
||||||
return vim.lsp.handlers.hover(err, result, ctx, config)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.lsp.handlers["textDocument/signatureHelp"] = function(err, result, ctx, config)
|
-- LSP settings (for overriding per client)
|
||||||
config = config or {}
|
local handlers = {
|
||||||
config.border = border
|
["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, {border = border}),
|
||||||
return vim.lsp.handlers.signature_help(err, result, ctx, config)
|
["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, {border = border }),
|
||||||
|
}
|
||||||
|
|
||||||
|
-- Use a loop to conveniently call 'setup' on multiple servers and
|
||||||
|
-- map buffer local keybindings when the language server attaches
|
||||||
|
local servers = { 'clangd', 'bashls', 'yamlls', 'ansiblels', 'gopls', 'solargraph', 'terraformls', 'tflint', 'marksman', 'rust_analyzer' }
|
||||||
|
for _, lsp in pairs(servers) do
|
||||||
|
require('lspconfig')[lsp].setup {
|
||||||
|
on_attach = on_attach,
|
||||||
|
handlers=handlers,
|
||||||
|
capabilities = capabilities,
|
||||||
|
flags = {
|
||||||
|
debounce_text_changes = 150,
|
||||||
|
}
|
||||||
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Server-specific overrides
|
|
||||||
vim.lsp.config('yamlls', {
|
-- Handlers when you are in the insert mode you see the errors
|
||||||
|
vim.lsp.handlers["textDocument/publishDiagnostics"] =
|
||||||
|
vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics,
|
||||||
|
{update_in_insert = true})
|
||||||
|
|
||||||
|
-- Setup a yamlls plugin
|
||||||
|
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', {})
|
|
||||||
|
|
||||||
-- Enable servers (remove 'solargraph' if not using Ruby)
|
|
||||||
vim.lsp.enable({
|
|
||||||
'clangd', 'bashls', 'yamlls', 'ansiblels', 'gopls', 'solargraph',
|
|
||||||
'terraformls', 'tflint', 'marksman', 'rust_analyzer', 'ruff',
|
|
||||||
})
|
|
||||||
|
|
||||||
-- nvim-cmp setup with Tab support
|
|
||||||
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 {
|
||||||
-- Tab: indent on empty/whitespace-only lines, trigger completion elsewhere
|
behavior = cmp.ConfirmBehavior.Replace,
|
||||||
|
select = true,
|
||||||
|
},
|
||||||
['<Tab>'] = cmp.mapping(function(fallback)
|
['<Tab>'] = cmp.mapping(function(fallback)
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
cmp.select_next_item()
|
cmp.select_next_item()
|
||||||
elseif vim.fn["copilot#GetDisplayedSuggestion"]().text ~= "" then
|
elseif luasnip.expand_or_jumpable() then
|
||||||
vim.fn.feedkeys(vim.fn["copilot#Accept"](""), "n")
|
luasnip.expand_or_jump()
|
||||||
elseif vim.api.nvim_get_current_line():match("^%s*$") then
|
|
||||||
fallback()
|
|
||||||
else
|
else
|
||||||
cmp.complete()
|
fallback()
|
||||||
end
|
end
|
||||||
end, { 'i', 's' }),
|
end, { 'i', 's' }),
|
||||||
|
|
||||||
-- Shift-Tab: go to previous completion item or fallback
|
|
||||||
['<S-Tab>'] = cmp.mapping(function(fallback)
|
['<S-Tab>'] = cmp.mapping(function(fallback)
|
||||||
if cmp.visible() then
|
if cmp.visible() then
|
||||||
cmp.select_prev_item()
|
cmp.select_prev_item()
|
||||||
|
elseif luasnip.jumpable(-1) then
|
||||||
|
luasnip.jump(-1)
|
||||||
else
|
else
|
||||||
fallback()
|
fallback()
|
||||||
end
|
end
|
||||||
end, { 'i', 's' }),
|
end, { 'i', 's' }),
|
||||||
|
|
||||||
-- Enter to confirm selection
|
|
||||||
['<CR>'] = cmp.mapping.confirm({ select = true }),
|
|
||||||
}),
|
}),
|
||||||
sources = cmp.config.sources({
|
sources = {
|
||||||
{ name = 'nvim_lsp' },
|
{ name = 'nvim_lsp' },
|
||||||
{ name = 'luasnip' },
|
{ name = 'luasnip' },
|
||||||
{ name = 'buffer' },
|
{ name = 'vsnip' },
|
||||||
|
{ name = 'ultisnips' },
|
||||||
|
{ name = 'snippy' },
|
||||||
{ name = 'path' },
|
{ name = 'path' },
|
||||||
}),
|
{ name = 'buffer' }
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
cmp.setup.cmdline(':', {
|
||||||
|
mapping = cmp.mapping.preset.cmdline(),
|
||||||
|
sources = cmp.config.sources({
|
||||||
|
|
||||||
|
{ name = 'path' }
|
||||||
|
}, {
|
||||||
|
{ name = 'cmdline' }
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
vim.keymap.set("t", "<C-w>h", "<C-\\><C-n><C-w>h", { desc = "Move to left window" })
|
cmp.setup.cmdline('/', {
|
||||||
vim.keymap.set("t", "<C-w>l", "<C-\\><C-n><C-w>l", { desc = "Move to right window" })
|
|
||||||
vim.keymap.set("t", "<C-w>p", "<C-\\><C-n><C-w>p", { desc = "Focus previous window" })
|
|
||||||
|
|
||||||
require("claudecode").setup()
|
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
|
||||||
set updatetime=250
|
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>")
|
||||||
let g:copilot_no_tab_map = v:true
|
let g:copilot_no_tab_map = v:true
|
||||||
|
|
||||||
" Neoformat
|
" Neoformat
|
||||||
@@ -359,7 +383,7 @@ function! s:check_back_space() abort
|
|||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
" Enable show hidden in NerdTree
|
" Enable show hidden in NerdTree
|
||||||
let g:NERDTreeShowHidden=1
|
let NERDTreeShowHidden=1
|
||||||
|
|
||||||
" latex
|
" latex
|
||||||
let g:tex_flavor = "latex"
|
let g:tex_flavor = "latex"
|
||||||
@@ -371,13 +395,13 @@ let g:vimspector_install_gadgets = [ 'debugpy', 'vscode-go', 'CodeLLDB', 'vscode
|
|||||||
""""""""""""""""""""""""""""""""
|
""""""""""""""""""""""""""""""""
|
||||||
" Theme
|
" Theme
|
||||||
""""""""""""""""""""""""""""""""
|
""""""""""""""""""""""""""""""""
|
||||||
" colorscheme gruvbox
|
"colorscheme gruvbox
|
||||||
" colorscheme default
|
"colorscheme default
|
||||||
colorscheme dracula
|
colorscheme dracula
|
||||||
let g:gruvbox_invert_selection='0'
|
let g:gruvbox_invert_selection='0'
|
||||||
let g:gruvbox_contrast_dark = 'hard'
|
let g:gruvbox_contrast_dark = 'hard'
|
||||||
set background=dark
|
set background=dark
|
||||||
" hi Normal ctermbg=NONE
|
"hi Normal ctermbg=NONE
|
||||||
hi Pmenu ctermfg=NONE ctermbg=236 cterm=NONE guifg=NONE guibg=#64666d gui=NONE
|
hi Pmenu ctermfg=NONE ctermbg=236 cterm=NONE guifg=NONE guibg=#64666d gui=NONE
|
||||||
hi PmenuSel ctermfg=NONE ctermbg=246 cterm=NONE guifg=NONE guibg=#204a87 gui=NONE
|
hi PmenuSel ctermfg=NONE ctermbg=246 cterm=NONE guifg=NONE guibg=#204a87 gui=NONE
|
||||||
hi CursorLine cterm=NONE term=NONE ctermbg=NONE guibg=NONE
|
hi CursorLine cterm=NONE term=NONE ctermbg=NONE guibg=NONE
|
||||||
@@ -391,7 +415,7 @@ set t_ZR="\e[23m"
|
|||||||
highlight Comment cterm=italic gui=italic
|
highlight Comment cterm=italic gui=italic
|
||||||
highlight htmlArg gui=italic cterm=italic
|
highlight htmlArg gui=italic cterm=italic
|
||||||
|
|
||||||
" column
|
" columne
|
||||||
set textwidth=80
|
set textwidth=80
|
||||||
set colorcolumn=80
|
set colorcolumn=80
|
||||||
highlight ColorColumn ctermbg=236
|
highlight ColorColumn ctermbg=236
|
||||||
@@ -408,23 +432,18 @@ function! StatuslineGit()
|
|||||||
return strlen(l:branchname) > 0?' '.l:branchname.' ':''
|
return strlen(l:branchname) > 0?' '.l:branchname.' ':''
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
set laststatus=3
|
set statusline=
|
||||||
|
set statusline+=%#IncSearch#
|
||||||
lua <<EOF
|
set statusline+=%{&filetype!=#''?'\ \ ['.&filetype.']\ ':'\ '}
|
||||||
vim.o.statusline = table.concat({
|
set statusline+=%{&modified?'[+]\ ':''}
|
||||||
"%#IncSearch#",
|
set statusline+=%#CursorLineNr#
|
||||||
"%{&filetype!=#''?' ['.&filetype..'] ':' '}",
|
set statusline+=\ %F
|
||||||
"%{&modified?'[+] ':''}",
|
set statusline+=%= "Right side settings
|
||||||
"%#CursorLineNr#",
|
set statusline+=%#CursorLineNr#
|
||||||
" %F",
|
set statusline+=%{StatuslineGit()}
|
||||||
"%=",
|
set statusline+=%#Search#
|
||||||
"%#CursorLineNr#",
|
set statusline+=\ %l/%L
|
||||||
"%{StatuslineGit()}",
|
set statusline+=\ [%c]
|
||||||
"%#Search#",
|
|
||||||
" %l/%L",
|
|
||||||
" [%c]",
|
|
||||||
})
|
|
||||||
EOF
|
|
||||||
|
|
||||||
" Disable godoc keys
|
" Disable godoc keys
|
||||||
let g:go_doc_keywordprg_enabled = 0
|
let g:go_doc_keywordprg_enabled = 0
|
||||||
@@ -451,7 +470,7 @@ nmap <C-_> <Plug>Commentary
|
|||||||
omap <C-_> <Plug>Commentary
|
omap <C-_> <Plug>Commentary
|
||||||
nmap <C-_> <Plug>CommentaryLine
|
nmap <C-_> <Plug>CommentaryLine
|
||||||
|
|
||||||
" Better tab (visual mode only - insert mode Tab is handled by nvim-cmp above)
|
" Better tab
|
||||||
vnoremap <Tab> >
|
vnoremap <Tab> >
|
||||||
vnoremap <S-Tab> <
|
vnoremap <S-Tab> <
|
||||||
|
|
||||||
@@ -469,10 +488,10 @@ nmap <Leader>g <cmd>Telescope git_branches<cr>
|
|||||||
nmap <Leader>a <cmd>Telescope diagnostics<cr>
|
nmap <Leader>a <cmd>Telescope diagnostics<cr>
|
||||||
|
|
||||||
" Resize window
|
" Resize window
|
||||||
nnoremap Ó :vertical resize -5<CR>
|
nnoremap <C-L> :vertical resize +5<CR>
|
||||||
nnoremap Ô :res -5<CR>
|
nnoremap <C-H> :vertical resize -5<CR>
|
||||||
nnoremap ū :res +5<CR>
|
nnoremap <C-J> :res -5<CR>
|
||||||
nnoremap Ł :vertical resize +5<CR>
|
nnoremap <C-K> :res +5<CR>
|
||||||
|
|
||||||
" Split window
|
" Split window
|
||||||
nnoremap _ :vsp <CR>
|
nnoremap _ :vsp <CR>
|
||||||
@@ -508,7 +527,7 @@ vnoremap <A-k> :m '<-2<CR>gv=gv
|
|||||||
nnoremap <Leader>s :%s//g<Left><Left>
|
nnoremap <Leader>s :%s//g<Left><Left>
|
||||||
vnoremap <Leader>s :s//g<Left><Left>
|
vnoremap <Leader>s :s//g<Left><Left>
|
||||||
|
|
||||||
" Better adding into beginning and ending line
|
" Better adding into begging and ending line
|
||||||
vnoremap F <C-v>$A
|
vnoremap F <C-v>$A
|
||||||
vnoremap f <C-v>0I
|
vnoremap f <C-v>0I
|
||||||
|
|
||||||
@@ -530,14 +549,6 @@ nnoremap J }
|
|||||||
nnoremap K {
|
nnoremap K {
|
||||||
vnoremap J }
|
vnoremap J }
|
||||||
vnoremap K {
|
vnoremap K {
|
||||||
nnoremap <C-h> <C-w>h
|
|
||||||
nnoremap <C-j> <C-w>j
|
|
||||||
nnoremap <C-k> <C-w>k
|
|
||||||
nnoremap <C-l> <C-w>l
|
|
||||||
tnoremap <C-h> <C-\><C-n><C-w>h
|
|
||||||
tnoremap <C-j> <C-\><C-n><C-w>j
|
|
||||||
tnoremap <C-k> <C-\><C-n><C-w>k
|
|
||||||
tnoremap <C-l> <C-\><C-n><C-w>l
|
|
||||||
|
|
||||||
" Copy into system
|
" Copy into system
|
||||||
noremap <Leader>y "*y
|
noremap <Leader>y "*y
|
||||||
@@ -570,7 +581,6 @@ map <F4> :setlocal spell! spelllang=pl<CR>
|
|||||||
:command! W w
|
:command! W w
|
||||||
:command! Q q
|
:command! Q q
|
||||||
:command! Wq wq
|
:command! Wq wq
|
||||||
:command! X x
|
|
||||||
|
|
||||||
""""""""""""""""""""""""""""""""
|
""""""""""""""""""""""""""""""""
|
||||||
" Custom functions
|
" Custom functions
|
||||||
@@ -591,6 +601,7 @@ lua <<EOF
|
|||||||
end
|
end
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
|
||||||
""""""""""""""""""""""""""""""""
|
""""""""""""""""""""""""""""""""
|
||||||
" Files
|
" Files
|
||||||
""""""""""""""""""""""""""""""""
|
""""""""""""""""""""""""""""""""
|
||||||
@@ -628,6 +639,7 @@ 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,*.yml let g:indentLine_enabled = 1
|
||||||
autocmd BufRead,BufNewFile *.yaml,*.yml let g:indentLine_char = '⦙'
|
autocmd BufRead,BufNewFile *.yaml,*.yml let g:indentLine_char = '⦙'
|
||||||
|
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,*.yml silent! undojoin | Neoformat prettier
|
||||||
|
|
||||||
" JSON
|
" JSON
|
||||||
@@ -653,7 +665,7 @@ au BufNewFile,BufRead,BufWritePre *.ebuild let g:shfmt_extra_args = '-ci -sr -s'
|
|||||||
" TOML
|
" TOML
|
||||||
autocmd BufWritePre *.toml silent! undojoin | Neoformat taplo
|
autocmd BufWritePre *.toml silent! undojoin | Neoformat taplo
|
||||||
|
|
||||||
" Terraform
|
" Terrafrom
|
||||||
autocmd BufWritePre *.tf lua vim.lsp.buf.format()
|
autocmd BufWritePre *.tf lua vim.lsp.buf.format()
|
||||||
autocmd BufWritePre *.tfvars lua vim.lsp.buf.format()
|
autocmd BufWritePre *.tfvars lua vim.lsp.buf.format()
|
||||||
|
|
||||||
@@ -665,6 +677,7 @@ autocmd BufWritePre *.md silent! undojoin | Neoformat mdformat
|
|||||||
autocmd BufWritePre * %s/\s\+$//e
|
autocmd BufWritePre * %s/\s\+$//e
|
||||||
autocmd BufWritepre * %s/\n\+\%$//e
|
autocmd BufWritepre * %s/\n\+\%$//e
|
||||||
|
|
||||||
|
" Source: https://vi.stackexchange.com/questions/20077/automatically-highlight-all-occurrences-of-the-selected-text-in-visual-mode
|
||||||
" highlight the visual selection after pressing enter.
|
" highlight the visual selection after pressing enter.
|
||||||
xnoremap <silent> <cr> "*y:silent! let searchTerm = '\V'.substitute(escape(@*, '\/'), "\n", '\\n', "g") <bar> let @/ = searchTerm <bar> echo '/'.@/ <bar> call histadd("search", searchTerm) <bar> set hls<cr>
|
xnoremap <silent> <cr> "*y:silent! let searchTerm = '\V'.substitute(escape(@*, '\/'), "\n", '\\n', "g") <bar> let @/ = searchTerm <bar> echo '/'.@/ <bar> call histadd("search", searchTerm) <bar> set hls<cr>
|
||||||
|
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
[global]
|
|
||||||
break-system-packages = true
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
ext jpg = open -a Preview "$@"
|
ext jpg = feh --scale-down "$@"
|
||||||
#ext doc = openoffice4 "$@"
|
#ext doc = openoffice4 "$@"
|
||||||
#ext odt = openoffice4 "$@"
|
#ext odt = openoffice4 "$@"
|
||||||
|
|
||||||
|
|||||||
@@ -279,4 +279,3 @@ Cisco Packet Tracer 8.0.0
|
|||||||
.local/bin/kubectl
|
.local/bin/kubectl
|
||||||
.rustup
|
.rustup
|
||||||
.local/tss-sdk
|
.local/tss-sdk
|
||||||
.local/bin/tss
|
|
||||||
|
|||||||
+45
-43
@@ -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
|
||||||
@@ -31,7 +31,7 @@ else
|
|||||||
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
|
||||||
@@ -62,7 +62,7 @@ function err() {
|
|||||||
|
|
||||||
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 "---------"
|
||||||
@@ -85,7 +85,7 @@ function command_exists() {
|
|||||||
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
|
||||||
@@ -94,13 +94,6 @@ function update_pip() {
|
|||||||
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
|
||||||
|
|
||||||
# Ruby module for neovim
|
|
||||||
gem install solargraph
|
|
||||||
|
|
||||||
# Node module for neovim
|
|
||||||
npm install @github/copilot-language-server -g --force
|
|
||||||
npm install tree-sitter-cli -g --force
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function install_node() {
|
function install_node() {
|
||||||
@@ -206,7 +199,6 @@ function install_terragrunt() {
|
|||||||
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
|
||||||
@@ -259,6 +251,12 @@ function install_ansible-language-server() {
|
|||||||
sudo npm -s -g i yaml-language-server --force
|
sudo npm -s -g i yaml-language-server --force
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function install_meraki_ansible() {
|
||||||
|
# Install python, ansible module for meraki
|
||||||
|
ansible-galaxy collection install cisco.meraki --force
|
||||||
|
$pip install meraki $PIPEXT
|
||||||
|
}
|
||||||
|
|
||||||
function install_azure_cli() {
|
function install_azure_cli() {
|
||||||
# Install azure_cli
|
# Install azure_cli
|
||||||
$install azure-cli
|
$install azure-cli
|
||||||
@@ -269,6 +267,11 @@ function install_awscli() {
|
|||||||
$install awscli
|
$install awscli
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function install_aws_adfs() {
|
||||||
|
# Install aws-adfs
|
||||||
|
$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
|
||||||
@@ -296,8 +299,6 @@ function install_fzf() {
|
|||||||
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 \
|
curl -s https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/plugins/aws/aws.plugin.zsh \
|
||||||
-o "$ZSHFOLDER"/aws/aws.plugin.zsh &&
|
-o "$ZSHFOLDER"/aws/aws.plugin.zsh &&
|
||||||
timestamp "Downloaded the newest version of aws plugin for zsh"
|
timestamp "Downloaded the newest version of aws plugin for zsh"
|
||||||
@@ -306,6 +307,7 @@ function install_zsh_addons() {
|
|||||||
-o "$ZSHFOLDER"/azure-cli/az.completion &&
|
-o "$ZSHFOLDER"/azure-cli/az.completion &&
|
||||||
timestamp "Downloaded the newest version of az plugin for zsh"
|
timestamp "Downloaded the newest version of az plugin for zsh"
|
||||||
|
|
||||||
|
mkdir -p "$ZSHFOLDER/azure-cli" "$ZSHFOLDER/aws"
|
||||||
cd $ZSHFOLDER || err "Folder $ZSHFOLDER has been NOT found"
|
cd $ZSHFOLDER || err "Folder $ZSHFOLDER has been NOT found"
|
||||||
git clone https://github.com/popstas/zsh-command-time.git &&
|
git clone https://github.com/popstas/zsh-command-time.git &&
|
||||||
timestamp "Cloning the zsh-command-time"
|
timestamp "Cloning the zsh-command-time"
|
||||||
@@ -383,27 +385,16 @@ function install_rust() {
|
|||||||
|
|
||||||
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
|
|
||||||
TSS_VERSION_STABLE=""
|
|
||||||
timestamp "TSS_VERSION_STABLE variable is empty, the latest version will be installed"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Example link: https://downloads.ss.thycotic.com/secretserversdk/1.5.7/secretserver-sdk-1.5.7-linux-x64.zip
|
# Example link: https://downloads.ss.thycotic.com/secretserversdk/1.5.7/secretserver-sdk-1.5.7-linux-x64.zip
|
||||||
TSSDOCS="https://docs.delinea.com/online-help/secret-server/api-scripting/sdk-devops/sdk-downloads/index.htm"
|
TSSDOCS="https://docs.delinea.com/online-help/secret-server/api-scripting/sdk-devops/sdk-downloads/index.htm"
|
||||||
LINK=""
|
LINK=""
|
||||||
REMOTE_VERSION=""
|
REMOTE_VERSION=""
|
||||||
|
|
||||||
if [ "$(uname)" == "Darwin" ]; then
|
if [ "$(uname)" == "Darwin" ]; then
|
||||||
if [ -n "$TSS_VERSION_STABLE" ]; then
|
LINK=$(curl -s -L $TSSDOCS | grep -iEo 'href=".*-osx-x64.zip"' | sed 's/href\=//g;s/"//g' | sort -r | head -n1)
|
||||||
LINK="https://downloads.ss.thycotic.com/secretserversdk/$TSS_VERSION_STABLE/secretserver-sdk-$TSS_VERSION_STABLE-osx-x64.zip"
|
REMOTE_VERSION=$(echo $LINK | grep -iEo '[0-9.]+-osx' | sed 's/-osx//g')
|
||||||
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
|
else
|
||||||
LINK=$(curl -s -L $TSSDOCS | grep -iEo 'href=".*-linux-x64.zip"' | sed 's/href\=//g;s/"//g' | sort -r | head -n1)
|
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')
|
REMOTE_VERSION=$(echo $LINK | grep -iEo '[0-9.]+-linux' | sed 's/-linux//g')
|
||||||
@@ -433,6 +424,11 @@ function install_tss_client() {
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function 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
|
||||||
@@ -448,44 +444,46 @@ function 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)
|
|
||||||
|
|
||||||
timestamp "Installing brew programs"
|
|
||||||
|
|
||||||
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
|
|
||||||
timestamp "Installing the $i brew program"
|
|
||||||
brew install $i --force
|
brew install $i --force
|
||||||
if $? -ne 0; then
|
|
||||||
err "Failed to install the $i brew program"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
timestamp "Installing brew cask programs"
|
|
||||||
|
|
||||||
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
|
|
||||||
timestamp "Installing the $i brew cask program"
|
|
||||||
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 /opt/homebrew/bin/mpv /Applications/mpv.app
|
xattr -r -d com.apple.quarantine /Applications/Stats.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
|
||||||
|
duti -s com.interversehq.qView public.jpeg all
|
||||||
|
duti -s com.interversehq.qView public.png all
|
||||||
|
duti -s com.interversehq.qView com.compuserve.gif 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() {
|
||||||
|
curl -o /tmp/winbox64.exe \
|
||||||
|
"$(curl --silent https://mikrotik.com/download | grep -o 'https:\/\/download.*winbox64.exe')"
|
||||||
|
mv -v /tmp/winbox64.exe ~/Applications/winbox.exe
|
||||||
|
xattr -cr ~/Applications/winbox.exe
|
||||||
|
}
|
||||||
|
|
||||||
function install_prettier() {
|
function install_prettier() {
|
||||||
$install prettier
|
$install prettier
|
||||||
$install prettierd
|
$install prettierd
|
||||||
@@ -594,18 +592,22 @@ function main() {
|
|||||||
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_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_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_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_prettier
|
command_start install_prettier
|
||||||
command_start install_google_cloud_sdk
|
command_start install_google_cloud_sdk
|
||||||
command_start install_bgpreader
|
command_start install_bgpreader
|
||||||
|
|||||||
@@ -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"
|
|
||||||
@@ -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
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
################################################################################
|
|
||||||
#
|
|
||||||
# Marcin Wozniak
|
|
||||||
#
|
|
||||||
# shellcheck disable=1091
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
# Colours
|
|
||||||
RED='\033[0;31m'
|
|
||||||
GREEN='\033[0;0;32m'
|
|
||||||
NC='\033[0m'
|
|
||||||
|
|
||||||
function timestamp() {
|
|
||||||
echo -e "${GREEN}[+]${NC} $(date +'%F %T') [INFO] $*"
|
|
||||||
}
|
|
||||||
|
|
||||||
function err() {
|
|
||||||
echo -e "${RED}[-] $(date +'%F %T') [ERROR] $*${NC}" >&2
|
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
|
|
||||||
function removelogs() {
|
|
||||||
find "$DIR/logs" -mindepth 1 -mtime +365 -delete
|
|
||||||
}
|
|
||||||
|
|
||||||
function command_start() {
|
|
||||||
timestamp "Command $* has been started."
|
|
||||||
if ! "$@"; then
|
|
||||||
err "Command $* went wrong."
|
|
||||||
# sendmailerr
|
|
||||||
fi
|
|
||||||
timestamp "Command $* has been ended."
|
|
||||||
}
|
|
||||||
|
|
||||||
function command_exists() {
|
|
||||||
if command -v "$1" > /dev/null 2>&1; then
|
|
||||||
timestamp "Command $1 has been found"
|
|
||||||
else
|
|
||||||
err "Command $1 has been NOT found"
|
|
||||||
# sendmailerr
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
@@ -1,24 +1,18 @@
|
|||||||
#!/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_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_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_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,9 +35,6 @@ 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
|
||||||
|
|
||||||
@@ -53,19 +44,12 @@ rsync -h --progress --recursive --ignore-existing \
|
|||||||
rsync -h --progress --recursive --ignore-existing \
|
rsync -h --progress --recursive --ignore-existing \
|
||||||
$FOLDER_PIANO/* docker-de:/mnt/HC_Volume_34966154/jellifin/media/music/Piano
|
$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/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'
|
||||||
|
|||||||
@@ -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
|
|
||||||
|
|||||||
@@ -1,62 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
source "$HOME"/.local/bin/functions
|
|
||||||
|
|
||||||
# Base function for creating a python venv
|
|
||||||
python_env_base() {
|
|
||||||
|
|
||||||
[ -z "$PYTHONVERSION" ] && err "Python version is not set"
|
|
||||||
|
|
||||||
command_exists virtualenv
|
|
||||||
|
|
||||||
timestamp "Creating Python environment with version $PYTHONVERSION"
|
|
||||||
rm -rf .venv .env && timestamp "Old Python environment has been removed"
|
|
||||||
virtualenv -p "$PYTHONVERSION" .venv
|
|
||||||
|
|
||||||
.venv/bin/python -m pip install --upgrade pip
|
|
||||||
.venv/bin/pip install pre-commit --break --force
|
|
||||||
}
|
|
||||||
|
|
||||||
# Default python env with requirements.txt
|
|
||||||
python_env() {
|
|
||||||
python_env_base
|
|
||||||
if [ -f requirements.txt ]; then
|
|
||||||
.venv/bin/pip install -r requirements.txt --break --force
|
|
||||||
timestamp "Installing Python packages from requirements.txt"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# Ansible python env
|
|
||||||
python_env_ansible() {
|
|
||||||
python_env_base
|
|
||||||
timestamp "Installing Ansible packages"
|
|
||||||
.venv/bin/pip install \
|
|
||||||
ansible \
|
|
||||||
ansible-core \
|
|
||||||
ansible-lint \
|
|
||||||
ansible-parallel \
|
|
||||||
passlib \
|
|
||||||
python-tss-sdk \
|
|
||||||
--break --force
|
|
||||||
|
|
||||||
export ANSIBLE_COLLECTIONS_PATH=".venv/collections"
|
|
||||||
export ANSIBLE_ROLES_PATH=".venv/roles"
|
|
||||||
|
|
||||||
timestamp "Installing Ansible Galaxy collections to .venv/collections"
|
|
||||||
.venv/bin/ansible-galaxy collection install community.general -p .venv/collections --upgrade
|
|
||||||
|
|
||||||
timestamp "Installing Ansible Galaxy roles from requirements.yml files to .venv/roles"
|
|
||||||
find . -maxdepth 3 -name "requirements.yml" -path "*/roles/*" -not -path "./.venv/*" -print0 | while IFS= read -r -d '' req; do
|
|
||||||
timestamp "Found requirements: $req"
|
|
||||||
.venv/bin/ansible-galaxy install --force -r "$req" -p .venv/roles
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
ansible)
|
|
||||||
python_env_ansible
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
python_env
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
@@ -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/
|
||||||
|
|||||||
Symlink
+1
@@ -0,0 +1 @@
|
|||||||
|
/usr/local/bin/yt-dlp
|
||||||
+1
-1
@@ -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
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
hidutil property --set '{"UserKeyMapping":[{"HIDKeyboardModifierMappingSrc":0x700000035,"HIDKeyboardModifierMappingDst":0x700000064},{"HIDKeyboardModifierMappingSrc":0x700000064,"HIDKeyboardModifierMappingDst":0x700000035}]}'
|
|
||||||
@@ -86,11 +86,22 @@ export PATH=$PATH:$HOME/.cargo/bin
|
|||||||
# History
|
# History
|
||||||
export HISTTIMEFORMAT="%F %T "
|
export HISTTIMEFORMAT="%F %T "
|
||||||
|
|
||||||
|
# Export for WSL
|
||||||
|
if [[ "$(uname -sr)" =~ "Microsoft" ]]; then
|
||||||
|
export GOROOT=/usr/lib/go
|
||||||
|
fi
|
||||||
|
|
||||||
# Work
|
# Work
|
||||||
|
alias ansible-lint-work='GIT_SSH_COMMAND="ssh -i ~/.ssh/work/id_rsa" ansible-lint'
|
||||||
|
alias ansible-galaxy-work='GIT_SSH_COMMAND="ssh -i ~/.ssh/work/id_rsa" ansible-galaxy'
|
||||||
alias ssh-work="ssh -i ~/.ssh/work/id_rsa"
|
alias ssh-work="ssh -i ~/.ssh/work/id_rsa"
|
||||||
alias rsyncwork="rsync -h --progress -e 'ssh -i ~/.ssh/work/id_rsa'"
|
alias rsyncwork="rsync -h --progress -e 'ssh -i ~/.ssh/work/id_rsa'"
|
||||||
alias git-work='GIT_SSH_COMMAND="ssh -i ~/.ssh/work/id_rsa" git'
|
alias git-work='GIT_SSH_COMMAND="ssh -i ~/.ssh/work/id_rsa" git'
|
||||||
alias git-commit-work="git commit --author='Marcin Woźniak <marcin.wozniak@vml.com>'"
|
alias git-commit-work="git commit --author='Marcin Woźniak <marcin.wozniak@wundermanthompson.com>'"
|
||||||
|
|
||||||
|
# Alias ssh
|
||||||
|
alias ssh-restore="cp -rv ~/ssh-mega/config ~/.ssh/ ; ssh-permissions"
|
||||||
|
alias ssh-backup="cp -rv ~/.ssh/config ~/ssh-mega/"
|
||||||
|
|
||||||
# Alias and Export Gentoo
|
# Alias and Export Gentoo
|
||||||
alias svm="sudo $EDITOR /etc/portage/make.conf"
|
alias svm="sudo $EDITOR /etc/portage/make.conf"
|
||||||
@@ -105,7 +116,7 @@ alias feh="feh --edit --scale-down"
|
|||||||
alias graphic-card="glxinfo|egrep 'OpenGL vendor|OpenGL renderer'"
|
alias graphic-card="glxinfo|egrep 'OpenGL vendor|OpenGL renderer'"
|
||||||
alias mylaptop-components="inxi -Fxz"
|
alias mylaptop-components="inxi -Fxz"
|
||||||
alias update_time="sudo ntpdate -b -u vega.cbk.poznan.pl"
|
alias update_time="sudo ntpdate -b -u vega.cbk.poznan.pl"
|
||||||
alias dt='LC_TIME=C /bin/date "+%Y%m%d%H%M%S"'
|
alias dn='LC_TIME=C /bin/date "+%Y%m%d%H%M%S"'
|
||||||
|
|
||||||
# Alias and Export for Mac
|
# Alias and Export for Mac
|
||||||
if [[ "$(uname)" == "Darwin" ]]; then
|
if [[ "$(uname)" == "Darwin" ]]; then
|
||||||
@@ -149,26 +160,25 @@ 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"
|
alias streamlink="streamlink --config $HOME/.config/streamlink/config"
|
||||||
alias powershell="pwsh"
|
|
||||||
|
|
||||||
# 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
|
||||||
@@ -219,7 +229,7 @@ alias neofetch=fastfetch
|
|||||||
[ -f $(which zoxide) ] && {eval "$(zoxide init zsh)"; alias cd='z'}
|
[ -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
|
||||||
|
|||||||
@@ -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"
|
|
||||||
Reference in New Issue
Block a user