Compare commits
51 commits
Author | SHA1 | Date | |
---|---|---|---|
755b3c6c4c | |||
4e44003d3c | |||
532bc838e5 | |||
63bd2e4bcd | |||
34b792678e | |||
5b549136f0 | |||
5e7a5c2b44 | |||
ac49af370b | |||
092e4d7c95 | |||
81e536bfca | |||
a7a9440e04 | |||
15791ecd96 | |||
38c1b3fcc5 | |||
bc516ac136 | |||
7ad79cef57 | |||
fcd7cc3603 | |||
42986bba16 | |||
b03c452c9b | |||
72693e646d | |||
2cf7e234e9 | |||
c241963f56 | |||
d644581eb2 | |||
0d9a365ddc | |||
a8209d299c | |||
5282ae9679 | |||
806d7242b9 | |||
1cf4f79ab1 | |||
39722ea19f | |||
1efed5c274 | |||
698621d984 | |||
4fe2ba1fa8 | |||
a477e89b80 | |||
02dd9c13be | |||
1ed1614b70 | |||
1c6d2f5848 | |||
581995fd68 | |||
f7d89ec656 | |||
0c51473d17 | |||
23d964d42f | |||
9933fdd1ff | |||
a4feb6d5c0 | |||
0131eb3f8c | |||
b731c6e237 | |||
f461e4ac4d | |||
d5236bca30 | |||
1342bbd614 | |||
e0575fce85 | |||
acd2a741b1 | |||
ab2faa658b | |||
b6a8077bc5 | |||
de57597120 |
14 changed files with 775 additions and 45 deletions
|
@ -1,4 +1,4 @@
|
||||||
#? Config file for btop v. 1.2.3
|
#? Config file for btop v. 1.2.13
|
||||||
|
|
||||||
#* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
|
#* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
|
||||||
#* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
|
#* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
|
||||||
|
@ -16,11 +16,11 @@ force_tty = False
|
||||||
|
|
||||||
#* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets.
|
#* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets.
|
||||||
#* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box.
|
#* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box.
|
||||||
#* Use withespace " " as separator between different presets.
|
#* Use whitespace " " as separator between different presets.
|
||||||
#* Example: "cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty"
|
#* Example: "cpu:0:default,mem:0:tty,proc:1:default cpu:0:braille,proc:0:tty"
|
||||||
presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty"
|
presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:default cpu:0:block,net:0:tty"
|
||||||
|
|
||||||
#* Set to True to enable "h,j,k,l" keys for directional control in lists.
|
#* Set to True to enable "h,j,k,l,g,G" keys for directional control in lists.
|
||||||
#* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift.
|
#* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift.
|
||||||
vim_keys = True
|
vim_keys = True
|
||||||
|
|
||||||
|
@ -52,8 +52,8 @@ shown_boxes = "cpu mem net proc"
|
||||||
#* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
|
#* Update time in milliseconds, recommended 2000 ms or above for better sample times for graphs.
|
||||||
update_ms = 1000
|
update_ms = 1000
|
||||||
|
|
||||||
#* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu responsive",
|
#* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct",
|
||||||
#* "cpu lazy" sorts top process over time (easier to follow), "cpu responsive" updates top process directly.
|
#* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly.
|
||||||
proc_sorting = "cpu direct"
|
proc_sorting = "cpu direct"
|
||||||
|
|
||||||
#* Reverse sorting order, True or False.
|
#* Reverse sorting order, True or False.
|
||||||
|
@ -74,12 +74,18 @@ proc_per_core = False
|
||||||
#* Show process memory as bytes instead of percent.
|
#* Show process memory as bytes instead of percent.
|
||||||
proc_mem_bytes = True
|
proc_mem_bytes = True
|
||||||
|
|
||||||
|
#* Show cpu graph for each process.
|
||||||
|
proc_cpu_graphs = True
|
||||||
|
|
||||||
#* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate)
|
#* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate)
|
||||||
proc_info_smaps = False
|
proc_info_smaps = False
|
||||||
|
|
||||||
#* Show proc box on left side of screen instead of right.
|
#* Show proc box on left side of screen instead of right.
|
||||||
proc_left = False
|
proc_left = False
|
||||||
|
|
||||||
|
#* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop).
|
||||||
|
proc_filter_kernel = False
|
||||||
|
|
||||||
#* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available.
|
#* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available.
|
||||||
#* Select from a list of detected attributes from the options menu.
|
#* Select from a list of detected attributes from the options menu.
|
||||||
cpu_graph_upper = "total"
|
cpu_graph_upper = "total"
|
||||||
|
@ -144,6 +150,9 @@ mem_graphs = True
|
||||||
#* Show mem box below net box instead of above.
|
#* Show mem box below net box instead of above.
|
||||||
mem_below_net = False
|
mem_below_net = False
|
||||||
|
|
||||||
|
#* Count ZFS ARC in cached and available memory.
|
||||||
|
zfs_arc_cached = True
|
||||||
|
|
||||||
#* If swap memory should be shown in memory box.
|
#* If swap memory should be shown in memory box.
|
||||||
show_swap = True
|
show_swap = True
|
||||||
|
|
||||||
|
@ -159,6 +168,9 @@ only_physical = True
|
||||||
#* Read disks list from /etc/fstab. This also disables only_physical.
|
#* Read disks list from /etc/fstab. This also disables only_physical.
|
||||||
use_fstab = True
|
use_fstab = True
|
||||||
|
|
||||||
|
#* Setting this to True will hide all datasets, and only show ZFS pools. (IO stats will be calculated per-pool)
|
||||||
|
zfs_hide_datasets = False
|
||||||
|
|
||||||
#* Set to true to show available disk space for privileged users.
|
#* Set to true to show available disk space for privileged users.
|
||||||
disk_free_priv = False
|
disk_free_priv = False
|
||||||
|
|
||||||
|
@ -181,7 +193,7 @@ net_download = 1000
|
||||||
net_upload = 100
|
net_upload = 100
|
||||||
|
|
||||||
#* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest.
|
#* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest.
|
||||||
net_auto = True
|
net_auto = False
|
||||||
|
|
||||||
#* Sync the auto scaling for download and upload to whichever currently has the highest scale.
|
#* Sync the auto scaling for download and upload to whichever currently has the highest scale.
|
||||||
net_sync = True
|
net_sync = True
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
font_family FiraCode Nerd Font
|
font_family FiraCode Nerd Font
|
||||||
font_size 15.0
|
font_size 15.0
|
||||||
disable_ligatures never
|
disable_ligatures never
|
||||||
scrollback_pager nvim -c 'setlocal number|Man!' -c "autocmd VimEnter * normal G" -
|
|
||||||
enable_audio_bell no
|
enable_audio_bell no
|
||||||
visual_bell_duration 0.01
|
visual_bell_duration 0.01
|
||||||
visual_bell_color yellow
|
visual_bell_color yellow
|
||||||
|
@ -15,26 +14,38 @@ foreground #dddddd
|
||||||
background #111111
|
background #111111
|
||||||
shell zsh
|
shell zsh
|
||||||
editor nvim
|
editor nvim
|
||||||
allow_remote_control socket-only
|
|
||||||
listen_on unix:///tmp/kitty.sock
|
|
||||||
env KITTY_TERM=TRUE
|
env KITTY_TERM=TRUE
|
||||||
shell_integration enabled
|
shell_integration enabled
|
||||||
|
background_opacity 1.0
|
||||||
|
|
||||||
# kitty-scrollback.nvim Kitten alias
|
# urls
|
||||||
action_alias kitty_scrollback_nvim kitten /home/plex/.local/share/nvim/lazy/kitty-scrollback.nvim/python/kitty_scrollback_nvim.py --nvim-args /tmp/kitty_scrollback.sh
|
url_color #4d87bd
|
||||||
|
url_style curly
|
||||||
# Browse scrollback buffer in nvim
|
url_prefixes file ftp ftps gemini git gopher http https irc ircs kitty mailto news sftp ssh
|
||||||
map kitty_mod+h kitty_scrollback_nvim
|
detect_urls yes
|
||||||
# Browse output of the last shell command in nvim
|
show_hyperlink_targets yes
|
||||||
map kitty_mod+g kitty_scrollback_nvim --config ksb_builtin_last_cmd_output
|
underline_hyperlinks always
|
||||||
# Show clicked command output in nvim
|
map ctrl+shift+e open_url_with_hints
|
||||||
mouse_map ctrl+shift+right press ungrabbed combine : mouse_select_command_output : kitty_scrollback_nvim --config ksb_builtin_last_visited_cmd_output
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
map alt+e next_tab
|
map alt+e next_tab
|
||||||
map alt+q previous_tab
|
map alt+q previous_tab
|
||||||
|
|
||||||
# i want that for neovim
|
# i want that for neovim
|
||||||
map ctrl+shift+s no_op
|
map ctrl+shift+s no_op
|
||||||
|
|
||||||
map shift+alt+f11 toggle_fullscreen
|
# manual fullscreen
|
||||||
|
map ctrl+enter toggle_fullscreen
|
||||||
|
|
||||||
|
# scrolling
|
||||||
|
map ctrl+shift+k scroll_page_up
|
||||||
|
map ctrl+shift+j scroll_page_down
|
||||||
|
touch_scroll_multiplier 2.5
|
||||||
|
wheel_scroll_multiplier 5.0
|
||||||
|
|
||||||
|
# more terminals in my terminal
|
||||||
|
enabled_layouts tall:bias=50;full_size=1;mirrored=false
|
||||||
|
#map ctrl+shift+enter make me a new fucking window
|
||||||
|
|
||||||
|
# set opacity with keybind
|
||||||
|
#map alt+t set_background_opacity +0.1
|
||||||
|
#map alt+shift+t set_background_opacity -0.1
|
||||||
|
|
3
.config/lazygit/config.yml
Normal file
3
.config/lazygit/config.yml
Normal file
|
@ -0,0 +1,3 @@
|
||||||
|
git:
|
||||||
|
overrideGpg: true
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit 9fed026ab76016f71df5dac7db9686c364b07c21
|
Subproject commit 478a16e9f160776f9693824769e5c3dc3cf51089
|
135
.config/zed/keymap.json
Normal file
135
.config/zed/keymap.json
Normal file
|
@ -0,0 +1,135 @@
|
||||||
|
// Zed keymap
|
||||||
|
//
|
||||||
|
// For information on binding keys, see the Zed
|
||||||
|
// documentation: https://zed.dev/docs/key-bindings
|
||||||
|
//
|
||||||
|
// To see the default key bindings run `zed: open default keymap`
|
||||||
|
// from the command palette.
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"bindings": {
|
||||||
|
"shift-tab": "menu::SelectPrev",
|
||||||
|
"tab": "menu::SelectNext",
|
||||||
|
"alt-c": "pane::CloseActiveItem",
|
||||||
|
"ctrl-shift-w": null,
|
||||||
|
"ctrl-q": null,
|
||||||
|
"ctrl-h": ["workspace::ActivatePaneInDirection", "Left"],
|
||||||
|
"ctrl-l": ["workspace::ActivatePaneInDirection", "Right"],
|
||||||
|
"ctrl-k": ["workspace::ActivatePaneInDirection", "Up"],
|
||||||
|
"ctrl-j": ["workspace::ActivatePaneInDirection", "Down"]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"context": "Workspace",
|
||||||
|
"bindings": {
|
||||||
|
"f5": "workspace::ToggleLeftDock",
|
||||||
|
"alt-v": "terminal_panel::ToggleFocus"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"context": "menu",
|
||||||
|
"bindings": {
|
||||||
|
"shift-tab": "menu::SelectPrev",
|
||||||
|
"tab": "menu::SelectNext",
|
||||||
|
"f4": "menu::SelectPrev",
|
||||||
|
"f6": "menu::SelectNext"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"context": "Terminal",
|
||||||
|
"bindings": {
|
||||||
|
"alt-v": "workspace::ToggleBottomDock",
|
||||||
|
"ctrl-w": "terminal::ToggleViMode"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"context": "Editor",
|
||||||
|
"bindings": {
|
||||||
|
"alt-enter": "repl::Run"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"context": "VimControl && !menu",
|
||||||
|
"bindings": {
|
||||||
|
"; f s": "outline::Toggle",
|
||||||
|
"; f w": "workspace::NewSearch",
|
||||||
|
"; f t": "theme_selector::Toggle",
|
||||||
|
"; f f": "file_finder::Toggle",
|
||||||
|
"L": "vim::EndOfLine",
|
||||||
|
"H": "vim::StartOfLine",
|
||||||
|
"left": "editor::TabPrev",
|
||||||
|
"right": "editor::Indent",
|
||||||
|
"space v": "editor::ToggleComments",
|
||||||
|
"alt-j": "vim::ScrollDown",
|
||||||
|
"alt-k": "vim::ScrollUp",
|
||||||
|
"up": "editor::MoveLineUp",
|
||||||
|
"down": "editor::MoveLineDown",
|
||||||
|
"space c a": "editor::ToggleCodeActions",
|
||||||
|
"space y": "editor::Copy",
|
||||||
|
"space p": "editor::Paste",
|
||||||
|
"tab": "pane::ActivateNextItem",
|
||||||
|
"shift-tab": "pane::ActivatePrevItem",
|
||||||
|
"space \"": "pane::SplitRight",
|
||||||
|
"space %": "pane::SplitHorizontal",
|
||||||
|
"space c r": "editor::Rename",
|
||||||
|
"space c t r": "diagnostics::Deploy",
|
||||||
|
"#": [
|
||||||
|
"vim::PushOperator",
|
||||||
|
{
|
||||||
|
"Jump": {
|
||||||
|
"line": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"context": "vim_mode == normal",
|
||||||
|
"bindings": {
|
||||||
|
"space g g": [
|
||||||
|
"task::Spawn",
|
||||||
|
{
|
||||||
|
"task_name": "lazygit",
|
||||||
|
"reveal_target": "center"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"space f f": "editor::Format"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"context": "vim_mode == insert",
|
||||||
|
"bindings": {
|
||||||
|
"ctrl-l": "vim::Right",
|
||||||
|
"ctrl-h": "vim::Left",
|
||||||
|
"ctrl-j": "vim::Down",
|
||||||
|
"ctrl-k": "vim::Up"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"context": "Editor && (showing_code_actions || showing_completions)",
|
||||||
|
"bindings": {
|
||||||
|
"shift-tab": "editor::ContextMenuPrev",
|
||||||
|
"tab": "editor::ContextMenuNext"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"context": "ProjectPanel && not_editing",
|
||||||
|
"bindings": {
|
||||||
|
"n": "project_panel::NewFile",
|
||||||
|
"N": "project_panel::NewDirectory",
|
||||||
|
"r": "project_panel::Rename",
|
||||||
|
"d": [
|
||||||
|
"project_panel::Trash",
|
||||||
|
{
|
||||||
|
"skip_prompt": false
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"D": [
|
||||||
|
"project_panel::Delete",
|
||||||
|
{
|
||||||
|
"skip_prompt": false
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
]
|
128
.config/zed/settings.json
Normal file
128
.config/zed/settings.json
Normal file
|
@ -0,0 +1,128 @@
|
||||||
|
// Zed settings
|
||||||
|
//
|
||||||
|
// For information on how to configure Zed, see the Zed
|
||||||
|
// documentation: https://zed.dev/docs/configuring-zed
|
||||||
|
//
|
||||||
|
// To see all of Zed's default settings without changing your
|
||||||
|
// custom settings, run `zed: open default settings` from the
|
||||||
|
// command palette (cmd-shift-p / ctrl-shift-p)
|
||||||
|
{
|
||||||
|
"ssh_connections": [
|
||||||
|
{
|
||||||
|
"host": "naydra",
|
||||||
|
"projects": [
|
||||||
|
{
|
||||||
|
"paths": [
|
||||||
|
"~/Documents/code/c/totalschaden"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"vim": {
|
||||||
|
"use_system_clipboard": "on_yank"
|
||||||
|
},
|
||||||
|
"relative_line_numbers": true,
|
||||||
|
"features": {
|
||||||
|
"inline_completion_provider": "none"
|
||||||
|
},
|
||||||
|
"assistant": {
|
||||||
|
"default_model": {
|
||||||
|
"provider": "zed.dev",
|
||||||
|
"model": "claude-3-5-sonnet-latest"
|
||||||
|
},
|
||||||
|
"dock": "right",
|
||||||
|
"version": "2"
|
||||||
|
},
|
||||||
|
"buffer_font_size": 18,
|
||||||
|
"format_on_save": "prettier",
|
||||||
|
"formatter": "prettier",
|
||||||
|
"buffer_font_family": "FiraCode Nerd Font",
|
||||||
|
"tab_size": 4,
|
||||||
|
"vim_mode": true,
|
||||||
|
"ui_font_size": 15,
|
||||||
|
"theme": {
|
||||||
|
"mode": "system",
|
||||||
|
"light": "One Light",
|
||||||
|
"dark": "Tokyo Night"
|
||||||
|
},
|
||||||
|
"lsp": {
|
||||||
|
"rust-analyzer": {
|
||||||
|
"initialization_options": {
|
||||||
|
"check": {
|
||||||
|
"command": "clippy" // rust-analyzer.checkOnSave.command
|
||||||
|
},
|
||||||
|
"checkOnSave": {
|
||||||
|
"command": "clippy" // rust-analyzer.checkOnSave.command
|
||||||
|
},
|
||||||
|
"inlayHints": {
|
||||||
|
"maxLength": null,
|
||||||
|
"lifetimeElisionHints": {
|
||||||
|
"enable": "skip_trivial",
|
||||||
|
"useParameterNames": true
|
||||||
|
},
|
||||||
|
"closureReturnTypeHints": {
|
||||||
|
"enable": "always"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"diagnostics": {
|
||||||
|
"experimental": {
|
||||||
|
"enable": true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"cargo": {
|
||||||
|
"features": "all",
|
||||||
|
"allTargets": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"ruff": {
|
||||||
|
"initialization_options": {
|
||||||
|
"settings": {
|
||||||
|
// Ruff server settings goes here
|
||||||
|
"lineLength": 80,
|
||||||
|
"lint": {
|
||||||
|
"extendSelect": ["I"]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"soft_wrap": "editor_width",
|
||||||
|
"show_wrap_guides": true,
|
||||||
|
"wrap_guides": [80],
|
||||||
|
"languages": {
|
||||||
|
"Jinja2": {
|
||||||
|
"formatter": [
|
||||||
|
{
|
||||||
|
"external": {
|
||||||
|
"command": "djlint",
|
||||||
|
"arguments": [
|
||||||
|
"--reformat",
|
||||||
|
"--format-css",
|
||||||
|
"--format-js",
|
||||||
|
"-"
|
||||||
|
// "{buffer_path}"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"format_on_save": "on"
|
||||||
|
},
|
||||||
|
"Python": {
|
||||||
|
"format_on_save": "language_server",
|
||||||
|
"formatter": [
|
||||||
|
{
|
||||||
|
"language_server": {
|
||||||
|
"name": "ruff"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"language_servers": ["pyright", "ruff"]
|
||||||
|
},
|
||||||
|
"Rust": {
|
||||||
|
"format_on_save": "language_server",
|
||||||
|
"formatter": "language_server"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
66
.config/zed/tasks.json
Normal file
66
.config/zed/tasks.json
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
// Static tasks configuration.
|
||||||
|
//
|
||||||
|
// Example:
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"label": "lazygit",
|
||||||
|
"command": "lazygit -p $ZED_WORKTREE_ROOT",
|
||||||
|
"use_new_terminal": true,
|
||||||
|
"reveal": "always",
|
||||||
|
"reveal_target": "center",
|
||||||
|
"hide": "always",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "btop",
|
||||||
|
"command": "btop",
|
||||||
|
"use_new_terminal": true,
|
||||||
|
"reveal": "always",
|
||||||
|
"reveal_target": "center",
|
||||||
|
"hide": "always",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"label": "Example task",
|
||||||
|
"command": "for i in {1..5}; do echo \"Hello $i/5\"; sleep 1; done",
|
||||||
|
//"args": [],
|
||||||
|
// Env overrides for the command, will be appended to the terminal's environment from the settings.
|
||||||
|
"env": {
|
||||||
|
"foo": "bar"
|
||||||
|
},
|
||||||
|
// Current working directory to spawn the command into, defaults to current project root.
|
||||||
|
//"cwd": "/path/to/working/directory",
|
||||||
|
// Whether to use a new terminal tab or reuse the existing one to spawn the process, defaults to `false`.
|
||||||
|
"use_new_terminal": false,
|
||||||
|
// Whether to allow multiple instances of the same task to be run, or rather wait for the existing ones to finish, defaults to `false`.
|
||||||
|
"allow_concurrent_runs": false,
|
||||||
|
// What to do with the terminal pane and tab, after the command was started:
|
||||||
|
// * `always` — always show the task's pane, and focus the corresponding tab in it (default)
|
||||||
|
// * `no_focus` — always show the task's pane, add the task's tab in it, but don't focus it
|
||||||
|
// * `never` — do not alter focus, but still add/reuse the task's tab in its pane
|
||||||
|
"reveal": "always",
|
||||||
|
// Where to place the task's terminal item after starting the task:
|
||||||
|
// * `dock` — in the terminal dock, "regular" terminal items' place (default)
|
||||||
|
// * `center` — in the central pane group, "main" editor area
|
||||||
|
"reveal_target": "dock",
|
||||||
|
// What to do with the terminal pane and tab, after the command had finished:
|
||||||
|
// * `never` — Do nothing when the command finishes (default)
|
||||||
|
// * `always` — always hide the terminal tab, hide the pane also if it was the last tab in it
|
||||||
|
// * `on_success` — hide the terminal tab on task success only, otherwise behaves similar to `always`
|
||||||
|
"hide": "never",
|
||||||
|
// Which shell to use when running a task inside the terminal.
|
||||||
|
// May take 3 values:
|
||||||
|
// 1. (default) Use the system's default terminal configuration in /etc/passwd
|
||||||
|
// "shell": "system"
|
||||||
|
// 2. A program:
|
||||||
|
// "shell": {
|
||||||
|
// "program": "sh"
|
||||||
|
// }
|
||||||
|
// 3. A program with arguments:
|
||||||
|
// "shell": {
|
||||||
|
// "with_arguments": {
|
||||||
|
// "program": "/bin/bash",
|
||||||
|
// "args": ["--login"]
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
"shell": "system"
|
||||||
|
}
|
||||||
|
]
|
17
.githooks/pre-push
Executable file
17
.githooks/pre-push
Executable file
|
@ -0,0 +1,17 @@
|
||||||
|
#!/bin/bash
|
||||||
|
# check for WIP commits
|
||||||
|
wips=$(git log --oneline --no-decorate | grep -i wip )
|
||||||
|
wips_n=$(echo "$wips" | wc -l)
|
||||||
|
LOCKFILE="$PWD/.git/.githook.allow_wip"
|
||||||
|
|
||||||
|
# This checks if neither lockfile exists AND wips is non-empty
|
||||||
|
if [[ ! -f $LOCKFILE && -n "$wips" ]]; then
|
||||||
|
# Allows us to read user input below, assigns stdin to keyboard
|
||||||
|
exec < /dev/tty
|
||||||
|
echo "contains $wips_n WIP commit(s)"
|
||||||
|
read -p "Really push? (Y/N) " -n 1 -r
|
||||||
|
case "$REPLY" in
|
||||||
|
y|Y ) echo -e "\ncontinuing..."; touch $LOCKFILE;;
|
||||||
|
* ) echo -e "\naborting."; exit 1;;
|
||||||
|
esac
|
||||||
|
fi
|
10
.gitignore
vendored
10
.gitignore
vendored
|
@ -2,17 +2,26 @@
|
||||||
*
|
*
|
||||||
|
|
||||||
# except:
|
# except:
|
||||||
|
!.ignore
|
||||||
!.zshrc
|
!.zshrc
|
||||||
!.zprofile
|
!.zprofile
|
||||||
!.vimrc
|
!.vimrc
|
||||||
!.ideavimrc
|
!.ideavimrc
|
||||||
|
!.githooks
|
||||||
|
!.githooks/**
|
||||||
!.config
|
!.config
|
||||||
|
!.config/lazygit
|
||||||
|
!.config/lazygit/config.yml
|
||||||
!.config/nvim
|
!.config/nvim
|
||||||
!.config/nvim/**
|
!.config/nvim/**
|
||||||
!.config/btop
|
!.config/btop
|
||||||
!.config/btop/**
|
!.config/btop/**
|
||||||
!.config/kitty
|
!.config/kitty
|
||||||
!.config/kitty/**
|
!.config/kitty/**
|
||||||
|
!.config/zed
|
||||||
|
!.config/zed/**
|
||||||
|
!.githooks
|
||||||
|
!.githooks/**
|
||||||
!.config/rustfmt/**
|
!.config/rustfmt/**
|
||||||
!.config/rustfmt/
|
!.config/rustfmt/
|
||||||
!.gitignore
|
!.gitignore
|
||||||
|
@ -29,6 +38,7 @@
|
||||||
!.terminfo/**
|
!.terminfo/**
|
||||||
!.config/shortkuts.kksrc
|
!.config/shortkuts.kksrc
|
||||||
!.config/user-dirs.dirs
|
!.config/user-dirs.dirs
|
||||||
|
!Documents/install_it_all.sh
|
||||||
|
|
||||||
# except except
|
# except except
|
||||||
.config/btop/btop.log
|
.config/btop/btop.log
|
||||||
|
|
2
.ignore
Normal file
2
.ignore
Normal file
|
@ -0,0 +1,2 @@
|
||||||
|
# don't ignore my fucking home dir, the .gitignore is just because my home is a git repo
|
||||||
|
!**
|
9
.vimrc
9
.vimrc
|
@ -129,3 +129,12 @@ nnoremap zN [s
|
||||||
" same as above but only with bad words (unrecognized)
|
" same as above but only with bad words (unrecognized)
|
||||||
nnoremap Zn ]S
|
nnoremap Zn ]S
|
||||||
nnoremap ZN [S
|
nnoremap ZN [S
|
||||||
|
|
||||||
|
" how to move in insert
|
||||||
|
vnoremap <leader>y "+y
|
||||||
|
nnoremap <leader>Y "+Y
|
||||||
|
nnoremap <leader>y "+y
|
||||||
|
nnoremap <leader>yy "+yy
|
||||||
|
|
||||||
|
" back to normal mode with jk in insert
|
||||||
|
imap jk <esc>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
export GEM_HOME="$HOME/.local/share/gems"
|
export GEM_HOME="$HOME/.local/share/gems"
|
||||||
export PATH="/usr/bin:/usr/sbin:$HOME/.local/bin:$HOME/.cargo/bin:/usr/local/bin:$HOME/.deno/bin:/usr/games/:$GEM_HOME/bin"
|
export PATH="/usr/bin:/usr/sbin:$HOME/.local/bin:$HOME/.cargo/bin:/usr/local/bin:$HOME/.deno/bin:/usr/games/:$GEM_HOME/bin:$PATH"
|
||||||
export EDITOR=nvim
|
export EDITOR=nvim
|
||||||
export editor=nvim
|
export editor=nvim
|
||||||
export XDG_CONFIG_HOME=~/.config
|
export XDG_CONFIG_HOME=~/.config
|
||||||
|
@ -9,3 +9,4 @@ export QT_IM_MODULE=ibus
|
||||||
export SDL_IM_MODULE=ibus
|
export SDL_IM_MODULE=ibus
|
||||||
export GLFW_IM_MODULE=ibus
|
export GLFW_IM_MODULE=ibus
|
||||||
export XMODIFIERS=@im=ibus
|
export XMODIFIERS=@im=ibus
|
||||||
|
|
||||||
|
|
110
.zsh/zfunc/_flamegraph
Normal file
110
.zsh/zfunc/_flamegraph
Normal file
|
@ -0,0 +1,110 @@
|
||||||
|
_flamegraph() {
|
||||||
|
local i cur prev opts cmd
|
||||||
|
COMPREPLY=()
|
||||||
|
cur="${COMP_WORDS[COMP_CWORD]}"
|
||||||
|
prev="${COMP_WORDS[COMP_CWORD-1]}"
|
||||||
|
cmd=""
|
||||||
|
opts=""
|
||||||
|
|
||||||
|
for i in ${COMP_WORDS[@]}
|
||||||
|
do
|
||||||
|
case "${cmd},${i}" in
|
||||||
|
",$1")
|
||||||
|
cmd="flamegraph"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
case "${cmd}" in
|
||||||
|
flamegraph)
|
||||||
|
opts="-p -v -o -F -c -i -h -V --pid --completions --verbose --output --open --root --freq --cmd --deterministic --inverted --reverse --notes --min-width --image-width --palette --skip-after --flamechart --ignore-status --no-inline --post-process --perfdata --help --version [TRAILING_ARGUMENTS]..."
|
||||||
|
if [[ ${cur} == -* || ${COMP_CWORD} -eq 1 ]] ; then
|
||||||
|
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
case "${prev}" in
|
||||||
|
--pid)
|
||||||
|
COMPREPLY=($(compgen -f "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
-p)
|
||||||
|
COMPREPLY=($(compgen -f "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
--completions)
|
||||||
|
COMPREPLY=($(compgen -W "bash elvish fish powershell zsh" -- "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
--output)
|
||||||
|
COMPREPLY=($(compgen -f "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
-o)
|
||||||
|
COMPREPLY=($(compgen -f "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
--root)
|
||||||
|
COMPREPLY=($(compgen -f "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
--freq)
|
||||||
|
COMPREPLY=($(compgen -f "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
-F)
|
||||||
|
COMPREPLY=($(compgen -f "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
--cmd)
|
||||||
|
COMPREPLY=($(compgen -f "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
-c)
|
||||||
|
COMPREPLY=($(compgen -f "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
--notes)
|
||||||
|
COMPREPLY=($(compgen -f "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
--min-width)
|
||||||
|
COMPREPLY=($(compgen -f "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
--image-width)
|
||||||
|
COMPREPLY=($(compgen -f "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
--palette)
|
||||||
|
COMPREPLY=($(compgen -W "aqua blue green hot io java js mem orange perl python purple red rust wakeup yellow" -- "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
--skip-after)
|
||||||
|
COMPREPLY=($(compgen -f "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
--post-process)
|
||||||
|
COMPREPLY=($(compgen -f "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
--perfdata)
|
||||||
|
COMPREPLY=($(compgen -f "${cur}"))
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
COMPREPLY=()
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
COMPREPLY=( $(compgen -W "${opts}" -- "${cur}") )
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
if [[ "${BASH_VERSINFO[0]}" -eq 4 && "${BASH_VERSINFO[1]}" -ge 4 || "${BASH_VERSINFO[0]}" -gt 4 ]]; then
|
||||||
|
complete -F _flamegraph -o nosort -o bashdefault -o default flamegraph
|
||||||
|
else
|
||||||
|
complete -F _flamegraph -o bashdefault -o default flamegraph
|
||||||
|
fi
|
270
.zshrc
270
.zshrc
|
@ -1,25 +1,32 @@
|
||||||
### ENVVARS
|
### ENVVARS
|
||||||
|
# zmodload zsh/zprof # for profiling, also uncomment last line
|
||||||
|
|
||||||
|
|
||||||
source "$HOME/.zprofile"
|
source "$HOME/.zprofile"
|
||||||
source "$HOME/.config/user-dirs.dirs"
|
source "$HOME/.config/user-dirs.dirs"
|
||||||
export TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S\ncpu\t%P'
|
export TIMEFMT=$'\nreal\t%E\nuser\t%U\nsys\t%S\ncpu\t%P'
|
||||||
export ZSH=$HOME/.zsh
|
export ZSH=$HOME/.zsh
|
||||||
export CLIPBOARD_NOGUI=0 # wayland only allows GUI apps to use the clipboard.
|
export CLIPBOARD_NOGUI=1 # wayland only allows GUI apps to use the clipboard.
|
||||||
# cb would have to open every 2 seconds and steal
|
# cb would have to open every 2 seconds and steal
|
||||||
# focus. This sucks, so I will have to disable GUI
|
# focus. This sucks, so I will have to disable GUI
|
||||||
# integration (yes that means ctrl+v) for now.
|
# integration (yes that means ctrl+v) for now.
|
||||||
#
|
#
|
||||||
# For wayland, set this to `1`
|
# For wayland, set this to `1`
|
||||||
# see https://github.com/Slackadays/Clipboard/issues/171
|
# see https://github.com/Slackadays/Clipboard/issues/171
|
||||||
|
export CLIPBOARD_NOAUDIO=1
|
||||||
|
export CLIPBOARD_SILENT=1
|
||||||
|
export CLIPBOARD_THEME=darkhighcontrast
|
||||||
export DATEFMT='+%a %Y-%m-%d %X'
|
export DATEFMT='+%a %Y-%m-%d %X'
|
||||||
export EDITOR=nvim
|
export EDITOR=$(which nvim)
|
||||||
export VISUAL=nvim
|
export VISUAL=$(which nvim)
|
||||||
|
|
||||||
|
|
||||||
### Aliases
|
### Aliases
|
||||||
alias l="lsd -lah --date \"$DATEFMT\""
|
alias e="eza -la"
|
||||||
alias ll="lsd -lh --date \"$DATEFMT\""
|
alias l="lsd -lah --date \"$DATEFMT\" --hyperlink=auto"
|
||||||
alias la="lsd -a --date \"$DATEFMT\""
|
alias ll="lsd -lh --date \"$DATEFMT\" --hyperlink=auto"
|
||||||
alias ls="lsd --date \"$DATEFMT\""
|
alias la="lsd -a --date \"$DATEFMT\" --hyperlink=auto"
|
||||||
|
alias ls="lsd --date \"$DATEFMT\" --hyperlink=auto"
|
||||||
alias grep="grep --color"
|
alias grep="grep --color"
|
||||||
alias egrep="grep -E"
|
alias egrep="grep -E"
|
||||||
alias lgrep="find | grep"
|
alias lgrep="find | grep"
|
||||||
|
@ -31,6 +38,7 @@ alias isotime='date +"%Y-%m-%dT%H:%M:%S%z"'
|
||||||
alias isodate='date +%Y-%m-%dT%H:%M:%S%z'
|
alias isodate='date +%Y-%m-%dT%H:%M:%S%z'
|
||||||
alias datefmt='date $DATEFMT'
|
alias datefmt='date $DATEFMT'
|
||||||
alias gg=lazygit
|
alias gg=lazygit
|
||||||
|
alias sg=sourcegit
|
||||||
alias reload="source ~/.zshrc"
|
alias reload="source ~/.zshrc"
|
||||||
alias gls=/bin/ls
|
alias gls=/bin/ls
|
||||||
alias bat=batcat
|
alias bat=batcat
|
||||||
|
@ -42,8 +50,28 @@ alias psa="ps -eadf"
|
||||||
alias fsize="stat --printf='%s'"
|
alias fsize="stat --printf='%s'"
|
||||||
alias rg="rg --no-ignore"
|
alias rg="rg --no-ignore"
|
||||||
alias home="cd $HOME"
|
alias home="cd $HOME"
|
||||||
|
alias ff=firefox
|
||||||
|
alias bell="tput bel"
|
||||||
|
alias fd=fdfind
|
||||||
|
alias nobak="touch .nobackup"
|
||||||
|
alias securerm="shred -zun 100"
|
||||||
|
alias mkpatch="diff -Naru"
|
||||||
|
alias shrug="echo -ne ¯\\\_(ツ)_/¯"
|
||||||
|
alias sheep="echo -ne 🐑"
|
||||||
|
alias knife="echo -ne 🔪"
|
||||||
|
alias please="echo -ne 👉👈"
|
||||||
|
alias bak=backup
|
||||||
|
alias cb="NO_COLOR=1 cb"
|
||||||
|
alias helix=hx
|
||||||
|
|
||||||
### Functions
|
### Functions
|
||||||
|
function random() {
|
||||||
|
if [ $# -ne 1 ] || ! [[ $1 =~ ^[0-9]+$ ]] || [ $1 -lt 1 ]; then
|
||||||
|
echo "Error: Please provide one positive integer argument" >&2
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
echo $(( (RANDOM % $1) + 1 ))
|
||||||
|
}
|
||||||
function largefiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(G|T|P|E)\s" }
|
function largefiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(G|T|P|E)\s" }
|
||||||
function midfiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(M|G|T|P|E)\s" }
|
function midfiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(M|G|T|P|E)\s" }
|
||||||
function smallfiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(B|K)\s" }
|
function smallfiles () { exec 2>/dev/null; du -ah "$@" | grep -P "^\d+(B|K)\s" }
|
||||||
|
@ -58,10 +86,8 @@ function condac() {
|
||||||
conda activate $@
|
conda activate $@
|
||||||
export HOST=$(hostname)
|
export HOST=$(hostname)
|
||||||
}
|
}
|
||||||
# calculate on shell with `c 1+1`
|
|
||||||
function c() { printf "%s\n" "$@" | bc -l; }
|
|
||||||
# Call Python and execute multiple statements from args
|
# Call Python and execute multiple statements from args
|
||||||
function py() {
|
function py() {
|
||||||
python <<< "
|
python <<< "
|
||||||
from math import *
|
from math import *
|
||||||
|
|
||||||
|
@ -77,12 +103,12 @@ def evaluate_and_print(code):
|
||||||
if __name__ == \"__main__\":
|
if __name__ == \"__main__\":
|
||||||
expr = '$*'
|
expr = '$*'
|
||||||
evaluate_and_print(expr)
|
evaluate_and_print(expr)
|
||||||
"
|
"
|
||||||
}
|
}
|
||||||
function countlines() {
|
function countlines() {
|
||||||
find . -type f -name "$1" -exec wc -l {} \; | awk '{print $0} {total += $1} END {print "Total lines:", total}'
|
find . -type f -name "$1" -exec wc -l {} \; | awk '{print $0} {total += $1} END {print "Total lines:", total}'
|
||||||
}
|
}
|
||||||
function git-verify-commit () {
|
function git-verify-commit () {
|
||||||
git verify-commit $1
|
git verify-commit $1
|
||||||
ret=$?
|
ret=$?
|
||||||
if [ $ret -ne 0 ]; then
|
if [ $ret -ne 0 ]; then
|
||||||
|
@ -92,6 +118,144 @@ else
|
||||||
fi
|
fi
|
||||||
return $ret
|
return $ret
|
||||||
}
|
}
|
||||||
|
function confirm() {
|
||||||
|
bash -c "
|
||||||
|
echo \"To be executed: $@\";
|
||||||
|
read -p \"Confirm (Y/N): \" -n 1 -r;
|
||||||
|
case \"\$REPLY\" in
|
||||||
|
y|Y ) echo \"es\"; eval $@;;
|
||||||
|
n|N ) echo \"o\";;
|
||||||
|
* ) echo -e \"\ninvalid\";;
|
||||||
|
esac" $@
|
||||||
|
}
|
||||||
|
function confirm-important() {
|
||||||
|
echo "Write 'yes do as i say' to confirm that you REALLY want to do this: $@"
|
||||||
|
read
|
||||||
|
if [[ "${REPLY,,}" = "yes do as i say" ]]
|
||||||
|
then
|
||||||
|
eval $@
|
||||||
|
else
|
||||||
|
echo "aborting"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
function writepatch() {
|
||||||
|
target=$1
|
||||||
|
fname=$(basename $target)
|
||||||
|
mkdir -p a b
|
||||||
|
cp -r $target a
|
||||||
|
cp -r $target b
|
||||||
|
nvim b/$fname
|
||||||
|
diff -Naru --color='auto' a/$fname b/$fname
|
||||||
|
}
|
||||||
|
backup() {
|
||||||
|
local compress=0
|
||||||
|
local src=""
|
||||||
|
|
||||||
|
# Parse options
|
||||||
|
while getopts "z" opt; do
|
||||||
|
case $opt in
|
||||||
|
z) compress=1 ;;
|
||||||
|
*) echo "Usage: backup [-z] file_or_dir"; return 1 ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
shift $((OPTIND-1))
|
||||||
|
|
||||||
|
# Get source file/dir after option processing
|
||||||
|
src="$1"
|
||||||
|
if [ -z "$src" ]; then
|
||||||
|
echo "Error: no source specified"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if source exists
|
||||||
|
if [ ! -e "$src" ]; then
|
||||||
|
echo "Error: $src does not exist"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create backup based on type and options
|
||||||
|
if [ $compress -eq 1 ]; then
|
||||||
|
tar -I zstd -cf "${src}.tar.zstd" "$src"
|
||||||
|
elif [ -d "$src" ]; then
|
||||||
|
cp -r "$src" "${src}.bak.d"
|
||||||
|
else
|
||||||
|
cp "$src" "${src}.bak"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
restore() {
|
||||||
|
local remove=0
|
||||||
|
|
||||||
|
# Parse options
|
||||||
|
while getopts "r" opt; do
|
||||||
|
case $opt in
|
||||||
|
r) remove=1 ;;
|
||||||
|
*) echo "Usage: restore [-r] backup_file"; return 1 ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
shift $((OPTIND-1))
|
||||||
|
|
||||||
|
# Check if argument was provided
|
||||||
|
local src="$1"
|
||||||
|
if [ -z "$src" ]; then
|
||||||
|
echo "Error: no backup file specified"
|
||||||
|
echo "Usage: restore [-r] backup_file"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Check if source exists
|
||||||
|
if [ ! -e "$src" ]; then
|
||||||
|
echo "Error: $src does not exist"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Function to handle overwrite confirmation
|
||||||
|
confirm_overwrite() {
|
||||||
|
echo -n "$1 already exists. Overwrite? [y/N] "
|
||||||
|
read answer
|
||||||
|
[[ $answer =~ ^[Yy] ]]
|
||||||
|
return $?
|
||||||
|
}
|
||||||
|
|
||||||
|
# Determine backup type and restore accordingly
|
||||||
|
if [[ "$src" == *.tar.zstd ]]; then
|
||||||
|
local dest="${src%.tar.zstd}"
|
||||||
|
if [ -e "$dest" ]; then
|
||||||
|
if ! confirm_overwrite "$dest"; then
|
||||||
|
echo "Restore cancelled"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
rm -rf "$dest"
|
||||||
|
fi
|
||||||
|
tar -I zstd -xf "$src"
|
||||||
|
[ $remove -eq 1 ] && rm "$src"
|
||||||
|
elif [[ "$src" == *.bak.d ]]; then
|
||||||
|
local dest="${src%.bak.d}"
|
||||||
|
if [ -e "$dest" ]; then
|
||||||
|
if ! confirm_overwrite "$dest"; then
|
||||||
|
echo "Restore cancelled"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
rm -rf "$dest"
|
||||||
|
fi
|
||||||
|
cp -r "$src" "$dest"
|
||||||
|
[ $remove -eq 1 ] && rm -rf "$src"
|
||||||
|
elif [[ "$src" == *.bak ]]; then
|
||||||
|
local dest="${src%.bak}"
|
||||||
|
if [ -e "$dest" ]; then
|
||||||
|
if ! confirm_overwrite "$dest"; then
|
||||||
|
echo "Restore cancelled"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
rm -f "$dest"
|
||||||
|
fi
|
||||||
|
cp "$src" "$dest"
|
||||||
|
[ $remove -eq 1 ] && rm "$src"
|
||||||
|
else
|
||||||
|
echo "Error: $src is not a recognized backup format"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
### ---- zsh options -------------------------------------
|
### ---- zsh options -------------------------------------
|
||||||
setopt autocd
|
setopt autocd
|
||||||
|
@ -210,6 +374,7 @@ fpath=($ZSH/plugins/zsh-completions/src $fpath)
|
||||||
|
|
||||||
ZAQ_PREFIXES+=('git commit( [^ ]##)# -[^ -]#m')
|
ZAQ_PREFIXES+=('git commit( [^ ]##)# -[^ -]#m')
|
||||||
ZAQ_PREFIXES_GREEDY+=('py #')
|
ZAQ_PREFIXES_GREEDY+=('py #')
|
||||||
|
ZAQ_PREFIXES_GREEDY+=('c #')
|
||||||
ZAQ_PREFIXES_GREEDY+=('countlines #')
|
ZAQ_PREFIXES_GREEDY+=('countlines #')
|
||||||
|
|
||||||
### --- fzf Config ------------------------------------
|
### --- fzf Config ------------------------------------
|
||||||
|
@ -242,20 +407,81 @@ else
|
||||||
eval "$(zoxide init zsh)"
|
eval "$(zoxide init zsh)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
### --- completions local -------------------------------------
|
||||||
|
zstyle ':completion:*' menu select
|
||||||
|
fpath+=~/.zfunc
|
||||||
|
|
||||||
|
export NVM_DIR="$HOME/.config/nvm"
|
||||||
|
# diese Scheiße läd so ewig, wer auch immer dachte dass das so eine gute idee
|
||||||
|
# ist gehört gefeuert. Das muss jeden Tag viele leute minuten kosten.
|
||||||
|
# [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
||||||
|
# [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
||||||
|
|
||||||
|
# on demand nvm
|
||||||
|
function load_nvm() {
|
||||||
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
||||||
|
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
||||||
|
}
|
||||||
|
alias nvim="load_nvm&&nvim"
|
||||||
|
alias hx="load_nvm&&hx"
|
||||||
|
# zprof
|
||||||
|
|
||||||
|
# gpg is cool actually
|
||||||
|
# you need to set KEY_TYPE and KEYID
|
||||||
|
# crypto stuff with my gpg keys
|
||||||
|
gpgencrypt() {
|
||||||
|
# Encrypt with progress indicator
|
||||||
|
gpg --encrypt --armor \
|
||||||
|
--sign \
|
||||||
|
-r "${KEYID}" $@
|
||||||
|
}
|
||||||
|
|
||||||
|
gpgsign() {
|
||||||
|
local input="${1:--}" # Default to stdin if no argument
|
||||||
|
if [[ "${input}" != "-" ]] && [[ ! -f "${input}" ]]; then
|
||||||
|
echo "Error: Input file '${input}' not found"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
gpg --clearsign --default-key "${KEYID}" "${input}"
|
||||||
|
}
|
||||||
|
|
||||||
|
gpgverify() {
|
||||||
|
local input="${1:--}" # Default to stdin if no argument
|
||||||
|
if [[ "${input}" != "-" ]] && [[ ! -f "${input}" ]]; then
|
||||||
|
echo "Error: Input file '${input}' not found"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
gpg --verify "${input}"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Git signing convenience function
|
||||||
|
gcsign() {
|
||||||
|
git commit --amend --gpg-sign="${KEYID}" --allow-empty --signoff
|
||||||
|
}
|
||||||
|
|
||||||
|
gpgexport() {
|
||||||
|
# Export public key
|
||||||
|
gpg --armor --export "${KEYID}" > "${1:-public_key.asc}"
|
||||||
|
}
|
||||||
|
|
||||||
### load unversioned zsh code
|
### load unversioned zsh code
|
||||||
if [ -f ~/.zsh.local ]; then
|
if [ -f ~/.zsh.local ]; then
|
||||||
source ~/.zsh.local
|
source ~/.zsh.local
|
||||||
else
|
else
|
||||||
touch ~/.zsh.local
|
touch ~/.zsh.local
|
||||||
fi
|
fi
|
||||||
|
if [ -f ~/.zshenv ]; then
|
||||||
|
source ~/.zshenv
|
||||||
|
else
|
||||||
|
touch ~/.zshenv
|
||||||
|
fi
|
||||||
|
|
||||||
### --- pyenv Config -------------------------------------
|
### load pyenv if it exists
|
||||||
export PYENV_ROOT="$HOME/.pyenv"
|
if [[ -d $HOME/.pyenv ]]; then
|
||||||
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
|
export PYENV_ROOT="$HOME/.pyenv"
|
||||||
eval "$(pyenv init -)"
|
[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH"
|
||||||
eval "$(pyenv virtualenv-init - zsh)"
|
pyenv() {
|
||||||
|
eval "$(command pyenv init -)"
|
||||||
. "$HOME/.cargo/env"
|
pyenv "$@"
|
||||||
|
}
|
||||||
zstyle ':completion:*' menu select
|
fi
|
||||||
fpath+=~/.zfunc
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue