diff --git a/Makefile b/Makefile index 7c69d53..3005dab 100644 --- a/Makefile +++ b/Makefile @@ -1,44 +1,16 @@ pwd = $(shell pwd) -osver=$(shell lsb_release -sr) -oscodename=$(shell lsb_release -sc) -arch=$(shell dpkg --print-architecture) .PHONY: all -all: /usr/bin/docker /usr/bin/go /usr/bin/nvim dotfiles golibs - -# Docker install -.PHONY: /usr/bin/docker -/usr/bin/docker: - - sudo apt-get install ca-certificates curl - sudo install -m 0755 -d /etc/apt/keyrings - sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc - sudo chmod a+r /etc/apt/keyrings/docker.asc - - echo "deb [arch=$(arch) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(oscodename) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - sudo apt update - sudo apt install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin - -# Go install -.PHONY: /usr/bin/go -/usr/bin/go: - sudo add-apt-repository ppa:longsleep/golang-backports - sudo apt install golang-go +all: /usr/bin/nvim dotfiles golibs .PHONY: golibs -golibs: /usr/bin/go +golibs: go install github.com/goreleaser/goreleaser@latest go install github.com/mkchoi212/fac@latest -# Neovim -.PHONY: /usr/bin/nvim -/usr/bin/nvim: - sudo add-apt-repository -r ppa:neovim-ppa/stable - sudo apt install neovim - # dotfiles .PHONY: dotfiles -dotfiles: ~/.gitconfig ~/.gitignore ~/.config/zsh ~/.config/nvim ~/.zshrc +dotfiles: ~/.gitconfig ~/.gitignore ~/.config/zsh ~/.config/nvim ~/.zshrc ~/.config/kitty ~/.gitconfig: @ln -s $(pwd)/git/config ~/.gitconfig || true @@ -50,3 +22,6 @@ dotfiles: ~/.gitconfig ~/.gitignore ~/.config/zsh ~/.config/nvim ~/.zshrc @ln -s $(pwd)/zsh ~/.config/zsh || true ~/.zshrc: @ln -s $(pwd)/zsh/zshrc ~/.zshrc || true +~/.config/kitty: + @ln -s $(pwd)/kitty ~/.config/kitty || true + diff --git a/kitty/kitty.conf b/kitty/kitty.conf new file mode 100644 index 0000000..bca3b19 --- /dev/null +++ b/kitty/kitty.conf @@ -0,0 +1,325 @@ +# vim:fileencoding=utf-8:foldmethod=marker +font_family "FiraCode Nerd Font Mono" +# bold_font auto +# italic_font auto +# bold_italic_font auto +font_size 12.0 +# force_ltr no +# symbol_map +# narrow_symbols +# disable_ligatures never +# font_features +# modify_font +# box_drawing_scale 0.001, 1, 1.5, 2 +# undercurl_style thin-sparse +# text_composition_strategy platform +# text_fg_override_threshold 0 +cursor #cccccc +# cursor_text_color #111111 +# cursor_shape block +# cursor_beam_thickness 1.5 +# cursor_underline_thickness 2.0 +# cursor_blink_interval -1 +# cursor_stop_blinking_after 15.0 +scrollback_lines -1 +# scrollback_pager less --chop-long-lines --RAW-CONTROL-CHARS +INPUT_LINE_NUMBER +# scrollback_pager_history_size 0 +# scrollback_fill_enlarged_window no +# wheel_scroll_multiplier 5.0 +# wheel_scroll_min_lines 1 +# touch_scroll_multiplier 1.0 +# mouse_hide_wait 3.0 +# url_color #0087bd +# url_style curly +# open_url_with default +# url_prefixes file ftp ftps gemini git gopher http https irc ircs kitty mailto news sftp ssh +# detect_urls yes +# url_excluded_characters +# show_hyperlink_targets no +# underline_hyperlinks hover +# copy_on_select no +# paste_actions quote-urls-at-prompt,confirm +# strip_trailing_spaces never +# select_by_word_characters @-./_~?&=%+# +# select_by_word_characters_forward +# click_interval -1.0 +# focus_follows_mouse no +# pointer_shape_when_grabbed arrow +# default_pointer_shape beam +# pointer_shape_when_dragging beam +# clear_all_mouse_actions no +# mouse_map left click ungrabbed mouse_handle_click selection link prompt +# mouse_map shift+left click grabbed,ungrabbed mouse_handle_click selection link prompt +# mouse_map ctrl+shift+left release grabbed,ungrabbed mouse_handle_click link +# mouse_map ctrl+shift+left press grabbed discard_event +# mouse_map middle release ungrabbed paste_from_selection +# mouse_map left press ungrabbed mouse_selection normal +# mouse_map ctrl+alt+left press ungrabbed mouse_selection rectangle +# mouse_map left doublepress ungrabbed mouse_selection word +# mouse_map left triplepress ungrabbed mouse_selection line +# mouse_map ctrl+alt+left triplepress ungrabbed mouse_selection line_from_point +# mouse_map right press ungrabbed mouse_selection extend +# mouse_map shift+middle release ungrabbed,grabbed paste_selection +# mouse_map shift+middle press grabbed discard_event +# mouse_map shift+left press ungrabbed,grabbed mouse_selection normal +# mouse_map ctrl+shift+alt+left press ungrabbed,grabbed mouse_selection rectangle +# mouse_map shift+left doublepress ungrabbed,grabbed mouse_selection word +# mouse_map shift+left triplepress ungrabbed,grabbed mouse_selection line +# mouse_map ctrl+shift+alt+left triplepress ungrabbed,grabbed mouse_selection line_from_point +# mouse_map shift+right press ungrabbed,grabbed mouse_selection extend +# mouse_map ctrl+shift+right press ungrabbed mouse_show_command_output +# repaint_delay 10 +# input_delay 3 +# sync_to_monitor yes +# enable_audio_bell yes +# visual_bell_duration 0.0 +# visual_bell_color none +# window_alert_on_bell yes +# bell_on_tab "🔔 " +# command_on_bell none +# bell_path none +# linux_bell_theme __custom +# remember_window_size yes +# initial_window_width 640 +# initial_window_height 400 +# enabled_layouts * +# window_resize_step_cells 2 +# window_resize_step_lines 2 +# window_border_width 0.5pt +# draw_minimal_borders yes +# window_margin_width 0 +# single_window_margin_width -1 +# window_padding_width 0 +# single_window_padding_width -1 +# placement_strategy center +# active_border_color #00ff00 +# inactive_border_color #cccccc +# bell_border_color #ff5a00 +# inactive_text_alpha 1.0 +# hide_window_decorations no +# window_logo_path none +# window_logo_position bottom-right +# window_logo_alpha 0.5 +# resize_debounce_time 0.1 0.5 +# resize_in_steps no +# visual_window_select_characters 1234567890ABCDEFGHIJKLMNOPQRSTUVWXYZ +# confirm_os_window_close -1 +# tab_bar_edge bottom +# tab_bar_margin_width 0.0 +# tab_bar_margin_height 0.0 0.0 +tab_bar_style separator +# tab_bar_align left +# tab_bar_min_tabs 2 +# tab_switch_strategy previous +# tab_fade 0.25 0.5 0.75 1 +tab_separator " | " +# tab_powerline_style angled +# tab_activity_symbol none +# tab_title_max_length 0 +# tab_title_template "{fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{title}" +# active_tab_title_template none +# active_tab_foreground #000 +# active_tab_background #eee +# active_tab_font_style bold-italic +# inactive_tab_foreground #444 +# inactive_tab_background #999 +# inactive_tab_font_style normal +# tab_bar_background none +# tab_bar_margin_color none +foreground #dddddd +background #000000 +background_opacity 0.9 +background_blur 1 +# background_image none +# background_image_layout tiled +# background_image_linear no +# dynamic_background_opacity no +# background_tint 0.0 +# background_tint_gaps 1.0 +# dim_opacity 0.4 +# selection_foreground #000000 +# selection_background #fffacd +# color0 #000000 +# color8 #767676 +# color1 #cc0403 +# color9 #f2201f +# color2 #19cb00 +# color10 #23fd00 +# color3 #cecb00 +# color11 #fffd00 +# color4 #0d73cc +# color12 #1a8fff +# color5 #cb1ed1 +# color13 #fd28ff +# color6 #0dcdcd +# color14 #14ffff +# color7 #dddddd +# color15 #ffffff +# mark1_foreground black +# mark1_background #98d3cb +# mark2_foreground black +# mark2_background #f2dcd3 +# mark3_foreground black +# mark3_background #f274bc +# shell . +# editor . +# close_on_child_death no +# remote_control_password +# allow_remote_control no +# listen_on none +# env +# watcher +# exe_search_path +# update_check_interval 24 +# startup_session none +# clipboard_control write-clipboard write-primary read-clipboard-ask read-primary-ask +# clipboard_max_size 512 +# file_transfer_confirmation_bypass +# allow_hyperlinks yes +# shell_integration enabled +# allow_cloning ask +# clone_source_strategies venv,conda,env_var,path +# notify_on_cmd_finish never +# term xterm-kitty +# forward_stdio no +# menu_map +# wayland_titlebar_color system +# macos_titlebar_color system +# macos_option_as_alt no +# macos_hide_from_tasks no +# macos_quit_when_last_window_closed no +# macos_window_resizable yes +# macos_thicken_font 0 +# macos_traditional_fullscreen no +# macos_show_window_title_in all +# macos_menubar_title_max_length 0 +# macos_custom_beam_cursor no +# macos_colorspace srgb +# linux_display_server auto +# kitty_mod ctrl+shift +# clear_all_shortcuts no +# action_alias +# kitten_alias +# map kitty_mod+c copy_to_clipboard +# map cmd+c copy_to_clipboard +# map kitty_mod+v paste_from_clipboard +# map cmd+v paste_from_clipboard +# map kitty_mod+s paste_from_selection +# map shift+insert paste_from_selection +# map kitty_mod+o pass_selection_to_program +# map kitty_mod+up scroll_line_up +# map kitty_mod+k scroll_line_up +# map opt+cmd+page_up scroll_line_up +# map cmd+up scroll_line_up +# map kitty_mod+down scroll_line_down +# map kitty_mod+j scroll_line_down +# map opt+cmd+page_down scroll_line_down +# map cmd+down scroll_line_down +# map kitty_mod+page_up scroll_page_up +# map cmd+page_up scroll_page_up +# map kitty_mod+page_down scroll_page_down +# map cmd+page_down scroll_page_down +# map kitty_mod+home scroll_home +# map cmd+home scroll_home +# map kitty_mod+end scroll_end +# map cmd+end scroll_end +# map kitty_mod+z scroll_to_prompt -1 +# map kitty_mod+x scroll_to_prompt 1 +# map kitty_mod+h show_scrollback +# map kitty_mod+g show_last_command_output +# map kitty_mod+enter new_window +# map cmd+enter new_window +# map kitty_mod+n new_os_window +# map cmd+n new_os_window +# map kitty_mod+w close_window +# map shift+cmd+d close_window +# map kitty_mod+] next_window +# map kitty_mod+[ previous_window +# map kitty_mod+f move_window_forward +# map kitty_mod+b move_window_backward +# map kitty_mod+` move_window_to_top +# map kitty_mod+r start_resizing_window +# map cmd+r start_resizing_window +# map kitty_mod+1 first_window +# map cmd+1 first_window +# map kitty_mod+2 second_window +# map cmd+2 second_window +# map kitty_mod+3 third_window +# map cmd+3 third_window +# map kitty_mod+4 fourth_window +# map cmd+4 fourth_window +# map kitty_mod+5 fifth_window +# map cmd+5 fifth_window +# map kitty_mod+6 sixth_window +# map cmd+6 sixth_window +# map kitty_mod+7 seventh_window +# map cmd+7 seventh_window +# map kitty_mod+8 eighth_window +# map cmd+8 eighth_window +# map kitty_mod+9 ninth_window +# map cmd+9 ninth_window +# map kitty_mod+0 tenth_window +# map kitty_mod+f7 focus_visible_window +# map kitty_mod+f8 swap_with_window +# map kitty_mod+right next_tab +# map shift+cmd+] next_tab +# map ctrl+tab next_tab +# map kitty_mod+left previous_tab +# map shift+cmd+[ previous_tab +# map ctrl+shift+tab previous_tab +# map kitty_mod+t new_tab +# map cmd+t new_tab +# map kitty_mod+q close_tab +# map cmd+w close_tab +# map shift+cmd+w close_os_window +# map kitty_mod+. move_tab_forward +# map kitty_mod+, move_tab_backward +# map kitty_mod+alt+t set_tab_title +# map shift+cmd+i set_tab_title +# map kitty_mod+l next_layout +# map kitty_mod+equal change_font_size all +2.0 +# map kitty_mod+plus change_font_size all +2.0 +# map kitty_mod+kp_add change_font_size all +2.0 +# map cmd+plus change_font_size all +2.0 +# map cmd+equal change_font_size all +2.0 +# map shift+cmd+equal change_font_size all +2.0 +# map kitty_mod+minus change_font_size all -2.0 +# map kitty_mod+kp_subtract change_font_size all -2.0 +# map cmd+minus change_font_size all -2.0 +# map shift+cmd+minus change_font_size all -2.0 +# map kitty_mod+backspace change_font_size all 0 +# map cmd+0 change_font_size all 0 +# map kitty_mod+e open_url_with_hints +# map kitty_mod+p>f kitten hints --type path --program - +# map kitty_mod+p>shift+f kitten hints --type path +# map kitty_mod+p>l kitten hints --type line --program - +# map kitty_mod+p>w kitten hints --type word --program - +# map kitty_mod+p>h kitten hints --type hash --program - +# map kitty_mod+p>n kitten hints --type linenum +# map kitty_mod+p>y kitten hints --type hyperlink +# map kitty_mod+f1 show_kitty_doc overview +# map kitty_mod+f11 toggle_fullscreen +# map ctrl+cmd+f toggle_fullscreen +# map kitty_mod+f10 toggle_maximized +# map opt+cmd+s toggle_macos_secure_keyboard_entry +# map kitty_mod+u kitten unicode_input +# map ctrl+cmd+space kitten unicode_input +# map kitty_mod+f2 edit_config_file +# map cmd+, edit_config_file +# map kitty_mod+escape kitty_shell window +# map kitty_mod+a>m set_background_opacity +0.1 +# map kitty_mod+a>l set_background_opacity -0.1 +# map kitty_mod+a>1 set_background_opacity 1 +# map kitty_mod+a>d set_background_opacity default +# map kitty_mod+delete clear_terminal reset active +# map opt+cmd+r clear_terminal reset active +# map cmd+k clear_terminal to_cursor active +# map kitty_mod+f5 load_config_file +# map ctrl+cmd+, load_config_file +# map kitty_mod+f6 debug_config +# map opt+cmd+, debug_config +# map shift+cmd+/ open_url https://sw.kovidgoyal.net/kitty/ +# map cmd+h hide_macos_app +# map opt+cmd+h hide_macos_other_apps +# map cmd+m minimize_macos_window +# map cmd+q quit diff --git a/zsh/zshrc b/zsh/zshrc index 1b93945..5cb8c9f 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -6,8 +6,11 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] fi # Exports -export PATH=$HOME/.local/bin:/usr/local/bin:$HOME/go/bin:$PATH -export EDITOR="nvim" +export PATH=$HOME/.local/bin:/usr/local/bin:$HOME/go/bin:$HOME/.emacs.d/bin:$PATH +export EDITOR="micro" + +#export SSH_AUTH_SOCK=$HOME/.ssh/ssh-agent.socket +#ssh-add -l >/dev/null || alias ssh='ssh-add -l >/dev/null || SSH_AUTH_SOCK=$HOME/.ssh/ssh-agent.socket ssh-add -s /usr/lib/x86_64-linux-gnu/libykcs11.so && unalias ssh; ssh' source ~/.config/zsh/antigen.zsh @@ -23,8 +26,10 @@ alias ls="ls -F" alias l="ls" alias ll="ls -AFhl" alias cp="cp -i" # Confirm before overwriting something -alias gitu='git add . && git commit && git push' +alias gitpush='git add . && git commit --amend --no-edit && git push -f' alias k='kubectl' +alias yu="ssh-add -e /usr/lib/x86_64-linux-gnu/libykcs11.so; ssh-add -s /usr/lib/x86_64-linux-gnu/libykcs11.so" +alias m='micro' [[ ! -f `which exa` ]] || alias ls="exa" && alias ll="exa -l" @@ -117,4 +122,3 @@ bindkey '^ ' autosuggest-accept source ~/.config/zsh/p10k.zsh source ~/.config/zsh/p10k/powerlevel10k.zsh-theme -