Compare commits
9 Commits
81f6289374
...
1b89c295c3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1b89c295c3 | ||
|
|
b8ec75febe | ||
|
|
d23d3d65ec | ||
|
|
4ab866acef | ||
|
|
a4f14e33c8 | ||
|
|
856bcc9ee9 | ||
|
|
f13f3c71c7 | ||
|
|
eb9d882449 | ||
|
|
2aab479968 |
@@ -8,20 +8,23 @@ import = ["~/.config/alacritty/themes/themes/solarized_dark.toml"]
|
|||||||
|
|
||||||
[font]
|
[font]
|
||||||
## MesloLGS font
|
## MesloLGS font
|
||||||
# normal.family = "MesloLGS Nerd Font Mono"
|
normal.family = "MesloLGS Nerd Font Mono"
|
||||||
# bold.family = "MesloLGS Nerd Font Mono"
|
bold.family = "MesloLGS Nerd Font Mono"
|
||||||
# italic.family = "MesloLGS Nerd Font Mono"
|
italic.family = "MesloLGS Nerd Font Mono"
|
||||||
# bold_italic.family = "MesloLGS Nerd Font Mono"
|
bold_italic.family = "MesloLGS Nerd Font Mono"
|
||||||
# size = 18
|
|
||||||
# offset.x = 1
|
|
||||||
|
|
||||||
# JetBrains Nerd font
|
|
||||||
normal.family = "JetBrainsMono NF"
|
|
||||||
bold.family = "JetBrainsMono NF SemiBold"
|
|
||||||
italic.family = "JetBrainsMono NFM Thin"
|
|
||||||
bold_italic.family = "JetBrainsMono NFM"
|
|
||||||
size = 18
|
size = 18
|
||||||
offset.x = 1
|
offset.x = 1
|
||||||
|
# set apple font smoothing for alacritty:
|
||||||
|
# defaults write org.alacritty AppleFontSmoothing -int 0
|
||||||
|
|
||||||
|
# JetBrains Nerd font
|
||||||
|
# normal.family = "JetBrainsMono NF"
|
||||||
|
# bold.family = "JetBrainsMono NF SemiBold"
|
||||||
|
# italic.family = "JetBrainsMono NFM Thin"
|
||||||
|
# bold_italic.family = "JetBrainsMono NFM"
|
||||||
|
# size = 18
|
||||||
|
# offset.x = 1
|
||||||
|
# offset.y = 0
|
||||||
|
|
||||||
[window]
|
[window]
|
||||||
dynamic_padding = true
|
dynamic_padding = true
|
||||||
@@ -49,7 +52,8 @@ history = 20000
|
|||||||
|
|
||||||
|
|
||||||
# key bidnings
|
# key bidnings
|
||||||
# use xxd to find codes of key presses
|
# use xxd to find unicode codes of key presses
|
||||||
|
# use cat -v to find escape codes of various key combos
|
||||||
|
|
||||||
[keyboard]
|
[keyboard]
|
||||||
bindings = [
|
bindings = [
|
||||||
|
|||||||
@@ -0,0 +1,91 @@
|
|||||||
|
{
|
||||||
|
"title": "Keyboard Brightness Adjustment",
|
||||||
|
"rules": [
|
||||||
|
{
|
||||||
|
"description": "command-f1 and f2 to adjust keyboard brightness",
|
||||||
|
"manipulators": [
|
||||||
|
{
|
||||||
|
"type": "basic",
|
||||||
|
"from": {
|
||||||
|
"key_code": "f1",
|
||||||
|
"modifiers": {
|
||||||
|
"mandatory": [
|
||||||
|
"left_command"
|
||||||
|
],
|
||||||
|
"optional": [
|
||||||
|
"caps_lock"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"to": [
|
||||||
|
{
|
||||||
|
"key_code": "illumination_decrement"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "basic",
|
||||||
|
"from": {
|
||||||
|
"key_code": "f2",
|
||||||
|
"modifiers": {
|
||||||
|
"mandatory": [
|
||||||
|
"left_command"
|
||||||
|
],
|
||||||
|
"optional": [
|
||||||
|
"caps_lock"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"to": [
|
||||||
|
{
|
||||||
|
"key_code": "illumination_increment"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "command-f5 and f6 to adjust keyboard brightness, same keys as earlier macs",
|
||||||
|
"manipulators": [
|
||||||
|
{
|
||||||
|
"type": "basic",
|
||||||
|
"from": {
|
||||||
|
"key_code": "f5",
|
||||||
|
"modifiers": {
|
||||||
|
"mandatory": [
|
||||||
|
"left_command"
|
||||||
|
],
|
||||||
|
"optional": [
|
||||||
|
"caps_lock"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"to": [
|
||||||
|
{
|
||||||
|
"key_code": "illumination_decrement"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"type": "basic",
|
||||||
|
"from": {
|
||||||
|
"key_code": "f6",
|
||||||
|
"modifiers": {
|
||||||
|
"mandatory": [
|
||||||
|
"left_command"
|
||||||
|
],
|
||||||
|
"optional": [
|
||||||
|
"caps_lock"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"to": [
|
||||||
|
{
|
||||||
|
"key_code": "illumination_increment"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
6934
.config/karabiner/assets/complex_modifications/1675361151.json
Normal file
6934
.config/karabiner/assets/complex_modifications/1675361151.json
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
2338
.config/karabiner/karabiner.json
Normal file
2338
.config/karabiner/karabiner.json
Normal file
File diff suppressed because it is too large
Load Diff
@@ -84,10 +84,11 @@ editor_filesize_threshold=64M
|
|||||||
editor_stop_format_chars=-+*\\,.;:&>
|
editor_stop_format_chars=-+*\\,.;:&>
|
||||||
mcview_eof=
|
mcview_eof=
|
||||||
skin=solarized-dark-256color
|
skin=solarized-dark-256color
|
||||||
|
shell_directory_timeout=900
|
||||||
|
|
||||||
[Layout]
|
[Layout]
|
||||||
output_lines=0
|
output_lines=0
|
||||||
left_panel_size=75
|
left_panel_size=67
|
||||||
top_panel_size=0
|
top_panel_size=0
|
||||||
message_visible=true
|
message_visible=true
|
||||||
keybar_visible=true
|
keybar_visible=true
|
||||||
@@ -114,6 +115,9 @@ clipboard_paste=
|
|||||||
base_color=
|
base_color=
|
||||||
xterm-256color=
|
xterm-256color=
|
||||||
color_terminals=
|
color_terminals=
|
||||||
|
alacritty=
|
||||||
|
xterm=
|
||||||
|
rxvt-256color=
|
||||||
|
|
||||||
[Panels]
|
[Panels]
|
||||||
show_mini_info=true
|
show_mini_info=true
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
diffc = "!f() { git diff ${1}^1 ${1} -- $2; }; f"
|
diffc = "!f() { git diff ${1}^1 ${1} -- $2; }; f"
|
||||||
vimdiffc = "!f() { git vimdiff ${1}^1 ${1} -- $2; }; f"
|
vimdiffc = "!f() { git vimdiff ${1}^1 ${1} -- $2; }; f"
|
||||||
cat = show
|
cat = show
|
||||||
|
webui = !/Users/jetpac/.git-webui/release/libexec/git-core/git-webui
|
||||||
|
|
||||||
[user]
|
[user]
|
||||||
name = Petr Nyc
|
name = Petr Nyc
|
||||||
@@ -42,3 +43,5 @@
|
|||||||
; modulePath = /usr/lib/apache2/modules
|
; modulePath = /usr/lib/apache2/modules
|
||||||
[init]
|
[init]
|
||||||
defaultBranch = master
|
defaultBranch = master
|
||||||
|
[webui]
|
||||||
|
autoupdate = true
|
||||||
|
|||||||
@@ -990,7 +990,7 @@
|
|||||||
# Nvm color.
|
# Nvm color.
|
||||||
typeset -g POWERLEVEL9K_NVM_FOREGROUND=70
|
typeset -g POWERLEVEL9K_NVM_FOREGROUND=70
|
||||||
# Custom icon.
|
# Custom icon.
|
||||||
# typeset -g POWERLEVEL9K_NVM_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
# typeset -g POWERLEVEL10K_NVM_VISUAL_IDENTIFIER_EXPANSION='⭐'
|
||||||
|
|
||||||
############[ nodeenv: node.js environment (https://github.com/ekalinin/nodeenv) ]############
|
############[ nodeenv: node.js environment (https://github.com/ekalinin/nodeenv) ]############
|
||||||
# Nodeenv color.
|
# Nodeenv color.
|
||||||
|
|||||||
331
.spacemacs
331
.spacemacs
@@ -27,20 +27,28 @@ This function should only modify configuration layer settings."
|
|||||||
dotspacemacs-ask-for-lazy-installation t
|
dotspacemacs-ask-for-lazy-installation t
|
||||||
|
|
||||||
;; List of additional paths where to look for configuration layers.
|
;; List of additional paths where to look for configuration layers.
|
||||||
;; Paths must have a trailing slash (i.e. `~/.mycontribs/')
|
;; Paths must have a trailing slash (i.e. "~/.mycontribs/")
|
||||||
dotspacemacs-configuration-layer-path '()
|
dotspacemacs-configuration-layer-path '()
|
||||||
|
|
||||||
;; List of configuration layers to load.
|
;; List of configuration layers to load.
|
||||||
dotspacemacs-configuration-layers
|
dotspacemacs-configuration-layers
|
||||||
'(html
|
'(
|
||||||
|
toml
|
||||||
|
html
|
||||||
python
|
python
|
||||||
javascript
|
javascript
|
||||||
|
pandoc
|
||||||
;; ----------------------------------------------------------------
|
;; ----------------------------------------------------------------
|
||||||
;; Example of useful layers you may want to use right away.
|
;; Example of useful layers you may want to use right away.
|
||||||
;; Uncomment some layer names and press `SPC f e R' (Vim style) or
|
;; Uncomment some layer names and press `SPC f e R' (Vim style) or
|
||||||
;; `M-m f e R' (Emacs style) to install them.
|
;; `M-m f e R' (Emacs style) to install them.
|
||||||
;; ----------------------------------------------------------------
|
;; ----------------------------------------------------------------
|
||||||
auto-completion
|
auto-completion
|
||||||
|
(auto-completion :variables
|
||||||
|
auto-completion-enable-snippets-in-popup t
|
||||||
|
auto-completion-enable-help-tooltip t
|
||||||
|
auto-completion-use-company-box t
|
||||||
|
auto-completion-enable-sort-by-usage t)
|
||||||
;; better-defaults
|
;; better-defaults
|
||||||
emacs-lisp
|
emacs-lisp
|
||||||
git
|
git
|
||||||
@@ -52,16 +60,21 @@ This function should only modify configuration layer settings."
|
|||||||
(org :variables
|
(org :variables
|
||||||
org-enable-bootstrap-support t
|
org-enable-bootstrap-support t
|
||||||
org-enable-jira-support t
|
org-enable-jira-support t
|
||||||
|
;; org-enable-roam-support t
|
||||||
|
;; org-enable-roam-ui t
|
||||||
|
;; org-roam-completion-everywhere t
|
||||||
|
;; this does not work weel with my current font
|
||||||
|
;; org-enable-modern-support t
|
||||||
)
|
)
|
||||||
shell-scripts
|
|
||||||
dap ;; debugging
|
|
||||||
;; (shell :variables
|
;; (shell :variables
|
||||||
;; shell-default-height 30
|
;; shell-default-height 30
|
||||||
;; shell-default-position 'bottom)
|
;; shell-default-position 'bottom)
|
||||||
;; spell-checking
|
;; spell-checking
|
||||||
syntax-checking
|
syntax-checking
|
||||||
;; version-control
|
;; version-control
|
||||||
treemacs)
|
treemacs
|
||||||
|
docker
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
;; List of additional packages that will be installed without being wrapped
|
;; List of additional packages that will be installed without being wrapped
|
||||||
@@ -72,12 +85,14 @@ This function should only modify configuration layer settings."
|
|||||||
;; `dotspacemacs/user-config'. To use a local version of a package, use the
|
;; `dotspacemacs/user-config'. To use a local version of a package, use the
|
||||||
;; `:location' property: '(your-package :location "~/path/to/your-package/")
|
;; `:location' property: '(your-package :location "~/path/to/your-package/")
|
||||||
;; Also include the dependencies as they will not be resolved automatically.
|
;; Also include the dependencies as they will not be resolved automatically.
|
||||||
dotspacemacs-additional-packages '(grab-mac-link)
|
|
||||||
;; dotspacemacs-additional-packages '(org-mac-link :location "/Users/jetpac/org-mac-link.el")
|
;; as ofr Oct2024, MS Outlook does not support getting selected message via AppleScript
|
||||||
|
;; more here: https://forum.keyboardmaestro.com/t/new-outlook-applescript/31296
|
||||||
dotspacemacs-additional-packages '(
|
dotspacemacs-additional-packages '(
|
||||||
org-mac-link
|
org-mac-link
|
||||||
org-alert
|
org-alert
|
||||||
)
|
;org-protocol
|
||||||
|
)
|
||||||
|
|
||||||
;; A list of packages that cannot be updated.
|
;; A list of packages that cannot be updated.
|
||||||
dotspacemacs-frozen-packages '()
|
dotspacemacs-frozen-packages '()
|
||||||
@@ -112,7 +127,6 @@ It should only modify the values of Spacemacs settings."
|
|||||||
;; (default nil)
|
;; (default nil)
|
||||||
dotspacemacs-enable-emacs-pdumper nil
|
dotspacemacs-enable-emacs-pdumper nil
|
||||||
|
|
||||||
|
|
||||||
;; Name of executable file pointing to emacs 27+. This executable must be
|
;; Name of executable file pointing to emacs 27+. This executable must be
|
||||||
;; in your PATH.
|
;; in your PATH.
|
||||||
;; (default "emacs")
|
;; (default "emacs")
|
||||||
@@ -126,14 +140,6 @@ It should only modify the values of Spacemacs settings."
|
|||||||
;; (default (format "spacemacs-%s.pdmp" emacs-version))
|
;; (default (format "spacemacs-%s.pdmp" emacs-version))
|
||||||
dotspacemacs-emacs-dumper-dump-file (format "spacemacs-%s.pdmp" emacs-version)
|
dotspacemacs-emacs-dumper-dump-file (format "spacemacs-%s.pdmp" emacs-version)
|
||||||
|
|
||||||
;; If non-nil ELPA repositories are contacted via HTTPS whenever it's
|
|
||||||
;; possible. Set it to nil if you have no way to use HTTPS in your
|
|
||||||
;; environment, otherwise it is strongly recommended to let it set to t.
|
|
||||||
;; This variable has no effect if Emacs is launched with the parameter
|
|
||||||
;; `--insecure' which forces the value of this variable to nil.
|
|
||||||
;; (default t)
|
|
||||||
dotspacemacs-elpa-https t
|
|
||||||
|
|
||||||
;; Maximum allowed time in seconds to contact an ELPA repository.
|
;; Maximum allowed time in seconds to contact an ELPA repository.
|
||||||
;; (default 5)
|
;; (default 5)
|
||||||
dotspacemacs-elpa-timeout 5
|
dotspacemacs-elpa-timeout 5
|
||||||
@@ -267,7 +273,9 @@ It should only modify the values of Spacemacs settings."
|
|||||||
;; (default t)
|
;; (default t)
|
||||||
dotspacemacs-colorize-cursor-according-to-state t
|
dotspacemacs-colorize-cursor-according-to-state t
|
||||||
|
|
||||||
;; Default font or prioritized list of fonts. The `:size' can be specified as
|
;; Default font or prioritized list of fonts. This setting has no effect when
|
||||||
|
;; running Emacs in terminal. The font set here will be used for default and
|
||||||
|
;; fixed-pitch faces. The `:size' can be specified as
|
||||||
;; a non-negative integer (pixel size), or a floating-point (point size).
|
;; a non-negative integer (pixel size), or a floating-point (point size).
|
||||||
;; Point size is recommended, because it's device independent. (default 10.0)
|
;; Point size is recommended, because it's device independent. (default 10.0)
|
||||||
dotspacemacs-default-font '("Source Code Pro for Powerline"
|
dotspacemacs-default-font '("Source Code Pro for Powerline"
|
||||||
@@ -316,7 +324,7 @@ It should only modify the values of Spacemacs settings."
|
|||||||
|
|
||||||
;; If non-nil then the last auto saved layouts are resumed automatically upon
|
;; If non-nil then the last auto saved layouts are resumed automatically upon
|
||||||
;; start. (default nil)
|
;; start. (default nil)
|
||||||
dotspacemacs-auto-resume-layouts nil
|
dotspacemacs-auto-resume-layouts t
|
||||||
|
|
||||||
;; If non-nil, auto-generate layout name when creating new layouts. Only has
|
;; If non-nil, auto-generate layout name when creating new layouts. Only has
|
||||||
;; effect when using the "jump to layout by number" commands. (default nil)
|
;; effect when using the "jump to layout by number" commands. (default nil)
|
||||||
@@ -339,7 +347,7 @@ It should only modify the values of Spacemacs settings."
|
|||||||
;; If non-nil, the paste transient-state is enabled. While enabled, after you
|
;; If non-nil, the paste transient-state is enabled. While enabled, after you
|
||||||
;; paste something, pressing `C-j' and `C-k' several times cycles through the
|
;; paste something, pressing `C-j' and `C-k' several times cycles through the
|
||||||
;; elements in the `kill-ring'. (default nil)
|
;; elements in the `kill-ring'. (default nil)
|
||||||
dotspacemacs-enable-paste-transient-state nil
|
dotspacemacs-enable-paste-transient-state t
|
||||||
|
|
||||||
;; Which-key delay in seconds. The which-key buffer is the popup listing
|
;; Which-key delay in seconds. The which-key buffer is the popup listing
|
||||||
;; the commands bound to the current keystroke sequence. (default 0.4)
|
;; the commands bound to the current keystroke sequence. (default 0.4)
|
||||||
@@ -348,6 +356,10 @@ It should only modify the values of Spacemacs settings."
|
|||||||
;; Which-key frame position. Possible values are `right', `bottom' and
|
;; Which-key frame position. Possible values are `right', `bottom' and
|
||||||
;; `right-then-bottom'. right-then-bottom tries to display the frame to the
|
;; `right-then-bottom'. right-then-bottom tries to display the frame to the
|
||||||
;; right; if there is insufficient space it displays it at the bottom.
|
;; right; if there is insufficient space it displays it at the bottom.
|
||||||
|
;; It is also possible to use a posframe with the following cons cell
|
||||||
|
;; `(posframe . position)' where position can be one of `center',
|
||||||
|
;; `top-center', `bottom-center', `top-left-corner', `top-right-corner',
|
||||||
|
;; `top-right-corner', `bottom-left-corner' or `bottom-right-corner'
|
||||||
;; (default 'bottom)
|
;; (default 'bottom)
|
||||||
dotspacemacs-which-key-position 'bottom
|
dotspacemacs-which-key-position 'bottom
|
||||||
|
|
||||||
@@ -358,6 +370,11 @@ It should only modify the values of Spacemacs settings."
|
|||||||
;; displayed in the current window. (default nil)
|
;; displayed in the current window. (default nil)
|
||||||
dotspacemacs-switch-to-buffer-prefers-purpose nil
|
dotspacemacs-switch-to-buffer-prefers-purpose nil
|
||||||
|
|
||||||
|
;; Whether side windows (such as those created by treemacs or neotree)
|
||||||
|
;; are kept or minimized by `spacemacs/toggle-maximize-window' (SPC w m).
|
||||||
|
;; (default t)
|
||||||
|
dotspacemacs-maximize-window-keep-side-windows t
|
||||||
|
|
||||||
;; If non-nil a progress bar is displayed when spacemacs is loading. This
|
;; If non-nil a progress bar is displayed when spacemacs is loading. This
|
||||||
;; may increase the boot time on some systems and emacs builds, set it to
|
;; may increase the boot time on some systems and emacs builds, set it to
|
||||||
;; nil to boost the loading time. (default t)
|
;; nil to boost the loading time. (default t)
|
||||||
@@ -461,8 +478,7 @@ It should only modify the values of Spacemacs settings."
|
|||||||
|
|
||||||
;; If non-nil, start an Emacs server if one is not already running.
|
;; If non-nil, start an Emacs server if one is not already running.
|
||||||
;; (default nil)
|
;; (default nil)
|
||||||
;; dotspacemacs-enable-server nil
|
dotspacemacs-enable-server nil
|
||||||
dotspacemacs-enable-server t
|
|
||||||
|
|
||||||
;; Set the emacs server socket location.
|
;; Set the emacs server socket location.
|
||||||
;; If nil, uses whatever the Emacs default is, otherwise a directory path
|
;; If nil, uses whatever the Emacs default is, otherwise a directory path
|
||||||
@@ -473,13 +489,20 @@ It should only modify the values of Spacemacs settings."
|
|||||||
|
|
||||||
;; If non-nil, advise quit functions to keep server open when quitting.
|
;; If non-nil, advise quit functions to keep server open when quitting.
|
||||||
;; (default nil)
|
;; (default nil)
|
||||||
dotspacemacs-persistent-server nil
|
dotspacemacs-persistent-server t
|
||||||
|
|
||||||
;; List of search tool executable names. Spacemacs uses the first installed
|
;; List of search tool executable names. Spacemacs uses the first installed
|
||||||
;; tool of the list. Supported tools are `rg', `ag', `pt', `ack' and `grep'.
|
;; tool of the list. Supported tools are `rg', `ag', `pt', `ack' and `grep'.
|
||||||
;; (default '("rg" "ag" "pt" "ack" "grep"))
|
;; (default '("rg" "ag" "pt" "ack" "grep"))
|
||||||
dotspacemacs-search-tools '("rg" "ag" "pt" "ack" "grep")
|
dotspacemacs-search-tools '("rg" "ag" "pt" "ack" "grep")
|
||||||
|
|
||||||
|
;; The backend used for undo/redo functionality. Possible values are
|
||||||
|
;; `undo-fu', `undo-redo' and `undo-tree' see also `evil-undo-system'.
|
||||||
|
;; Note that saved undo history does not get transferred when changing
|
||||||
|
;; your undo system. The default is currently `undo-fu' as `undo-tree'
|
||||||
|
;; is not maintained anymore and `undo-redo' is very basic."
|
||||||
|
dotspacemacs-undo-system 'undo-fu
|
||||||
|
|
||||||
;; Format specification for setting the frame title.
|
;; Format specification for setting the frame title.
|
||||||
;; %a - the `abbreviated-file-name', or `buffer-name'
|
;; %a - the `abbreviated-file-name', or `buffer-name'
|
||||||
;; %t - `projectile-project-name'
|
;; %t - `projectile-project-name'
|
||||||
@@ -515,6 +538,9 @@ It should only modify the values of Spacemacs settings."
|
|||||||
;; to aggressively delete empty line and long sequences of whitespace,
|
;; to aggressively delete empty line and long sequences of whitespace,
|
||||||
;; `trailing' to delete only the whitespace at end of lines, `changed' to
|
;; `trailing' to delete only the whitespace at end of lines, `changed' to
|
||||||
;; delete only whitespace for changed lines or `nil' to disable cleanup.
|
;; delete only whitespace for changed lines or `nil' to disable cleanup.
|
||||||
|
;; The variable `global-spacemacs-whitespace-cleanup-modes' controls
|
||||||
|
;; which major modes have whitespace cleanup enabled or disabled
|
||||||
|
;; by default.
|
||||||
;; (default nil)
|
;; (default nil)
|
||||||
dotspacemacs-whitespace-cleanup nil
|
dotspacemacs-whitespace-cleanup nil
|
||||||
|
|
||||||
@@ -558,7 +584,7 @@ default it calls `spacemacs/load-spacemacs-env' which loads the environment
|
|||||||
variables declared in `~/.spacemacs.env' or `~/.spacemacs.d/.spacemacs.env'.
|
variables declared in `~/.spacemacs.env' or `~/.spacemacs.d/.spacemacs.env'.
|
||||||
See the header of this file for more information."
|
See the header of this file for more information."
|
||||||
(spacemacs/load-spacemacs-env)
|
(spacemacs/load-spacemacs-env)
|
||||||
)
|
)
|
||||||
|
|
||||||
(defun dotspacemacs/user-init ()
|
(defun dotspacemacs/user-init ()
|
||||||
"Initialization for user code:
|
"Initialization for user code:
|
||||||
@@ -566,9 +592,7 @@ This function is called immediately after `dotspacemacs/init', before layer
|
|||||||
configuration.
|
configuration.
|
||||||
It is mostly for variables that should be set before packages are loaded.
|
It is mostly for variables that should be set before packages are loaded.
|
||||||
If you are unsure, try setting them in `dotspacemacs/user-config' first."
|
If you are unsure, try setting them in `dotspacemacs/user-config' first."
|
||||||
(add-to-list 'tramp-connection-properties
|
)
|
||||||
(list ".*" "remote-shell" "/bin/ksh"))
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
(defun dotspacemacs/user-load ()
|
(defun dotspacemacs/user-load ()
|
||||||
@@ -576,7 +600,7 @@ If you are unsure, try setting them in `dotspacemacs/user-config' first."
|
|||||||
This function is called only while dumping Spacemacs configuration. You can
|
This function is called only while dumping Spacemacs configuration. You can
|
||||||
`require' or `load' the libraries of your choice that will be included in the
|
`require' or `load' the libraries of your choice that will be included in the
|
||||||
dump."
|
dump."
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
(defun dotspacemacs/user-config ()
|
(defun dotspacemacs/user-config ()
|
||||||
@@ -585,20 +609,24 @@ This function is called at the very end of Spacemacs startup, after layer
|
|||||||
configuration.
|
configuration.
|
||||||
Put your configuration code here, except for variables that should be set
|
Put your configuration code here, except for variables that should be set
|
||||||
before packages are loaded."
|
before packages are loaded."
|
||||||
"Configuration for user code:
|
;; Proxy toggle function
|
||||||
This function is called at the very end of Spacemacs startup, after layer
|
(setq http_proxy "http://www-proxy.uk.oracle.com:80")
|
||||||
configuration.
|
(defun toggle-proxy ()
|
||||||
Put your configuration code here, except for variables that should be set
|
"Toggle proxy settings for Emacs."
|
||||||
before packages are loaded."
|
(interactive)
|
||||||
;; inspiration taken from my old config
|
(if (and (boundp 'url-proxy-services) url-proxy-services)
|
||||||
;; and https://www.labri.fr/perso/nrougier/GTD/index.html#org13a9a4f
|
(progn
|
||||||
|
(setq url-proxy-services nil)
|
||||||
|
(message "Proxy disabled"))
|
||||||
|
(setq url-proxy-services
|
||||||
|
`(("no_proxy" . "localhost")
|
||||||
|
("http" . ,http_proxy)
|
||||||
|
("https" . ,http_proxy)))
|
||||||
|
(message ( concat "Proxy enabled: " http_proxy)))
|
||||||
|
)
|
||||||
|
|
||||||
;; inspiration from https://yiming.dev/blog/2016/05/08/how-do-i-use-org-capture-on-mac/
|
;; Bind proxy toggle function to a key
|
||||||
;; (spacemacs/set-leader-keys "Cg" 'org-mac-grab-link)
|
(spacemacs/set-leader-keys "ot" 'toggle-proxy)
|
||||||
|
|
||||||
;; inspiration at https://emacs.stackexchange.com/questions/30177/how-to-assign-tab-to-indentation-and-to-yasnippet-expand-key
|
|
||||||
;; (global-set-key (kbd "TAB") 'yas-expand)
|
|
||||||
;; (global-set-key (kbd "TAB") 'hippie-expand)
|
|
||||||
|
|
||||||
;; idea from chatgpt
|
;; idea from chatgpt
|
||||||
(defun set-dotfiles-environment ()
|
(defun set-dotfiles-environment ()
|
||||||
@@ -623,30 +651,37 @@ before packages are loaded."
|
|||||||
(magit-status)
|
(magit-status)
|
||||||
(unset-dotfiles-environment)))
|
(unset-dotfiles-environment)))
|
||||||
|
|
||||||
(require 'org-protocol)
|
(with-eval-after-load 'org
|
||||||
|
|
||||||
(with-eval-after-load 'org
|
|
||||||
;; org mode config
|
|
||||||
(add-to-list 'org-modules 'org-protocol)
|
|
||||||
|
|
||||||
;; test from https://superuser.com/questions/452649/org-mode-to-markdown-converter
|
;; test from https://superuser.com/questions/452649/org-mode-to-markdown-converter
|
||||||
(require 'ox-md nil t)
|
(require 'ox-md nil t)
|
||||||
|
|
||||||
(setq org-directory "~/Documents/org")
|
(setq org-directory "~/Documents/org")
|
||||||
(setq org-default-notes-file "~/Documents/org/inbox.org")
|
(setq org-default-notes-file "~/Documents/org/inbox.org")
|
||||||
|
|
||||||
|
(setq org-duration-format 'h:mm)
|
||||||
|
|
||||||
;; Define the custum capture templates
|
;; Define the custum capture templates
|
||||||
(setq org-capture-templates
|
(setq org-capture-templates
|
||||||
'(("t" "Todo [inbox] clock_in clock_resume " entry (file+headline org-default-notes-file "Tasks")
|
'(("t" "Todo [inbox] clock_in clock_resume " entry (file+headline org-default-notes-file "Tasks")
|
||||||
"* TODO %?\n%u\n%a\n" :clock-in t :clock-resume t)
|
"* TODO %?\n%u\n%a\n" :clock-in t :clock-resume t)
|
||||||
("m" "Meeting [diary] " entry (file+headline org-default-notes-file "Meetings")
|
("m" "Meeting [diary] " entry (file+headline org-default-notes-file "Meetings")
|
||||||
"* MEETING with %? :Meeting:\n%t" :clock-in t :clock-resume t)
|
"* MEETING %? :Meeting:\n%t" :clock-in t :clock-resume t)
|
||||||
("d" "Diary [diary] " entry (file+datetree "~/org/diary.org")
|
("d" "Diary [diary] " entry (file+datetree "~/org/diary.org")
|
||||||
"* %?\n%U\n" :clock-in t :clock-resume t)
|
"* %?\n%U\n" :clock-in t :clock-resume t)
|
||||||
("i" "Idea [inbox] " entry (file org-default-notes-file)
|
("i" "Inbox [inbox]" entry (file+headline org-default-notes-file "Capture")
|
||||||
"* %? :IDEA: \n%t" :clock-in t :clock-resume t)
|
"* %?\n Captured: %U\n%i\n %a" :empty-lines 1)
|
||||||
|
;; ("i" "Idea [inbox] " entry (file org-default-notes-file)
|
||||||
|
;; "* %? :IDEA: \n%t" :clock-in t :clock-resume t)
|
||||||
("n" "Next Task" entry (file+headline org-default-notes-file "Tasks")
|
("n" "Next Task" entry (file+headline org-default-notes-file "Tasks")
|
||||||
"** NEXT %? \nDEADLINE: %t") ))
|
"** NEXT %? \nDEADLINE: %t") ))
|
||||||
|
|
||||||
|
; original
|
||||||
|
; (setq org-agenda-files '("~/Documents/org/inbox.org"
|
||||||
|
; "~/Documents/org/projects.org"
|
||||||
|
; "~/Documents/org/someday.org"
|
||||||
|
; "~/Documents/org/calendar.org"))
|
||||||
|
|
||||||
|
; testing freeze
|
||||||
(setq org-agenda-files '("~/Documents/org/inbox.org"
|
(setq org-agenda-files '("~/Documents/org/inbox.org"
|
||||||
"~/Documents/org/projects.org"
|
"~/Documents/org/projects.org"
|
||||||
"~/Documents/org/someday.org"
|
"~/Documents/org/someday.org"
|
||||||
@@ -654,100 +689,64 @@ before packages are loaded."
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
;(define-key global-map "\C-cc" 'org-capture)
|
|
||||||
;(define-key global-map "\C-cl" 'org-store-link)
|
|
||||||
;(define-key global-map "\C-ca" 'org-agenda)
|
|
||||||
(define-key org-mode-map (kbd "C-c g") 'org-mac-link-get-link)
|
|
||||||
|
|
||||||
;; (setq org-refile-targets '(("~/Documents/org/inbox.org" :maxlevel . 3)))
|
|
||||||
|
|
||||||
;; (setq org-refile-targets '(
|
|
||||||
;; ("~/Documents/org/projects.org" :maxlevel . 3)
|
|
||||||
;; ("~/Documents/org/someday.org", :level .1)
|
|
||||||
;; ("~/Documents/org/calendar.org", :maxlevel .2)
|
|
||||||
;; ))
|
|
||||||
|
|
||||||
|
|
||||||
(setq org-refile-targets '(("/Users/jetpac/Documents/org/projects.org" :maxlevel . 3)
|
(setq org-refile-targets '(("/Users/jetpac/Documents/org/projects.org" :maxlevel . 3)
|
||||||
("/Users/jetpac/Documents/org/inbox.org" :maxlevel . 3)
|
("/Users/jetpac/Documents/org/inbox.org" :maxlevel . 3)
|
||||||
("/Users/jetpac/Documents/org/someday.org" :maxlevel . 3)
|
("/Users/jetpac/Documents/org/someday.org" :maxlevel . 3)
|
||||||
|
("/Users/jetpac/Documents/org/inbox.org" :maxlevel . 3)
|
||||||
("/Users/jetpac/Documents/org/calendar.org" :maxlevel . 2)))
|
("/Users/jetpac/Documents/org/calendar.org" :maxlevel . 2)))
|
||||||
|
|
||||||
;; ("/Users/jetpac/Documents/org/someday.org" :level . 1)
|
|
||||||
|
|
||||||
;; Don't include a footer with my contact and publishing information at the bottom of every exported HTML document.
|
;; Don't include a footer with my contact and publishing information at the bottom of every exported HTML document.
|
||||||
(setq org-html-postamble nil)
|
(setq org-html-postamble nil)
|
||||||
(setq org-clock-report-include-clocking-task t)
|
|
||||||
|
|
||||||
;; inspiration from https://emacs.stackexchange.com/questions/33179/how-to-fix-columns-of-org-agenda-clock-report
|
;; inspiration from https://emacs.stackexchange.com/questions/33179/how-to-fix-columns-of-org-agenda-clock-report
|
||||||
(setq org-agenda-clockreport-parameter-plist
|
(setq org-agenda-clockreport-parameter-plist
|
||||||
(quote (:link t :maxlevel 7 :fileskip0 t :compact t :narrow 80 :formula %)))
|
(quote (:link t :maxlevel 7 :fileskip0 t :compact t :narrow 80 :formula %)))
|
||||||
|
|
||||||
(setq org-agenda-custom-commands
|
(setq org-agenda-custom-commands
|
||||||
'(
|
'(
|
||||||
("g" "Get Things Done (GTD)"
|
("g" "Get Things Done (GTD)"
|
||||||
((agenda ""
|
((agenda ""
|
||||||
(
|
(
|
||||||
;; (org-agenda-skip-function
|
;; (org-agenda-skip-function
|
||||||
;; '(org-agenda-skip-entry-if 'deadline))
|
;; '(org-agenda-skip-entry-if 'deadline))
|
||||||
(org-deadline-warning-days 0)
|
(org-deadline-warning-days 0)
|
||||||
(org-agenda-time-grid)
|
(org-agenda-time-grid)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
(todo "NEXT"
|
(todo "NEXT"
|
||||||
(
|
|
||||||
;; (org-agenda-skip-function
|
|
||||||
;; '(org-agenda-skip-entry-if 'deadline))
|
|
||||||
(org-agenda-prefix-format " %i %-12:c [%-4e] ")
|
|
||||||
(org-agenda-overriding-header "Tasks\n")))
|
|
||||||
(agenda "dead"
|
|
||||||
((org-agenda-entry-types '(:deadline))
|
|
||||||
;;(org-agenda-format-date "")
|
|
||||||
(org-deadline-warning-days 7)
|
|
||||||
(org-agenda-skip-function
|
|
||||||
'(org-agenda-skip-entry-if 'notregexp "\\* NEXT"))
|
|
||||||
(org-agenda-overriding-header "Deadlines\n")))
|
|
||||||
(tags-todo "inbox"
|
|
||||||
((org-agenda-prefix-format " %?-12t% s")
|
|
||||||
(org-agenda-overriding-header "Inbox\n")))
|
|
||||||
(tags "CLOSED>=\"<today>\""
|
|
||||||
((org-agenda-overriding-header "Completed today\n")))))
|
|
||||||
|
|
||||||
|
|
||||||
("T" "Weekly review with tasks for team meetings"
|
|
||||||
(
|
|
||||||
(agenda ""
|
|
||||||
(
|
(
|
||||||
(org-deadline-warning-days 0)
|
;; (org-agenda-skip-function
|
||||||
(org-agenda-overriding-header "Agenda since last Thursday\n")
|
;; '(org-agenda-skip-entry-if 'deadline))
|
||||||
(org-agenda-start-on-weekday 4)
|
(org-agenda-prefix-format " %i %-12:c [%-4e] ")
|
||||||
)
|
(org-agenda-overriding-header "Tasks\n")))
|
||||||
)
|
(agenda "dead"
|
||||||
(todo "DONE"
|
((org-agenda-entry-types '(:deadline))
|
||||||
(
|
;;(org-agenda-format-date "")
|
||||||
(org-agenda-prefix-format " %i ")
|
(org-deadline-warning-days 7)
|
||||||
(org-agenda-start-on-weekday 4)
|
(org-agenda-skip-function
|
||||||
(org-agenda-overriding-header "Tasks done since last Thursday\n")
|
'(org-agenda-skip-entry-if 'notregexp "\\* NEXT"))
|
||||||
))
|
(org-agenda-overriding-header "Deadlines\n")))
|
||||||
|
(tags-todo "inbox"
|
||||||
|
((org-agenda-prefix-format " %?-12t% s")
|
||||||
|
(org-agenda-overriding-header "Inbox\n")))
|
||||||
|
(tags "CLOSED>=\"<today>\""
|
||||||
|
((org-agenda-overriding-header "Completed today\n")))))
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
(setq org-todo-keywords
|
(setq org-todo-keywords
|
||||||
'((sequence "TODO(t)" "NEXT(n)" "WAIT(w)" "RUNNING(r)" "|" "DONE(d)" "CANCELLED(c)" )))
|
'((sequence "TODO(t)" "NEXT(n)" "WAIT(w)" "RUNNING(r)" "|" "DONE(d)" "CANCELLED(c)" )))
|
||||||
|
|
||||||
(setq org-clock-out-remove-zero-time-clocks t)
|
(setq org-clock-out-remove-zero-time-clocks t)
|
||||||
|
) ;; with-eval-after-load
|
||||||
|
|
||||||
;; (setq org-agenda-hide-tags-regexp ".")
|
(with-eval-after-load 'markdown-mode
|
||||||
|
(define-key markdown-mode-map (kbd "C-c x") 'my/markdown-toggle-checkbox))
|
||||||
|
|
||||||
|
|
||||||
) ;; with eval after load
|
|
||||||
(setq calendar-week-start-day 1) ;; calendar start on Monday
|
(setq calendar-week-start-day 1) ;; calendar start on Monday
|
||||||
|
|
||||||
(defadvice projectile-project-root (around ignore-remote first activate)
|
|
||||||
(unless (file-remote-p default-directory) ad-do-it))
|
|
||||||
|
|
||||||
;; org-alert configuration
|
;; org-alert configuration
|
||||||
;; https://github.com/jwiegley/alert
|
;; https://github.com/jwiegley/alert
|
||||||
;; https://www.youtube.com/watch?v=wKTKmE1wLyw
|
;; https://www.youtube.com/watch?v=wKTKmE1wLyw
|
||||||
@@ -757,11 +756,20 @@ before packages are loaded."
|
|||||||
(setq alert-default-style 'osx-notifier) ;; Use terminal-notifier for macOS notifications
|
(setq alert-default-style 'osx-notifier) ;; Use terminal-notifier for macOS notifications
|
||||||
(setq org-alert-notify-cutoff 10 ;; Notify 10 minutes before the deadline
|
(setq org-alert-notify-cutoff 10 ;; Notify 10 minutes before the deadline
|
||||||
org-alert-notification-title "Org Alert Reminder!"
|
org-alert-notification-title "Org Alert Reminder!"
|
||||||
)
|
)
|
||||||
(org-alert-enable))
|
(org-alert-enable))
|
||||||
|
|
||||||
|
(defun my/markdown-toggle-checkbox ()
|
||||||
|
"Toggle checkbox in markdown list at point."
|
||||||
|
(interactive)
|
||||||
|
(save-excursion
|
||||||
|
(beginning-of-line)
|
||||||
|
(when (looking-at "\\s-*[-*]\\s-+\\[\\([ xX]\\)\\]")
|
||||||
|
(replace-match
|
||||||
|
(if (string= (match-string 1) " ")
|
||||||
|
"x" " ") nil nil nil 1))))
|
||||||
|
|
||||||
) ;; user-config
|
) ;; user-config
|
||||||
|
|
||||||
|
|
||||||
;; Do not write anything past this comment. This is where Emacs will
|
;; Do not write anything past this comment. This is where Emacs will
|
||||||
@@ -771,20 +779,61 @@ before packages are loaded."
|
|||||||
This is an auto-generated function, do not modify its content directly, use
|
This is an auto-generated function, do not modify its content directly, use
|
||||||
Emacs customize menu instead.
|
Emacs customize menu instead.
|
||||||
This function is called at the very end of Spacemacs initialization."
|
This function is called at the very end of Spacemacs initialization."
|
||||||
(custom-set-variables
|
(custom-set-variables
|
||||||
;; custom-set-variables was added by Custom.
|
;; custom-set-variables was added by Custom.
|
||||||
;; If you edit it by hand, you could mess it up, so be careful.
|
;; If you edit it by hand, you could mess it up, so be careful.
|
||||||
;; Your init file should contain only one such instance.
|
;; Your init file should contain only one such instance.
|
||||||
;; If there is more than one, they won't work right.
|
;; If there is more than one, they won't work right.
|
||||||
'(desktop-save-mode t)
|
'(package-selected-packages
|
||||||
'(org-safe-remote-resources
|
'(a ace-jump-helm-line ace-link aggressive-indent aio alert all-the-icons
|
||||||
'("\\`https://fniessen\\.github\\.io/org-html-themes/org/theme-Bigblow\\.setup\\'"))
|
anaconda-mode auto-compile auto-highlight-symbol auto-yasnippet blacken
|
||||||
'(package-selected-packages
|
bui centered-cursor-mode clean-aindent-mode closql code-cells code-review
|
||||||
'(org-alert web-mode git-link git-messenger git-modes git-timemachine gitignore-templates helm-git-grep helm-ls-git orgit-forge orgit forge ghub closql emacsql treepy smeargle treemacs-magit magit magit-section git-commit with-editor dash blacken code-cells company-anaconda anaconda-mode cython-mode helm-cscope helm-pydoc importmagic epc ctable concurrent deferred live-py-mode lsp-pyright lsp-python-ms nose pip-requirements pipenv load-env-vars pippel transient seq compat py-isort pydoc pyenv-mode pythonic pylookup pytest pyvenv sphinx-doc stickyfunc-enhance xcscope yapfify add-node-modules-path counsel-gtags counsel swiper ivy ggtags helm-gtags wfnames impatient-mode import-js grizzl js-doc js2-refactor multiple-cursors livid-mode nodejs-repl npm-mode prettier-js skewer-mode js2-mode simple-httpd tern web-beautify grab-mac-link org-mac-link ac-ispell auto-complete auto-yasnippet company-shell dap-mode lsp-docker bui yaml evil-org fish-mode flycheck-bashate flycheck-pos-tip pos-tip fuzzy gh-md gnuplot helm-c-yasnippet helm-company company helm-lsp helm-org-rifle htmlize insert-shebang lsp-origami origami lsp-treemacs lsp-ui lsp-mode markdown-toc markdown-mode mmm-mode org org-cliplink org-contrib org-download org-jira org-mime org-pomodoro alert log4e gntp org-present org-projectile org-category-capture org-rich-yank ox-jira ox-twbs shfmt reformatter yasnippet-snippets yasnippet ws-butler writeroom-mode winum which-key volatile-highlights vim-powerline vi-tilde-fringe uuidgen use-package undo-tree treemacs-projectile treemacs-persp treemacs-icons-dired treemacs-evil toc-org term-cursor symon symbol-overlay string-inflection string-edit-at-point spacemacs-whitespace-cleanup spacemacs-purpose-popwin spaceline-all-the-icons space-doc restart-emacs request rainbow-delimiters quickrun popwin pcre2el password-generator paradox overseer org-superstar open-junk-file nameless multi-line macrostep lorem-ipsum link-hint inspector info+ indent-guide hybrid-mode hungry-delete holy-mode hl-todo highlight-parentheses highlight-numbers highlight-indentation hide-comnt help-fns+ helm-xref helm-themes helm-swoop helm-purpose helm-projectile helm-org helm-mode-manager helm-make helm-descbinds helm-ag google-translate golden-ratio font-lock+ flycheck-package flycheck-elsa flx-ido fancy-battery eyebrowse expand-region evil-visualstar evil-visual-mark-mode evil-unimpaired evil-tutor evil-textobj-line evil-surround evil-numbers evil-nerd-commenter evil-mc evil-matchit evil-lisp-state evil-lion evil-indent-plus evil-iedit-state evil-goggles evil-exchange evil-evilified-state evil-escape evil-easymotion evil-collection evil-cleverparens evil-args evil-anzu eval-sexp-fu emr elisp-slime-nav elisp-def editorconfig dumb-jump drag-stuff dotenv-mode dired-quick-sort diminish devdocs define-word column-enforce-mode clean-aindent-mode centered-cursor-mode auto-highlight-symbol auto-compile aggressive-indent ace-link ace-jump-helm-line)))
|
column-enforce-mode company company-anaconda company-box
|
||||||
(custom-set-faces
|
company-quickhelp company-shell company-statistics company-web concurrent
|
||||||
;; custom-set-faces was added by Custom.
|
ctable cython-mode dap-mode deferred define-word devdocs diminish
|
||||||
;; If you edit it by hand, you could mess it up, so be careful.
|
dired-quick-sort disable-mouse docker dockerfile-mode dotenv-mode
|
||||||
;; Your init file should contain only one such instance.
|
drag-stuff dumb-jump edit-indirect editorconfig elisp-def elisp-demos
|
||||||
;; If there is more than one, they won't work right.
|
elisp-slime-nav emacsql emmet-mode emojify emr epc eval-sexp-fu evil-anzu
|
||||||
)
|
evil-args evil-cleverparens evil-collection evil-easymotion evil-escape
|
||||||
)
|
evil-evilified-state evil-exchange evil-goggles evil-iedit-state
|
||||||
|
evil-indent-plus evil-lion evil-lisp-state evil-matchit evil-mc
|
||||||
|
evil-nerd-commenter evil-numbers evil-org evil-surround evil-textobj-line
|
||||||
|
evil-tutor evil-unimpaired evil-visual-mark-mode evil-visualstar
|
||||||
|
expand-region eyebrowse fancy-battery fish-mode flx-ido flycheck-bashate
|
||||||
|
flycheck-elsa flycheck-package flycheck-pos-tip forge frame-local gh-md
|
||||||
|
ghub git-link git-messenger git-modes git-timemachine gitignore-templates
|
||||||
|
gntp gnuplot golden-ratio google-translate haml-mode helm-ag
|
||||||
|
helm-c-yasnippet helm-comint helm-company helm-css-scss helm-descbinds
|
||||||
|
helm-git-grep helm-ls-git helm-lsp helm-make helm-mode-manager helm-org
|
||||||
|
helm-org-rifle helm-projectile helm-purpose helm-pydoc helm-swoop
|
||||||
|
helm-themes helm-xref hide-comnt hierarchy highlight-indentation
|
||||||
|
highlight-numbers highlight-parentheses hl-todo holy-mode htmlize
|
||||||
|
hungry-delete hybrid-mode impatient-mode importmagic indent-guide info+
|
||||||
|
insert-shebang inspector js-doc js2-mode js2-refactor json-mode
|
||||||
|
json-navigator json-reformat json-snatcher link-hint live-py-mode
|
||||||
|
livid-mode load-env-vars log4e lorem-ipsum lsp-docker lsp-mode
|
||||||
|
lsp-origami lsp-pyright lsp-treemacs lsp-ui macrostep magit magit-section
|
||||||
|
markdown-mode markdown-toc multi-line multiple-cursors nameless
|
||||||
|
nodejs-repl nose npm-mode open-junk-file org-alert org-category-capture
|
||||||
|
org-cliplink org-contrib org-download org-jira org-mac-link org-mime
|
||||||
|
org-pomodoro org-present org-project-capture org-projectile org-rich-yank
|
||||||
|
org-superstar orgit orgit-forge origami overseer ox-jira ox-pandoc
|
||||||
|
ox-twbs pandoc-mode paradox password-generator pcre2el pip-requirements
|
||||||
|
pipenv pippel poetry popwin pos-tip prettier-js pug-mode py-isort pydoc
|
||||||
|
pyenv-mode pylookup pytest pythonic pyvenv quickrun rainbow-delimiters
|
||||||
|
request restart-emacs sass-mode scss-mode shfmt simple-httpd skewer-mode
|
||||||
|
slim-mode smeargle space-doc spaceline spacemacs-purpose-popwin
|
||||||
|
spacemacs-whitespace-cleanup sphinx-doc string-edit-at-point
|
||||||
|
string-inflection symbol-overlay symon tablist tagedit term-cursor tern
|
||||||
|
toc-org toml-mode transient treemacs-evil treemacs-icons-dired
|
||||||
|
treemacs-magit treemacs-persp treemacs-projectile treepy undo-fu
|
||||||
|
undo-fu-session vi-tilde-fringe vim-powerline volatile-highlights vundo
|
||||||
|
web-beautify web-completion-data web-mode which-key winum with-editor
|
||||||
|
writeroom-mode ws-butler yaml yapfify yasnippet yasnippet-snippets)))
|
||||||
|
(custom-set-faces
|
||||||
|
;; custom-set-faces was added by Custom.
|
||||||
|
;; If you edit it by hand, you could mess it up, so be careful.
|
||||||
|
;; Your init file should contain only one such instance.
|
||||||
|
;; If there is more than one, they won't work right.
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|||||||
3
.ssh/config.oci
Normal file
3
.ssh/config.oci
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
Include ssh_configs/config
|
||||||
|
Include osd_configs/config
|
||||||
|
Include user
|
||||||
131
.ssh/config.solaris
Normal file
131
.ssh/config.solaris
Normal file
@@ -0,0 +1,131 @@
|
|||||||
|
Host *
|
||||||
|
# UseKeychain yes
|
||||||
|
AddKeysToAgent yes
|
||||||
|
ServerAliveInterval 300
|
||||||
|
ServerAliveCountMax 2
|
||||||
|
TCPKeepAlive no
|
||||||
|
HostkeyAlgorithms +ssh-rsa
|
||||||
|
PubkeyAcceptedAlgorithms +ssh-rsa
|
||||||
|
# User pnyc
|
||||||
|
|
||||||
|
|
||||||
|
Host *
|
||||||
|
IdentitiesOnly yes
|
||||||
|
|
||||||
|
Host 192.168.2.*
|
||||||
|
IdentitiesOnly yes
|
||||||
|
|
||||||
|
Host osdbld
|
||||||
|
HostName 100.73.219.187
|
||||||
|
User opc
|
||||||
|
IdentityFile ~/.ssh/id_nginxbuild
|
||||||
|
|
||||||
|
Host osd-calico-dev osd-calico-dev.webad1phx.solarisx86phx.oraclevcn.com
|
||||||
|
Hostname osd-calico-dev.webad1phx.solarisx86phx.oraclevcn.com
|
||||||
|
User opc
|
||||||
|
IdentityFile ~/.ssh/id_ed25519
|
||||||
|
|
||||||
|
|
||||||
|
# private m1 mac
|
||||||
|
Host 192.168.2.81
|
||||||
|
User jetpac
|
||||||
|
IdentityFile /Users/jetpac/.ssh/id_mac_private
|
||||||
|
|
||||||
|
Host git.meinlschmidt.org
|
||||||
|
IdentityFile ~/.ssh/git.meinlschmidt.org
|
||||||
|
|
||||||
|
Host 192.168.2.1 gw gw.doma.jetpac.org
|
||||||
|
IdentityFile ~/.ssh/mikrotik
|
||||||
|
|
||||||
|
Host github.com
|
||||||
|
IdentityFile ~/.ssh/github.com
|
||||||
|
|
||||||
|
Host bitbucket.oci.oraclecorp.com
|
||||||
|
IdentityFile ~/.ssh/orabucket
|
||||||
|
HostkeyAlgorithms +ssh-rsa
|
||||||
|
PubkeyAcceptedAlgorithms +ssh-rsa
|
||||||
|
|
||||||
|
Host www.jetpac.org
|
||||||
|
IdentityFile ~/.ssh/id_ed25519.jetpac.org
|
||||||
|
User jetpac
|
||||||
|
|
||||||
|
|
||||||
|
Host dabel dabel.us.oracle.com
|
||||||
|
User pnyc
|
||||||
|
IdentityFile ~/.ssh/dabel.key
|
||||||
|
RequestTTY yes
|
||||||
|
|
||||||
|
Host hubbins hubbins.us.oracle.com 10.134.7.102
|
||||||
|
User pnyc
|
||||||
|
|
||||||
|
Host tdabel
|
||||||
|
User pnyc
|
||||||
|
Hostname dabel.us.oracle.com
|
||||||
|
IdentityFile ~/.ssh/dabel.key
|
||||||
|
RequestTTY yes
|
||||||
|
RemoteCommand tmux new -A
|
||||||
|
|
||||||
|
Host utmfedora
|
||||||
|
Hostname 192.168.205.3
|
||||||
|
User jetpac
|
||||||
|
|
||||||
|
|
||||||
|
Host 100.106.196.204 pnyc-mrspatmore.webad1phx.solarisx86phx.oraclevcn.com pnyc-mrspatmore
|
||||||
|
User jetpac
|
||||||
|
Hostname 100.106.196.204
|
||||||
|
IdentityFile ~/.ssh/pnyc-mrspatmore
|
||||||
|
|
||||||
|
Host osd osd-dev-pnyc.webad1phx.solarisx86phx.oraclevcn.com
|
||||||
|
IdentityFile ~/.ssh/osd-dev-pnyc
|
||||||
|
Hostname osd-dev-pnyc.webad1phx.solarisx86phx.oraclevcn.com
|
||||||
|
user pnyc
|
||||||
|
|
||||||
|
Host osd-ol7 osd-dev-ol7.webad1phx.solarisx86phx.oraclevcn.com
|
||||||
|
IdentityFile ~/.ssh/osd-dev-pnyc
|
||||||
|
Hostname osd-dev-ol7.webad1phx.solarisx86phx.oraclevcn.com
|
||||||
|
user pnyc
|
||||||
|
|
||||||
|
Host andel.us.oracle.com dabel.us.oracle.com gates.us.oracle.com
|
||||||
|
User pnyc
|
||||||
|
|
||||||
|
|
||||||
|
Host gitlocal
|
||||||
|
Hostname 127.0.0.1
|
||||||
|
Port 2200
|
||||||
|
|
||||||
|
Host oci-wireguard
|
||||||
|
Hostname 130.61.98.65
|
||||||
|
User ubuntu
|
||||||
|
IdentityFile ~/.ssh/id_ed25519_oci
|
||||||
|
|
||||||
|
Host libcurlbuild
|
||||||
|
Hostname led-build-mac.uk.oracle.com
|
||||||
|
User petrnyc
|
||||||
|
|
||||||
|
Host 192.168.2.72 homeassistant ha
|
||||||
|
Hostname 192.168.2.72
|
||||||
|
user hassio
|
||||||
|
IdentityFile ~/.ssh/jetpac01ha
|
||||||
|
|
||||||
|
Host adam-test
|
||||||
|
HostName 100.106.212.188
|
||||||
|
User opc
|
||||||
|
|
||||||
|
Host nori nori.commonsub.zsphx.oraclevcn.com
|
||||||
|
Hostname nori.commonsub.zsphx.oraclevcn.com
|
||||||
|
User opc
|
||||||
|
|
||||||
|
# Host operator-access-token.svc.ad1.r2 bastion*.oracleiaas.com
|
||||||
|
# Include ~/.ssh/ssh_configs/config
|
||||||
|
# User pnyc
|
||||||
|
|
||||||
|
# vim: tabstop=4 shiftwidth=4
|
||||||
|
#Include ~/.ssh/ssh_configs/config
|
||||||
|
#Include ~/.ssh/osd_configs/config
|
||||||
|
|
||||||
|
|
||||||
|
Include ossh_configs/*.ossh
|
||||||
|
Include ssh_configs/config
|
||||||
|
Include osd_configs/config
|
||||||
|
|
||||||
|
|
||||||
27
.tmux.conf
27
.tmux.conf
@@ -4,21 +4,19 @@ set -g @plugin 'tmux-plugins/tpm'
|
|||||||
set -g @plugin 'tmux-plugins/tmux-sensible'
|
set -g @plugin 'tmux-plugins/tmux-sensible'
|
||||||
set -g @plugin 'tmux-plugins/tmux-sidebar'
|
set -g @plugin 'tmux-plugins/tmux-sidebar'
|
||||||
set -g @plugin 'tmux-plugins/tmux-pain-control'
|
set -g @plugin 'tmux-plugins/tmux-pain-control'
|
||||||
|
|
||||||
set -g @plugin 'tmux-plugins/tmux-logging'
|
set -g @plugin 'tmux-plugins/tmux-logging'
|
||||||
|
set -g @plugin 'tmux-plugins/tmux-copycat' # not needed for tmux 3.1+
|
||||||
|
|
||||||
set -g @plugin 'tmux-plugins/tmux-copycat'
|
set -g @plugin 'tmux-plugins/tmux-resurrect' # https://github.com/tmux-plugins/tmux-resurrect
|
||||||
|
|
||||||
|
|
||||||
# https://github.com/tmux-plugins/tmux-resurrect
|
|
||||||
set -g @plugin 'tmux-plugins/tmux-resurrect'
|
|
||||||
set -g @resurrect-capture-pane-contents 'on'
|
set -g @resurrect-capture-pane-contents 'on'
|
||||||
set -g @resurrect-processes 'ssh neomutt mbsync'
|
set -g @resurrect-processes 'ssh neomutt mbsync vim'
|
||||||
# https://github.com/tmux-plugins/tmux-continuum
|
set -g @plugin 'tmux-plugins/tmux-continuum' # https://github.com/tmux-plugins/tmux-continuum
|
||||||
set -g @plugin 'tmux-plugins/tmux-continuum'
|
|
||||||
|
|
||||||
set -g @plugin 'seebi/tmux-colors-solarized'
|
set -g @plugin 'seebi/tmux-colors-solarized'
|
||||||
|
|
||||||
|
# inspiration from https://gist.github.com/andersevenrud/015e61af2fd264371032763d4ed965b6
|
||||||
|
set -sg terminal-overrides ",*:RGB"
|
||||||
|
|
||||||
# too wild, some shortcuts like meta-tab/meta-number are nice though
|
# too wild, some shortcuts like meta-tab/meta-number are nice though
|
||||||
# set -g @plugin 'ek9/tmux-vim-bindings'
|
# set -g @plugin 'ek9/tmux-vim-bindings'
|
||||||
|
|
||||||
@@ -26,6 +24,10 @@ set -g @plugin 'seebi/tmux-colors-solarized'
|
|||||||
# set -g @colors-solarized 'light'
|
# set -g @colors-solarized 'light'
|
||||||
set -g @colors-solarized 'dark'
|
set -g @colors-solarized 'dark'
|
||||||
|
|
||||||
|
# this causes tmux to crash
|
||||||
|
# set-option -g mouse on
|
||||||
|
# set -g @plugin 'jaclu/tmux-menus'
|
||||||
|
|
||||||
|
|
||||||
# Change prefix to C-a
|
# Change prefix to C-a
|
||||||
# C-a hex value: 0x01
|
# C-a hex value: 0x01
|
||||||
@@ -70,9 +72,14 @@ set -g pane-base-index 1
|
|||||||
set -ag terminal-overrides ",xterm-256color:Tc"
|
set -ag terminal-overrides ",xterm-256color:Tc"
|
||||||
|
|
||||||
# synchronize panes
|
# synchronize panes
|
||||||
bind e setw synchronize-panes ; display "Sync #{?pane_synchronized,ON,OFF}"
|
bind e setw synchronize-panes # ; tmux display "Sync #{?pane_synchronized,ON,OFF}"
|
||||||
|
|
||||||
|
|
||||||
# tpm install: git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
|
# tpm install: git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
|
||||||
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
|
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
|
||||||
run '~/.tmux/plugins/tpm/tpm'
|
run '~/.tmux/plugins/tpm/tpm'
|
||||||
|
|
||||||
|
|
||||||
|
# test for https://unix.stackexchange.com/questions/480437/can-i-ask-tmux-to-immediately-exit-copy-mode-and-paste-the-content-when-i-yank
|
||||||
|
bind-key -T copy-mode-vi Y send-keys -X copy-pipe-and-cancel "tmux paste-buffer"
|
||||||
|
|
||||||
|
|||||||
14
.vimrc
14
.vimrc
@@ -79,10 +79,10 @@ let g:syntastic_yaml_checkers = ['yamllint']
|
|||||||
" " https://vi.stackexchange.com/questions/10007/how-to-make-syntastic-include-sourced-files-for-bash-syntax-as-shellcheck-x
|
" " https://vi.stackexchange.com/questions/10007/how-to-make-syntastic-include-sourced-files-for-bash-syntax-as-shellcheck-x
|
||||||
" let g:syntastic_sh_shellcheck_args = "-x"
|
" let g:syntastic_sh_shellcheck_args = "-x"
|
||||||
|
|
||||||
" let g:syntastic_mode_map = {
|
let g:syntastic_mode_map = {
|
||||||
" \ "mode": "active",
|
\ "mode": "passive",
|
||||||
" \ "active_filetypes": [],
|
\ "active_filetypes": [ "bash" ],
|
||||||
" \ "passive_filetypes": ["sh, yaml"] }
|
\ "passive_filetypes": ["sh, yaml"] }
|
||||||
|
|
||||||
set modeline
|
set modeline
|
||||||
set modelines=5
|
set modelines=5
|
||||||
@@ -108,14 +108,20 @@ endif
|
|||||||
" solarized config
|
" solarized config
|
||||||
set termguicolors
|
set termguicolors
|
||||||
set background=dark " or light
|
set background=dark " or light
|
||||||
|
|
||||||
" colorscheme solarized
|
" colorscheme solarized
|
||||||
|
colorscheme darcula
|
||||||
|
|
||||||
" Check if the color scheme file is available before applying it
|
" Check if the color scheme file is available before applying it
|
||||||
if exists("g:plugs['darcula']") && filereadable(expand("~/.vim/plugged/darcula/colors/darcula.vim"))
|
if exists("g:plugs['darcula']") && filereadable(expand("~/.vim/plugged/darcula/colors/darcula.vim"))
|
||||||
colorscheme darcula
|
colorscheme darcula
|
||||||
endif
|
endif
|
||||||
|
|
||||||
hi Visual term=reverse cterm=reverse guibg=Grey
|
hi Visual term=reverse cterm=reverse guibg=Grey
|
||||||
|
|
||||||
|
" open unfolded
|
||||||
|
set foldlevel=99
|
||||||
|
|
||||||
|
|
||||||
" copilot config
|
" copilot config
|
||||||
imap <silent> <C-j> <Plug>(copilot-next)
|
imap <silent> <C-j> <Plug>(copilot-next)
|
||||||
|
|||||||
29
.zshenv
29
.zshenv
@@ -2,10 +2,11 @@ set -o vi
|
|||||||
|
|
||||||
export LC_ALL=en_US.UTF-8
|
export LC_ALL=en_US.UTF-8
|
||||||
|
|
||||||
export PATH=/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/jetpac/work/flutter/bin:$HOME/.rd/bin:$HOME/bin:PATH
|
export PATH=/Users/jetpac/.asdf/shims/:/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Users/jetpac/work/flutter/bin:$HOME/.rd/bin:$HOME/bin:$PATH:
|
||||||
|
|
||||||
|
|
||||||
alias oe='open /Applications/Emacs.app'
|
alias oe='open /Applications/Emacs.app'
|
||||||
|
alias mc='/opt/homebrew/bin/mc --nosubshell'
|
||||||
alias config='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME'
|
alias config='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME'
|
||||||
alias -g N="2>&1 "
|
alias -g N="2>&1 "
|
||||||
alias pig='ping'
|
alias pig='ping'
|
||||||
@@ -68,4 +69,28 @@ export seznam6='2a02:598:2::1222'
|
|||||||
export OPENAI_API_KEY='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'
|
export OPENAI_API_KEY='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'
|
||||||
|
|
||||||
# for flutter
|
# for flutter
|
||||||
export PATH=$PATH:/Users/jetpac/Documents/flutter-dev-env/bin
|
# export PATH=$PATH:/Users/jetpac/Documents/flutter-dev-env/bin
|
||||||
|
export NVM_DIR="$HOME/.nvm"
|
||||||
|
# nvm initialization is commented out; it significantly slows down shell startup
|
||||||
|
# [ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh"
|
||||||
|
#
|
||||||
|
|
||||||
|
ZSH_AUTOSUGGEST_ACCEPT_WIDGETS='vi-forward-char'
|
||||||
|
#ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS='end-of-line'
|
||||||
|
#
|
||||||
|
# alias km='kubectl --kubeconfig /Users/jetpac/.kube.lenovo/config'
|
||||||
|
|
||||||
|
|
||||||
|
alias nextcloud-shell='k exec -n nextcloud deployments/nextcloud -c nextcloud -it -- runuser --user www-data bash'
|
||||||
|
alias nextcloud-shell-root='k exec -n nextcloud deployments/nextcloud -c nextcloud -it -- bash'
|
||||||
|
alias occ='k exec -n nextcloud deployments/nextcloud -c nextcloud -it -- runuser --user www-data /var/www/html/occ'
|
||||||
|
|
||||||
|
alias speech_to_text="$HOME/Downloads/whisper-cpp/convert_video_to_txt.sh"
|
||||||
|
|
||||||
|
|
||||||
|
if [ -f "/Users/jetpac/.local/bin/k9s" ]; then
|
||||||
|
alias k9s='/Users/jetpac/.local/bin/k9s --logoless'
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
63
.zshrc
63
.zshrc
@@ -9,6 +9,30 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
|
|||||||
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# if not present, install zsh-syntax-highlighting plugin
|
||||||
|
if [ ! -d "${HOME}/.oh-my-zsh/custom/plugins/zsh-syntax-highlighting" ];
|
||||||
|
then
|
||||||
|
cd "${HOME}/.oh-my-zsh/custom/plugins/"
|
||||||
|
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git &> /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
|
# if not present, install zsh-completions plugin
|
||||||
|
if [ ! -d "${HOME}/.oh-my-zsh/custom/plugins/zsh-completions" ];
|
||||||
|
then
|
||||||
|
cd "${HOME}/.oh-my-zsh/custom/plugins/"
|
||||||
|
git clone https://github.com/zsh-users/zsh-completions.git &> /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
|
# if not present, install zsh-autosuggestions plugin
|
||||||
|
if [ ! -d "${HOME}/.oh-my-zsh/custom/plugins/zsh-autosuggestions" ];
|
||||||
|
then
|
||||||
|
cd "${HOME}/.oh-my-zsh/custom/plugins/"
|
||||||
|
git clone https://github.com/zsh-users/zsh-autosuggestions.git &> /dev/null
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# doesn't work well on remote hosts
|
# doesn't work well on remote hosts
|
||||||
# [[ -f .iterm2_shell_integration.zsh ]] && source .iterm2_shell_integration.zsh
|
# [[ -f .iterm2_shell_integration.zsh ]] && source .iterm2_shell_integration.zsh
|
||||||
|
|
||||||
@@ -53,7 +77,7 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
|
|||||||
# DISABLE_LS_COLORS="true"
|
# DISABLE_LS_COLORS="true"
|
||||||
|
|
||||||
# Uncomment the following line to disable auto-setting terminal title.
|
# Uncomment the following line to disable auto-setting terminal title.
|
||||||
# DISABLE_AUTO_TITLE="true"
|
DISABLE_AUTO_TITLE="true"
|
||||||
|
|
||||||
# Uncomment the following line to enable command auto-correction.
|
# Uncomment the following line to enable command auto-correction.
|
||||||
# ENABLE_CORRECTION="true"
|
# ENABLE_CORRECTION="true"
|
||||||
@@ -62,7 +86,7 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
|
|||||||
# You can also set it to another string to have that shown instead of the default red dots.
|
# You can also set it to another string to have that shown instead of the default red dots.
|
||||||
# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
|
# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
|
||||||
# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
|
# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
|
||||||
# COMPLETION_WAITING_DOTS="true"
|
COMPLETION_WAITING_DOTS="true"
|
||||||
|
|
||||||
# Uncomment the following line if you want to disable marking untracked files
|
# Uncomment the following line if you want to disable marking untracked files
|
||||||
# under VCS as dirty. This makes repository status check for large repositories
|
# under VCS as dirty. This makes repository status check for large repositories
|
||||||
@@ -80,12 +104,19 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
|
|||||||
# Would you like to use another custom folder than $ZSH/custom?
|
# Would you like to use another custom folder than $ZSH/custom?
|
||||||
# ZSH_CUSTOM=/path/to/new-custom-folder
|
# ZSH_CUSTOM=/path/to/new-custom-folder
|
||||||
|
|
||||||
|
# if [ -f ". /opt/homebrew/opt/asdf/libexec/asdf.sh" ]; then
|
||||||
|
# source /opt/homebrew/opt/asdf/libexec/asdf.sh
|
||||||
|
# fi
|
||||||
|
|
||||||
# Which plugins would you like to load?
|
# Which plugins would you like to load?
|
||||||
# Standard plugins can be found in $ZSH/plugins/
|
# Standard plugins can be found in $ZSH/plugins/
|
||||||
# Custom plugins may be added to $ZSH_CUSTOM/plugins/
|
# Custom plugins may be added to $ZSH_CUSTOM/plugins/
|
||||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||||
# Add wisely, as too many plugins slow down shell startup.
|
# Add wisely, as too many plugins slow down shell startup.
|
||||||
plugins=(git rsync colorize colored-man-pages vi-mode common-aliases macos themes dircycle iterm2 docker docker-compose zsh-navigation-tools urltools history mercurial tmux kubectl helm)
|
plugins=(git rsync colorize colored-man-pages vi-mode common-aliases macos themes dircycle iterm2 docker docker-compose zsh-navigation-tools urltools history mercurial tmux zsh-syntax-highlighting zsh-autosuggestions kubectl helm terraform asdf brew web-search kubectl helm)
|
||||||
|
|
||||||
|
# consider plugin fzf - only available for Mac/Linux
|
||||||
|
|
||||||
# colorize - adds ccat and cless
|
# colorize - adds ccat and cless
|
||||||
# common-aliases: https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/common-aliases
|
# common-aliases: https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/common-aliases
|
||||||
# themes: https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/themes
|
# themes: https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/themes
|
||||||
@@ -164,14 +195,27 @@ fi
|
|||||||
# zsh history is too short
|
# zsh history is too short
|
||||||
# - https://unix.stackexchange.com/questions/273861/unlimited-history-in-zsh
|
# - https://unix.stackexchange.com/questions/273861/unlimited-history-in-zsh
|
||||||
|
|
||||||
HISTFILE=~/.zsh_history
|
|
||||||
|
# inspiration taken from yt video:
|
||||||
|
# https://youtu.be/ud7YxC33Z3w
|
||||||
HISTSIZE=999999999
|
HISTSIZE=999999999
|
||||||
|
HISTFILE=~/.zsh_history
|
||||||
SAVEHIST=$HISTSIZE
|
SAVEHIST=$HISTSIZE
|
||||||
|
HISTDUP=erase
|
||||||
|
setopt appendhistory
|
||||||
|
setopt sharehistory
|
||||||
|
setopt hist_ignore_space
|
||||||
|
setopt hist_ignore_all_dups
|
||||||
|
setopt hist_save_no_dups
|
||||||
|
setopt hist_ignore_dups
|
||||||
|
setopt hist_find_no_dups
|
||||||
|
setopt hist_reduce_blanks
|
||||||
|
bindkey '^p' history-search-backward
|
||||||
|
bindkey '^n' history-search-forward
|
||||||
|
# bindkey '^f' autosuggest-accept
|
||||||
|
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=10"
|
||||||
|
|
||||||
|
|
||||||
### MANAGED BY RANCHER DESKTOP START (DO NOT EDIT)
|
|
||||||
export PATH="/Users/jetpac/.rd/bin:$PATH"
|
|
||||||
### MANAGED BY RANCHER DESKTOP END (DO NOT EDIT)
|
|
||||||
|
|
||||||
# >>> conda initialize >>>
|
# >>> conda initialize >>>
|
||||||
# !! Contents within this block are managed by 'conda init' !!
|
# !! Contents within this block are managed by 'conda init' !!
|
||||||
@@ -188,11 +232,12 @@ fi
|
|||||||
unset __conda_setup
|
unset __conda_setup
|
||||||
# <<< conda initialize <<<
|
# <<< conda initialize <<<
|
||||||
|
|
||||||
export PATH="/opt/homebrew/bin:$PATH"
|
# export PATH="/opt/homebrew/bin:$PATH"
|
||||||
|
|
||||||
# for cocoapods
|
# for cocoapods
|
||||||
export PATH=/opt/homebrew/opt/ruby/bin:$PATH
|
export PATH=/opt/homebrew/opt/ruby/bin:$PATH
|
||||||
export GEM_HOME=$HOME/.gem
|
export GEM_HOME=$HOME/.gem
|
||||||
export PATH=$GEM_HOME/bin:$HOME/.gem/ruby/3.3.0/bin:$PATH
|
export PATH=$GEM_HOME/bin:$HOME/.gem/ruby/3.3.0/bin:$PATH
|
||||||
|
|
||||||
|
# Generated for envman. Do not edit.
|
||||||
|
# [ -s "$HOME/.config/envman/load.sh" ] && source "$HOME/.config/envman/load.sh"
|
||||||
|
|||||||
@@ -24,7 +24,9 @@ SLACK_CHANNEL='@pnyc'
|
|||||||
DIR=$(pwd)
|
DIR=$(pwd)
|
||||||
|
|
||||||
REPO=${PARENT_WS##*/} # userland11.4
|
REPO=${PARENT_WS##*/} # userland11.4
|
||||||
SCRIPT_DIR_BASE=${PARENT_WS#*oracle.com/} # /workspace/pnyc/solaris-reviews/secure-integrate/userland11.4
|
|
||||||
|
# /workspace/pnyc/solaris-reviews/secure-integrate/userland11.4
|
||||||
|
SCRIPT_DIR_BASE=$(echo "$PARENT_WS" | awk '{sub(/^.*\/\//,"/"); print}')
|
||||||
MV=/bin/mv
|
MV=/bin/mv
|
||||||
RM=/bin/rm
|
RM=/bin/rm
|
||||||
CP=/bin/cp
|
CP=/bin/cp
|
||||||
|
|||||||
5
bin/deansi
Executable file
5
bin/deansi
Executable file
@@ -0,0 +1,5 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Remove ANSI escape sequences and ^M carriage return characters
|
||||||
|
|
||||||
|
perl -pe 's/\e\[[0-9;]*[mGKHF]//g; s/\r//g'
|
||||||
|
|
||||||
41
bin/lib/logging.sh
Normal file
41
bin/lib/logging.sh
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# exec &> >(tee -a "${SYSLOG}")
|
||||||
|
# exec &> >(tee -a "${APPLOG}")
|
||||||
|
|
||||||
|
trap 'exit 1' HUP INT QUIT TERM
|
||||||
|
|
||||||
|
log::prefix() {
|
||||||
|
date=$(gdate '+%Y-%m-%d %H:%M:%S,%3N')
|
||||||
|
printf '%s %s\n' "${date}" "${*}"
|
||||||
|
}
|
||||||
|
|
||||||
|
log::notice() {
|
||||||
|
log::info "==> ${*}"
|
||||||
|
}
|
||||||
|
|
||||||
|
log::info() {
|
||||||
|
log::prefix "INFO ${*}"
|
||||||
|
}
|
||||||
|
|
||||||
|
log::debug() {
|
||||||
|
log::prefix "DEBUG ${*}"
|
||||||
|
}
|
||||||
|
|
||||||
|
log::warning() {
|
||||||
|
log::prefix "WARNING ${*}"
|
||||||
|
}
|
||||||
|
|
||||||
|
log::error() {
|
||||||
|
log::prefix "ERROR ${*}" >&2
|
||||||
|
}
|
||||||
|
|
||||||
|
log::fatal() {
|
||||||
|
reason='Unknown or not specified'
|
||||||
|
if [ "$1" ]; then
|
||||||
|
reason=$1
|
||||||
|
fi
|
||||||
|
log::error "Fatal error. Reason: ${reason}"
|
||||||
|
kill -s TERM $$
|
||||||
|
}
|
||||||
|
|
||||||
41
bin/ul11u4_build.sh
Executable file
41
bin/ul11u4_build.sh
Executable file
@@ -0,0 +1,41 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
source lib/logging.sh
|
||||||
|
|
||||||
|
TARGET=$1
|
||||||
|
|
||||||
|
|
||||||
|
if [ -z "$TARGET" ];
|
||||||
|
then
|
||||||
|
log::fatal "No target specified on command line"
|
||||||
|
fi
|
||||||
|
|
||||||
|
log::info"Starting build for for Ul11u4SRU"
|
||||||
|
log::info "Target: \"${TARGET}\""
|
||||||
|
|
||||||
|
JENKINS_TOKEN='1154eb0158729a7d326c1db13e7dca0cea'
|
||||||
|
JENKINS_SERVER='http://mrshughes.us.oracle.com/jenkins/'
|
||||||
|
|
||||||
|
JOB_URL="${JENKINS_SERVER}/job/Solaris_11/job/11.4/job/userland-sru/job/userland-sru-build-11.4/buildWithParameters"
|
||||||
|
|
||||||
|
log::info "Using '${JOB_URL}'"
|
||||||
|
|
||||||
|
set -x
|
||||||
|
curl -X POST "${JOB_URL}" \
|
||||||
|
--user "pnyc:${JENKINS_TOKEN}" \
|
||||||
|
--data-urlencode "Build_Label=${TARGET}" \
|
||||||
|
--data-urlencode "hguser=petr.nyc@oracle.com" \
|
||||||
|
--data-urlencode "dryrun=false" \
|
||||||
|
--data-urlencode "verbose=true" \
|
||||||
|
--data-urlencode "debug=true" \
|
||||||
|
--data-urlencode "scriptdir=./solaris/userland/sru/" \
|
||||||
|
--data-urlencode "do_check_sru_cbe=true" \
|
||||||
|
--data-urlencode "prepare_work_area=true" \
|
||||||
|
--data-urlencode "do_build=true" \
|
||||||
|
--data-urlencode "prepare_delivery=true" \
|
||||||
|
--data-urlencode "create_escrow=true" \
|
||||||
|
--data-urlencode "create_foss=true" \
|
||||||
|
--data-urlencode "delivery=true"
|
||||||
|
|
||||||
|
log::info "The job will be started here:"
|
||||||
|
log::info " ${JOB_URL%%buildWith*}"
|
||||||
41
bin/ul11u4_gate_open.sh
Executable file
41
bin/ul11u4_gate_open.sh
Executable file
@@ -0,0 +1,41 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# shellcheck disable=SC1091,SC2015
|
||||||
|
|
||||||
|
[[ "$0" == /* ]] && typeset -r PRG=$0 || typeset -r PRG=$PWD/$0
|
||||||
|
|
||||||
|
BINDIR=$(dirname "$PRG")
|
||||||
|
typeset -r BINDIR
|
||||||
|
|
||||||
|
source "${BINDIR}/lib/logging.sh"
|
||||||
|
|
||||||
|
TARGET=$1
|
||||||
|
|
||||||
|
|
||||||
|
if [ -z "$TARGET" ];
|
||||||
|
then
|
||||||
|
log::fatal "No target specified on command line"
|
||||||
|
fi
|
||||||
|
|
||||||
|
log::debug "Starting gate open for Ul11u4SRU"
|
||||||
|
log::debug "Target: \"${TARGET}\""
|
||||||
|
|
||||||
|
JENKINS_TOKEN='1154eb0158729a7d326c1db13e7dca0cea'
|
||||||
|
JENKINS_SERVER='http://mrshughes.us.oracle.com/jenkins/'
|
||||||
|
|
||||||
|
JOB_URL="${JENKINS_SERVER}/job/Solaris_11/job/11.4/job/userland-sru/job/userland-sru-gate-open-11.4/buildWithParameters"
|
||||||
|
|
||||||
|
log::info "Using '${JOB_URL}'"
|
||||||
|
|
||||||
|
curl -X POST "${JOB_URL}" \
|
||||||
|
--user "pnyc:${JENKINS_TOKEN}" \
|
||||||
|
--data-urlencode "Build_Label=${TARGET}" \
|
||||||
|
--data-urlencode "hguser=petr.nyc@oracle.com" \
|
||||||
|
--data-urlencode "dryrun=false" \
|
||||||
|
--data-urlencode "verbose=true" \
|
||||||
|
--data-urlencode "debug=true" \
|
||||||
|
--data-urlencode "scriptdir=./solaris/userland/sru/" \
|
||||||
|
--data-urlencode "do_gate_open=true"
|
||||||
|
|
||||||
|
log::info "The job will be started here:"
|
||||||
|
log::info " ${JOB_URL%%buildWith*}"
|
||||||
Reference in New Issue
Block a user