From fe391566e18cec2d2d69792fda91a4f6911aab41 Mon Sep 17 00:00:00 2001 From: Max Richter Date: Mon, 14 Mar 2022 19:21:46 +0100 Subject: [PATCH] feat: switch to kitty --- configs/.bashrc | 2 + configs/.tmux.conf | 5 + configs/.zshrc | 3 - configs/kitty/kitty.conf | 1317 ++++++++++++++++++++++++ configs/nvim/init.lua | 7 - configs/nvim/lua/autocommands.lua | 7 + configs/nvim/lua/formatter-conf.lua | 10 +- configs/nvim/lua/keymappings.lua | 2 +- configs/nvim/lua/lsp-conf.lua | 111 +- configs/nvim/lua/lspinstaller-conf.lua | 22 +- configs/nvim/lua/plugins.lua | 10 +- configs/sway/config | 134 +-- configs/sway/debug_window.sh | 33 + configs/sway/screenshot.sh | 0 configs/sway/toggle_bar.sh | 16 + configs/wofi/open-localhost | 9 + configs/wofi/wofi-emoji | 301 +++++- configs/wofi/wofi-emoji-new | 3 + configs/wofi/wofi-emoji-old-2 | 138 +++ configs/zsh/aliases.sh | 9 - configs/zsh/functions.zsh | 3 +- configs/zsh/functions/conf.zsh | 27 + configs/zsh/functions/mke.zsh | 4 - configs/zsh/functions/note.zsh | 15 + configs/zsh/functions/run.zsh | 8 +- 25 files changed, 2049 insertions(+), 147 deletions(-) create mode 100644 configs/kitty/kitty.conf create mode 100755 configs/sway/debug_window.sh delete mode 100644 configs/sway/screenshot.sh create mode 100755 configs/sway/toggle_bar.sh create mode 100755 configs/wofi/open-localhost create mode 100755 configs/wofi/wofi-emoji-new create mode 100755 configs/wofi/wofi-emoji-old-2 create mode 100644 configs/zsh/functions/conf.zsh delete mode 100644 configs/zsh/functions/mke.zsh create mode 100644 configs/zsh/functions/note.zsh diff --git a/configs/.bashrc b/configs/.bashrc index e59de29..b8218da 100644 --- a/configs/.bashrc +++ b/configs/.bashrc @@ -113,5 +113,7 @@ if ! shopt -oq posix; then fi +export MAX_TEST_VAR="working" + [ -z $DISPLAY ] && export DISPLAY=127.0.0.1:0.0 . "$HOME/.cargo/env" diff --git a/configs/.tmux.conf b/configs/.tmux.conf index 57d90a9..358ca3a 100644 --- a/configs/.tmux.conf +++ b/configs/.tmux.conf @@ -28,6 +28,11 @@ set -g mode-keys vi # Enable mouse mode (tmux 2.1 and above) set -g mouse on + +bind h select-pane -L +bind j select-pane -D +bind k select-pane -U +bind l select-pane -R # Customize status line # set-option -g status-style bg=default diff --git a/configs/.zshrc b/configs/.zshrc index 6b814eb..57266d1 100644 --- a/configs/.zshrc +++ b/configs/.zshrc @@ -76,9 +76,6 @@ fi # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh - - - # Auto connect to tmux session of ssh if [[ -n "$PS1" ]] && [[ -z "$TMUX" ]] && [[ -n "$SSH_CONNECTION" ]]; then tmux attach-session -t $USER || tmux new-session -s $USER diff --git a/configs/kitty/kitty.conf b/configs/kitty/kitty.conf new file mode 100644 index 0000000..bc9422c --- /dev/null +++ b/configs/kitty/kitty.conf @@ -0,0 +1,1317 @@ +# vim:fileencoding=utf-8:ft=conf:foldmethod=marker + +include ./theme.conf + +background #000000 + +#: Fonts {{{ + +#: kitty has very powerful font management. You can configure +#: individual font faces and even specify special fonts for particular +#: characters. + +font_family FiraCode Nerd Font Mono +# bold_font auto +# italic_font auto +# bold_italic_font auto +# + +#: You can specify different fonts for the bold/italic/bold-italic +#: variants. To get a full list of supported fonts use the `kitty +#: list-fonts` command. By default they are derived automatically, by +#: the OSes font system. Setting them manually is useful for font +#: families that have many weight variants like Book, Medium, Thick, +#: etc. For example:: + +#: font_family Operator Mono Book +#: bold_font Operator Mono Medium +#: italic_font Operator Mono Book Italic +#: bold_italic_font Operator Mono Medium Italic + +font_size 13.0 + +#: Font size (in pts) + +# force_ltr no + +#: kitty does not support BIDI (bidirectional text), however, for RTL +#: scripts, words are automatically displayed in RTL. That is to say, +#: in an RTL script, the words "HELLO WORLD" display in kitty as +#: "WORLD HELLO", and if you try to select a substring of an RTL- +#: shaped string, you will get the character that would be there had +#: the the string been LTR. For example, assuming the Hebrew word +#: ירושלים, selecting the character that on the screen appears to be ם +#: actually writes into the selection buffer the character י. + +#: kitty's default behavior is useful in conjunction with a filter to +#: reverse the word order, however, if you wish to manipulate RTL +#: glyphs, it can be very challenging to work with, so this option is +#: provided to turn it off. Furthermore, this option can be used with +#: the command line program GNU FriBidi +#: to get BIDI +#: support, because it will force kitty to always treat the text as +#: LTR, which FriBidi expects for terminals. + +# adjust_line_height 0 +# adjust_column_width 0 + +#: Change the size of each character cell kitty renders. You can use +#: either numbers, which are interpreted as pixels or percentages +#: (number followed by %), which are interpreted as percentages of the +#: unmodified values. You can use negative pixels or percentages less +#: than 100% to reduce sizes (but this might cause rendering +#: artifacts). + +# symbol_map U+E0A0-U+E0A3,U+E0C0-U+E0C7 PowerlineSymbols + +#: Map the specified unicode codepoints to a particular font. Useful +#: if you need special rendering for some symbols, such as for +#: Powerline. Avoids the need for patched fonts. Each unicode code +#: point is specified in the form U+. You +#: can specify multiple code points, separated by commas and ranges +#: separated by hyphens. symbol_map itself can be specified multiple +#: times. Syntax is:: + +#: symbol_map codepoints Font Family Name + +disable_ligatures never + +#: Choose how you want to handle multi-character ligatures. The +#: default is to always render them. You can tell kitty to not render +#: them when the cursor is over them by using cursor to make editing +#: easier, or have kitty never render them at all by using always, if +#: you don't like them. The ligature strategy can be set per-window +#: either using the kitty remote control facility or by defining +#: shortcuts for it in kitty.conf, for example:: + +#: map alt+1 disable_ligatures_in active always +#: map alt+2 disable_ligatures_in all never +#: map alt+3 disable_ligatures_in tab cursor + +#: Note that this refers to programming ligatures, typically +#: implemented using the calt OpenType feature. For disabling general +#: ligatures, use the font_features setting. + +# font_features none + +#: Choose exactly which OpenType features to enable or disable. This +#: is useful as some fonts might have features worthwhile in a +#: terminal. For example, Fira Code Retina includes a discretionary +#: feature, zero, which in that font changes the appearance of the +#: zero (0), to make it more easily distinguishable from Ø. Fira Code +#: Retina also includes other discretionary features known as +#: Stylistic Sets which have the tags ss01 through ss20. + +#: Note that this code is indexed by PostScript name, and not the font +#: family. This allows you to define very precise feature settings; +#: e.g. you can disable a feature in the italic font but not in the +#: regular font. + +#: On Linux, these are read from the FontConfig database first and +#: then this, setting is applied, so they can be configured in a +#: single, central place. + +#: To get the PostScript name for a font, use kitty + list-fonts +#: --psnames: + +#: .. code-block:: sh + +#: $ kitty + list-fonts --psnames | grep Fira +#: Fira Code +#: Fira Code Bold (FiraCode-Bold) +#: Fira Code Light (FiraCode-Light) +#: Fira Code Medium (FiraCode-Medium) +#: Fira Code Regular (FiraCode-Regular) +#: Fira Code Retina (FiraCode-Retina) + +#: The part in brackets is the PostScript name. + +#: Enable alternate zero and oldstyle numerals:: + +#: font_features FiraCode-Retina +zero +onum + +#: Enable only alternate zero:: + +#: font_features FiraCode-Retina +zero + +#: Disable the normal ligatures, but keep the calt feature which (in +#: this font) breaks up monotony:: + +#: font_features TT2020StyleB-Regular -liga +calt + +#: In conjunction with force_ltr, you may want to disable Arabic +#: shaping entirely, and only look at their isolated forms if they +#: show up in a document. You can do this with e.g.:: + +#: font_features UnifontMedium +isol -medi -fina -init + +# box_drawing_scale 0.001, 1, 1.5, 2 + +#: Change the sizes of the lines used for the box drawing unicode +#: characters These values are in pts. They will be scaled by the +#: monitor DPI to arrive at a pixel value. There must be four values +#: corresponding to thin, normal, thick, and very thick lines. + +#: }}} + +#: Cursor customization {{{ + +# cursor #cccccc + +#: Default cursor color + +# cursor_text_color #111111 + +#: Choose the color of text under the cursor. If you want it rendered +#: with the background color of the cell underneath instead, use the +#: special keyword: background + +# cursor_shape block + +#: The cursor shape can be one of (block, beam, underline) + +# cursor_beam_thickness 1.5 + +#: Defines the thickness of the beam cursor (in pts) + +# cursor_underline_thickness 2.0 + +#: Defines the thickness of the underline cursor (in pts) + +# cursor_blink_interval -1 + +#: The interval (in seconds) at which to blink the cursor. Set to zero +#: to disable blinking. Negative values mean use system default. Note +#: that numbers smaller than repaint_delay will be limited to +#: repaint_delay. + +# cursor_stop_blinking_after 15.0 + +#: Stop blinking cursor after the specified number of seconds of +#: keyboard inactivity. Set to zero to never stop blinking. + +#: }}} + +#: Scrollback {{{ + +# scrollback_lines 2000 + +#: Number of lines of history to keep in memory for scrolling back. +#: Memory is allocated on demand. Negative numbers are (effectively) +#: infinite scrollback. Note that using very large scrollback is not +#: recommended as it can slow down performance of the terminal and +#: also use large amounts of RAM. Instead, consider using +#: scrollback_pager_history_size. + +# scrollback_pager less --chop-long-lines --RAW-CONTROL-CHARS +INPUT_LINE_NUMBER + +#: Program with which to view scrollback in a new window. The +#: scrollback buffer is passed as STDIN to this program. If you change +#: it, make sure the program you use can handle ANSI escape sequences +#: for colors and text formatting. INPUT_LINE_NUMBER in the command +#: line above will be replaced by an integer representing which line +#: should be at the top of the screen. Similarly CURSOR_LINE and +#: CURSOR_COLUMN will be replaced by the current cursor position. + +# scrollback_pager_history_size 0 + +#: Separate scrollback history size, used only for browsing the +#: scrollback buffer (in MB). This separate buffer is not available +#: for interactive scrolling but will be piped to the pager program +#: when viewing scrollback buffer in a separate window. The current +#: implementation stores the data in UTF-8, so approximatively 10000 +#: lines per megabyte at 100 chars per line, for pure ASCII text, +#: unformatted text. A value of zero or less disables this feature. +#: The maximum allowed size is 4GB. + +# wheel_scroll_multiplier 5.0 + +#: Modify the amount scrolled by the mouse wheel. Note this is only +#: used for low precision scrolling devices, not for high precision +#: scrolling on platforms such as macOS and Wayland. Use negative +#: numbers to change scroll direction. + +# touch_scroll_multiplier 1.0 + +#: Modify the amount scrolled by a touchpad. Note this is only used +#: for high precision scrolling devices on platforms such as macOS and +#: Wayland. Use negative numbers to change scroll direction. + +#: }}} + +#: Mouse {{{ + +# mouse_hide_wait 3.0 + +#: Hide mouse cursor after the specified number of seconds of the +#: mouse not being used. Set to zero to disable mouse cursor hiding. +#: Set to a negative value to hide the mouse cursor immediately when +#: typing text. Disabled by default on macOS as getting it to work +#: robustly with the ever-changing sea of bugs that is Cocoa is too +#: much effort. + +# url_color #0087bd +# url_style curly + +#: The color and style for highlighting URLs on mouse-over. url_style +#: can be one of: none, single, double, curly + +# open_url_modifiers kitty_mod + +#: The modifier keys to press when clicking with the mouse on URLs to +#: open the URL + +# open_url_with default + +#: The program with which to open URLs that are clicked on. The +#: special value default means to use the operating system's default +#: URL handler. + +# url_prefixes http https file ftp + +#: The set of URL prefixes to look for when detecting a URL under the +#: mouse cursor. + +# detect_urls yes + +#: Detect URLs under the mouse. Detected URLs are highlighted with an +#: underline and the mouse cursor becomes a hand over them. Even if +#: this option is disabled, URLs are still clickable. + +# copy_on_select no + +#: Copy to clipboard or a private buffer on select. With this set to +#: clipboard, simply selecting text with the mouse will cause the text +#: to be copied to clipboard. Useful on platforms such as macOS that +#: do not have the concept of primary selections. You can instead +#: specify a name such as a1 to copy to a private kitty buffer +#: instead. Map a shortcut with the paste_from_buffer action to paste +#: from this private buffer. For example:: + +#: map cmd+shift+v paste_from_buffer a1 + +#: Note that copying to the clipboard is a security risk, as all +#: programs, including websites open in your browser can read the +#: contents of the system clipboard. + +# strip_trailing_spaces never + +#: Remove spaces at the end of lines when copying to clipboard. A +#: value of smart will do it when using normal selections, but not +#: rectangle selections. always will always do it. + +# rectangle_select_modifiers ctrl+alt + +#: The modifiers to use rectangular selection (i.e. to select text in +#: a rectangular block with the mouse) + +# terminal_select_modifiers shift + +#: The modifiers to override mouse selection even when a terminal +#: application has grabbed the mouse + +# select_by_word_characters @-./_~?&=%+# + +#: Characters considered part of a word when double clicking. In +#: addition to these characters any character that is marked as an +#: alphanumeric character in the unicode database will be matched. + +# click_interval -1.0 + +#: The interval between successive clicks to detect double/triple +#: clicks (in seconds). Negative numbers will use the system default +#: instead, if available, or fallback to 0.5. + +# focus_follows_mouse no + +#: Set the active window to the window under the mouse when moving the +#: mouse around + +# pointer_shape_when_grabbed arrow + +#: The shape of the mouse pointer when the program running in the +#: terminal grabs the mouse. Valid values are: arrow, beam and hand + +# default_pointer_shape beam + +#: The default shape of the mouse pointer. Valid values are: arrow, +#: beam and hand + +# pointer_shape_when_dragging beam + +#: The default shape of the mouse pointer when dragging across text. +#: Valid values are: arrow, beam and hand + +#: }}} + +#: Performance tuning {{{ + +# repaint_delay 10 + +#: Delay (in milliseconds) between screen updates. Decreasing it, +#: increases frames-per-second (FPS) at the cost of more CPU usage. +#: The default value yields ~100 FPS which is more than sufficient for +#: most uses. Note that to actually achieve 100 FPS you have to either +#: set sync_to_monitor to no or use a monitor with a high refresh +#: rate. Also, to minimize latency when there is pending input to be +#: processed, repaint_delay is ignored. + +# input_delay 3 + +#: Delay (in milliseconds) before input from the program running in +#: the terminal is processed. Note that decreasing it will increase +#: responsiveness, but also increase CPU usage and might cause flicker +#: in full screen programs that redraw the entire screen on each loop, +#: because kitty is so fast that partial screen updates will be drawn. + +# sync_to_monitor yes + +#: Sync screen updates to the refresh rate of the monitor. This +#: prevents tearing (https://en.wikipedia.org/wiki/Screen_tearing) +#: when scrolling. However, it limits the rendering speed to the +#: refresh rate of your monitor. With a very high speed mouse/high +#: keyboard repeat rate, you may notice some slight input latency. If +#: so, set this to no. + +#: }}} + +#: Terminal bell {{{ + +# enable_audio_bell yes + +#: Enable/disable the audio bell. Useful in environments that require +#: silence. + +# visual_bell_duration 0.0 + +#: Visual bell duration. Flash the screen when a bell occurs for the +#: specified number of seconds. Set to zero to disable. + +# window_alert_on_bell yes + +#: Request window attention on bell. Makes the dock icon bounce on +#: macOS or the taskbar flash on linux. + +# bell_on_tab yes + +#: Show a bell symbol on the tab if a bell occurs in one of the +#: windows in the tab and the window is not the currently focused +#: window + +# command_on_bell none + +#: Program to run when a bell occurs. + +#: }}} + +#: Window layout {{{ + +# remember_window_size yes +# initial_window_width 640 +# initial_window_height 400 + +#: If enabled, the window size will be remembered so that new +#: instances of kitty will have the same size as the previous +#: instance. If disabled, the window will initially have size +#: configured by initial_window_width/height, in pixels. You can use a +#: suffix of "c" on the width/height values to have them interpreted +#: as number of cells instead of pixels. + +# enabled_layouts * + +#: The enabled window layouts. A comma separated list of layout names. +#: The special value all means all layouts. The first listed layout +#: will be used as the startup layout. Default configuration is all +#: layouts in alphabetical order. For a list of available layouts, see +#: the https://sw.kovidgoyal.net/kitty/index.html#layouts. + +# window_resize_step_cells 2 +# window_resize_step_lines 2 + +#: The step size (in units of cell width/cell height) to use when +#: resizing windows. The cells value is used for horizontal resizing +#: and the lines value for vertical resizing. + +# window_border_width 0.5pt + +#: The width of window borders. Can be either in pixels (px) or pts +#: (pt). Values in pts will be rounded to the nearest number of pixels +#: based on screen resolution. If not specified the unit is assumed to +#: be pts. Note that borders are displayed only when more than one +#: window is visible. They are meant to separate multiple windows. + +draw_minimal_borders yes + +#: Draw only the minimum borders needed. This means that only the +#: minimum needed borders for inactive windows are drawn. That is only +#: the borders that separate the inactive window from a neighbor. Note +#: that setting a non-zero window margin overrides this and causes all +#: borders to be drawn. + +# window_margin_width 0 + +#: The window margin (in pts) (blank area outside the border). A +#: single value sets all four sides. Two values set the vertical and +#: horizontal sides. Three values set top, horizontal and bottom. Four +#: values set top, right, bottom and left. + +# single_window_margin_width -1 + +#: The window margin (in pts) to use when only a single window is +#: visible. Negative values will cause the value of +#: window_margin_width to be used instead. A single value sets all +#: four sides. Two values set the vertical and horizontal sides. Three +#: values set top, horizontal and bottom. Four values set top, right, +#: bottom and left. + +window_padding_width 10 + +#: The window padding (in pts) (blank area between the text and the +#: window border). A single value sets all four sides. Two values set +#: the vertical and horizontal sides. Three values set top, horizontal +#: and bottom. Four values set top, right, bottom and left. + +# placement_strategy center + +#: When the window size is not an exact multiple of the cell size, the +#: cell area of the terminal window will have some extra padding on +#: the sides. You can control how that padding is distributed with +#: this option. Using a value of center means the cell area will be +#: placed centrally. A value of top-left means the padding will be on +#: only the bottom and right edges. + +# active_border_color #00ff00 + +#: The color for the border of the active window. Set this to none to +#: not draw borders around the active window. + +# inactive_border_color #cccccc + +#: The color for the border of inactive windows + +# bell_border_color #ff5a00 + +#: The color for the border of inactive windows in which a bell has +#: occurred + +# inactive_text_alpha 1.0 + +#: Fade the text in inactive windows by the specified amount (a number +#: between zero and one, with zero being fully faded). + +# hide_window_decorations no + +#: Hide the window decorations (title-bar and window borders) with +#: yes. On macOS, titlebar-only can be used to only hide the titlebar. +#: Whether this works and exactly what effect it has depends on the +#: window manager/operating system. + +# resize_debounce_time 0.1 + +#: The time (in seconds) to wait before redrawing the screen when a +#: resize event is received. On platforms such as macOS, where the +#: operating system sends events corresponding to the start and end of +#: a resize, this number is ignored. + +# resize_draw_strategy static + +#: Choose how kitty draws a window while a resize is in progress. A +#: value of static means draw the current window contents, mostly +#: unchanged. A value of scale means draw the current window contents +#: scaled. A value of blank means draw a blank window. A value of size +#: means show the window size in cells. + +# resize_in_steps no + +#: Resize the OS window in steps as large as the cells, instead of +#: with the usual pixel accuracy. Combined with an +#: initial_window_width and initial_window_height in number of cells, +#: this option can be used to keep the margins as small as possible +#: when resizing the OS window. Note that this does not currently work +#: on Wayland. + +# confirm_os_window_close 0 + +#: Ask for confirmation when closing an OS window or a tab that has at +#: least this number of kitty windows in it. A value of zero disables +#: confirmation. This confirmation also applies to requests to quit +#: the entire application (all OS windows, via the quit action). + +#: }}} + +#: Tab bar {{{ + +# tab_bar_edge bottom + +#: Which edge to show the tab bar on, top or bottom + +# tab_bar_margin_width 0.0 + +#: The margin to the left and right of the tab bar (in pts) + +# tab_bar_style fade + +#: The tab bar style, can be one of: fade, separator, powerline, or +#: hidden. In the fade style, each tab's edges fade into the +#: background color, in the separator style, tabs are separated by a +#: configurable separator, and the powerline shows the tabs as a +#: continuous line. If you use the hidden style, you might want to +#: create a mapping for the select_tab action which presents you with +#: a list of tabs and allows for easy switching to a tab. + +# tab_bar_min_tabs 2 + +#: The minimum number of tabs that must exist before the tab bar is +#: shown + +# tab_switch_strategy previous + +#: The algorithm to use when switching to a tab when the current tab +#: is closed. The default of previous will switch to the last used +#: tab. A value of left will switch to the tab to the left of the +#: closed tab. A value of right will switch to the tab to the right of +#: the closed tab. A value of last will switch to the right-most tab. + +# tab_fade 0.25 0.5 0.75 1 + +#: Control how each tab fades into the background when using fade for +#: the tab_bar_style. Each number is an alpha (between zero and one) +#: that controls how much the corresponding cell fades into the +#: background, with zero being no fade and one being full fade. You +#: can change the number of cells used by adding/removing entries to +#: this list. + +# tab_separator " ┇" + +#: The separator between tabs in the tab bar when using separator as +#: the tab_bar_style. + +# tab_activity_symbol none + +#: Some text or a unicode symbol to show on the tab if a window in the +#: tab that does not have focus has some activity. + +# tab_title_template "{title}" + +#: A template to render the tab title. The default just renders the +#: title. If you wish to include the tab-index as well, use something +#: like: {index}: {title}. Useful if you have shortcuts mapped for +#: goto_tab N. In addition you can use {layout_name} for the current +#: layout name and {num_windows} for the number of windows in the tab. +#: Note that formatting is done by Python's string formatting +#: machinery, so you can use, for instance, {layout_name[:2].upper()} +#: to show only the first two letters of the layout name, upper-cased. +#: If you want to style the text, you can use styling directives, for +#: example: {fmt.fg.red}red{fmt.fg.default}normal{fmt.bg._00FF00}green +#: bg{fmt.bg.normal}. Similarly, for bold and italic: +#: {fmt.bold}bold{fmt.nobold}normal{fmt.italic}italic{fmt.noitalic}. + +# active_tab_title_template none + +#: Template to use for active tabs, if not specified falls back to +#: tab_title_template. + +# 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 colors and styles + +# tab_bar_background none + +#: Background color for the tab bar. Defaults to using the terminal +#: background color. + +#: }}} + +#: Color scheme {{{ + +# foreground #dddddd +# background #000000 + +#: The foreground and background colors + +# background_opacity 1.0 + +#: The opacity of the background. A number between 0 and 1, where 1 is +#: opaque and 0 is fully transparent. This will only work if +#: supported by the OS (for instance, when using a compositor under +#: X11). Note that it only sets the background color's opacity in +#: cells that have the same background color as the default terminal +#: background. This is so that things like the status bar in vim, +#: powerline prompts, etc. still look good. But it means that if you +#: use a color theme with a background color in your editor, it will +#: not be rendered as transparent. Instead you should change the +#: default background color in your kitty config and not use a +#: background color in the editor color scheme. Or use the escape +#: codes to set the terminals default colors in a shell script to +#: launch your editor. Be aware that using a value less than 1.0 is a +#: (possibly significant) performance hit. If you want to dynamically +#: change transparency of windows set dynamic_background_opacity to +#: yes (this is off by default as it has a performance cost) + +# background_image none + +#: Path to a background image. Must be in PNG format. + +# background_image_layout tiled + +#: Whether to tile or scale the background image. + +# background_image_linear no + +#: When background image is scaled, whether linear interpolation +#: should be used. + +# dynamic_background_opacity no + +#: Allow changing of the background_opacity dynamically, using either +#: keyboard shortcuts (increase_background_opacity and +#: decrease_background_opacity) or the remote control facility. + +# background_tint 0.0 + +#: How much to tint the background image by the background color. The +#: tint is applied only under the text area, not margin/borders. Makes +#: it easier to read the text. Tinting is done using the current +#: background color for each window. This setting applies only if +#: background_opacity is set and transparent windows are supported or +#: background_image is set. + +# dim_opacity 0.75 + +#: How much to dim text that has the DIM/FAINT attribute set. One +#: means no dimming and zero means fully dimmed (i.e. invisible). + +# selection_foreground #000000 + +#: The foreground for text selected with the mouse. A value of none +#: means to leave the color unchanged. + +# selection_background #fffacd + +#: The background for text selected with the mouse. + + +#: The 16 terminal colors. There are 8 basic colors, each color has a +#: dull and bright version. You can also set the remaining colors from +#: the 256 color table as color16 to color255. + +# color0 #000000 +# color8 #767676 + +#: black + +# color1 #cc0403 +# color9 #f2201f + +#: red + +# color2 #19cb00 +# color10 #23fd00 + +#: green + +# color3 #cecb00 +# color11 #fffd00 + +#: yellow + +# color4 #0d73cc +# color12 #1a8fff + +#: blue + +# color5 #cb1ed1 +# color13 #fd28ff + +#: magenta + +# color6 #0dcdcd +# color14 #14ffff + +#: cyan + +# color7 #dddddd +# color15 #ffffff + +#: white + +# mark1_foreground black + +#: Color for marks of type 1 + +# mark1_background #98d3cb + +#: Color for marks of type 1 (light steel blue) + +# mark2_foreground black + +#: Color for marks of type 2 + +# mark2_background #f2dcd3 + +#: Color for marks of type 1 (beige) + +# mark3_foreground black + +#: Color for marks of type 3 + +# mark3_background #f274bc + +#: Color for marks of type 1 (violet) + +#: }}} + +#: Advanced {{{ + +# shell . + +#: The shell program to execute. The default value of . means to use +#: whatever shell is set as the default shell for the current user. +#: Note that on macOS if you change this, you might need to add +#: --login to ensure that the shell starts in interactive mode and +#: reads its startup rc files. + +# editor . + +#: The console editor to use when editing the kitty config file or +#: similar tasks. A value of . means to use the environment variables +#: VISUAL and EDITOR in that order. Note that this environment +#: variable has to be set not just in your shell startup scripts but +#: system-wide, otherwise kitty will not see it. + +# close_on_child_death no + +#: Close the window when the child process (shell) exits. If no (the +#: default), the terminal will remain open when the child exits as +#: long as there are still processes outputting to the terminal (for +#: example disowned or backgrounded processes). If yes, the window +#: will close as soon as the child process exits. Note that setting it +#: to yes means that any background processes still using the terminal +#: can fail silently because their stdout/stderr/stdin no longer work. + +# allow_remote_control no + +#: Allow other programs to control kitty. If you turn this on other +#: programs can control all aspects of kitty, including sending text +#: to kitty windows, opening new windows, closing windows, reading the +#: content of windows, etc. Note that this even works over ssh +#: connections. You can chose to either allow any program running +#: within kitty to control it, with yes or only programs that connect +#: to the socket specified with the kitty --listen-on command line +#: option, if you use the value socket-only. The latter is useful if +#: you want to prevent programs running on a remote computer over ssh +#: from controlling kitty. + +# listen_on none + +#: Tell kitty to listen to the specified unix/tcp socket for remote +#: control connections. Note that this will apply to all kitty +#: instances. It can be overridden by the kitty --listen-on command +#: line flag. This option accepts only UNIX sockets, such as +#: unix:${TEMP}/mykitty or (on Linux) unix:@mykitty. Environment +#: variables are expanded. If {kitty_pid} is present then it is +#: replaced by the PID of the kitty process, otherwise the PID of the +#: kitty process is appended to the value, with a hyphen. This option +#: is ignored unless you also set allow_remote_control to enable +#: remote control. See the help for kitty --listen-on for more +#: details. + +# env + +#: Specify environment variables to set in all child processes. Note +#: that environment variables are expanded recursively, so if you +#: use:: + +#: env MYVAR1=a +#: env MYVAR2=${MYVAR1}/${HOME}/b + +#: The value of MYVAR2 will be a//b. + +# update_check_interval 24 + +#: Periodically check if an update to kitty is available. If an update +#: is found a system notification is displayed informing you of the +#: available update. The default is to check every 24 hrs, set to zero +#: to disable. + +# startup_session none + +#: Path to a session file to use for all kitty instances. Can be +#: overridden by using the kitty --session command line option for +#: individual instances. See +#: https://sw.kovidgoyal.net/kitty/index.html#sessions in the kitty +#: documentation for details. Note that relative paths are interpreted +#: with respect to the kitty config directory. Environment variables +#: in the path are expanded. + +# clipboard_control write-clipboard write-primary + +#: Allow programs running in kitty to read and write from the +#: clipboard. You can control exactly which actions are allowed. The +#: set of possible actions is: write-clipboard read-clipboard write- +#: primary read-primary. You can additionally specify no-append to +#: disable kitty's protocol extension for clipboard concatenation. The +#: default is to allow writing to the clipboard and primary selection +#: with concatenation enabled. Note that enabling the read +#: functionality is a security risk as it means that any program, even +#: one running on a remote server via SSH can read your clipboard. + +# allow_hyperlinks yes + +#: Process hyperlink (OSC 8) escape sequences. If disabled OSC 8 +#: escape sequences are ignored. Otherwise they become clickable +#: links, that you can click by holding down ctrl+shift and clicking +#: with the mouse. The special value of ``ask`` means that kitty will +#: ask before opening the link. + +# term xterm-kitty + +#: The value of the TERM environment variable to set. Changing this +#: can break many terminal programs, only change it if you know what +#: you are doing, not because you read some advice on Stack Overflow +#: to change it. The TERM variable is used by various programs to get +#: information about the capabilities and behavior of the terminal. If +#: you change it, depending on what programs you run, and how +#: different the terminal you are changing it to is, various things +#: from key-presses, to colors, to various advanced features may not +#: work. + +#: }}} + +#: OS specific tweaks {{{ + +# macos_titlebar_color system + +#: Change the color of the kitty window's titlebar on macOS. A value +#: of system means to use the default system color, a value of +#: background means to use the background color of the currently +#: active window and finally you can use an arbitrary color, such as +#: #12af59 or red. WARNING: This option works by using a hack, as +#: there is no proper Cocoa API for it. It sets the background color +#: of the entire window and makes the titlebar transparent. As such it +#: is incompatible with background_opacity. If you want to use both, +#: you are probably better off just hiding the titlebar with +#: hide_window_decorations. + +# macos_option_as_alt no + +#: Use the option key as an alt key. With this set to no, kitty will +#: use the macOS native Option+Key = unicode character behavior. This +#: will break any Alt+key keyboard shortcuts in your terminal +#: programs, but you can use the macOS unicode input technique. You +#: can use the values: left, right, or both to use only the left, +#: right or both Option keys as Alt, instead. + +# macos_hide_from_tasks no + +#: Hide the kitty window from running tasks (Option+Tab) on macOS. + +# macos_quit_when_last_window_closed no + +#: Have kitty quit when all the top-level windows are closed. By +#: default, kitty will stay running, even with no open windows, as is +#: the expected behavior on macOS. + +# macos_window_resizable yes + +#: Disable this if you want kitty top-level (OS) windows to not be +#: resizable on macOS. + +# macos_thicken_font 0 + +#: Draw an extra border around the font with the given width, to +#: increase legibility at small font sizes. For example, a value of +#: 0.75 will result in rendering that looks similar to sub-pixel +#: antialiasing at common font sizes. + +# macos_traditional_fullscreen no + +#: Use the traditional full-screen transition, that is faster, but +#: less pretty. + +# macos_show_window_title_in all + +#: Show or hide the window title in the macOS window or menu-bar. A +#: value of window will show the title of the currently active window +#: at the top of the macOS window. A value of menubar will show the +#: title of the currently active window in the macOS menu-bar, making +#: use of otherwise wasted space. all will show the title everywhere +#: and none hides the title in the window and the menu-bar. + +# macos_custom_beam_cursor no + +#: Enable/disable custom mouse cursor for macOS that is easier to see +#: on both light and dark backgrounds. WARNING: this might make your +#: mouse cursor invisible on dual GPU machines. + +# linux_display_server auto + +#: Choose between Wayland and X11 backends. By default, an appropriate +#: backend based on the system state is chosen automatically. Set it +#: to x11 or wayland to force the choice. + +#: }}} + +#: Keyboard shortcuts {{{ + +#: For a list of key names, see: the GLFW key macros +#: . +#: The name to use is the part after the GLFW_KEY_ prefix. For a list +#: of modifier names, see: GLFW mods +#: + +#: On Linux you can also use XKB key names to bind keys that are not +#: supported by GLFW. See XKB keys +#: for a list of key names. The name to use is the part +#: after the XKB_KEY_ prefix. Note that you can only use an XKB key +#: name for keys that are not known as GLFW keys. + +#: Finally, you can use raw system key codes to map keys, again only +#: for keys that are not known as GLFW keys. To see the system key +#: code for a key, start kitty with the kitty --debug-keyboard option. +#: Then kitty will output some debug text for every key event. In that +#: text look for ``native_code`` the value of that becomes the key +#: name in the shortcut. For example: + +#: .. code-block:: none + +#: on_key_input: glfw key: 65 native_code: 0x61 action: PRESS mods: 0x0 text: 'a' + +#: Here, the key name for the A key is 0x61 and you can use it with:: + +#: map ctrl+0x61 something + +#: to map ctrl+a to something. + +#: You can use the special action no_op to unmap a keyboard shortcut +#: that is assigned in the default configuration:: + +#: map kitty_mod+space no_op + +#: You can combine multiple actions to be triggered by a single +#: shortcut, using the syntax below:: + +#: map key combine action1 action2 action3 ... + +#: For example:: + +#: map kitty_mod+e combine : new_window : next_layout + +#: this will create a new window and switch to the next available +#: layout + +#: You can use multi-key shortcuts using the syntax shown below:: + +#: map key1>key2>key3 action + +#: For example:: + +#: map ctrl+f>2 set_font_size 20 + +# kitty_mod ctrl+shift + +#: The value of kitty_mod is used as the modifier for all default +#: shortcuts, you can change it in your kitty.conf to change the +#: modifiers for all the default shortcuts. + +# clear_all_shortcuts no + +#: You can have kitty remove all shortcut definition seen up to this +#: point. Useful, for instance, to remove the default shortcuts. + +# kitten_alias hints hints --hints-offset=0 + +#: You can create aliases for kitten names, this allows overriding the +#: defaults for kitten options and can also be used to shorten +#: repeated mappings of the same kitten with a specific group of +#: options. For example, the above alias changes the default value of +#: kitty +kitten hints --hints-offset to zero for all mappings, +#: including the builtin ones. + +#: Clipboard {{{ + +# map kitty_mod+c copy_to_clipboard + +#: There is also a copy_or_interrupt action that can be optionally +#: mapped to Ctrl+c. It will copy only if there is a selection and +#: send an interrupt otherwise. Similarly, copy_and_clear_or_interrupt +#: will copy and clear the selection or send an interrupt if there is +#: no selection. + +# map kitty_mod+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 + +#: You can also pass the contents of the current selection to any +#: program using pass_selection_to_program. By default, the system's +#: open program is used, but you can specify your own, the selection +#: will be passed as a command line argument to the program, for +#: example:: + +#: map kitty_mod+o pass_selection_to_program firefox + +#: You can pass the current selection to a terminal program running in +#: a new kitty window, by using the @selection placeholder:: + +#: map kitty_mod+y new_window less @selection + +#: }}} + +#: Scrolling {{{ + +# map kitty_mod+up scroll_line_up +# map kitty_mod+k scroll_line_up +# map kitty_mod+down scroll_line_down +# map kitty_mod+j scroll_line_down +# map kitty_mod+page_up scroll_page_up +# map kitty_mod+page_down scroll_page_down +# map kitty_mod+home scroll_home +# map kitty_mod+end scroll_end +# map kitty_mod+h show_scrollback + +#: You can pipe the contents of the current screen + history buffer as +#: STDIN to an arbitrary program using the ``launch`` function. For +#: example, the following opens the scrollback buffer in less in an +#: overlay window:: + +#: map f1 launch --stdin-source=@screen_scrollback --stdin-add-formatting --type=overlay less +G -R + +#: For more details on piping screen and buffer contents to external +#: programs, see launch. + +#: }}} + +#: Window management {{{ + +# map kitty_mod+enter new_window + +#: You can open a new window running an arbitrary program, for +#: example:: + +#: map kitty_mod+y launch mutt + +#: You can open a new window with the current working directory set to +#: the working directory of the current window using:: + +#: map ctrl+alt+enter launch --cwd=current + +#: You can open a new window that is allowed to control kitty via the +#: kitty remote control facility by prefixing the command line with @. +#: Any programs running in that window will be allowed to control +#: kitty. For example:: + +#: map ctrl+enter launch --allow-remote-control some_program + +#: You can open a new window next to the currently active window or as +#: the first window, with:: + +#: map ctrl+n launch --location=neighbor some_program +#: map ctrl+f launch --location=first some_program + +#: For more details, see launch. + +# map kitty_mod+n new_os_window + +#: Works like new_window above, except that it opens a top level OS +#: kitty window. In particular you can use new_os_window_with_cwd to +#: open a window with the current working directory. + +# map kitty_mod+w 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 kitty_mod+1 first_window +# map kitty_mod+2 second_window +# map kitty_mod+3 third_window +# map kitty_mod+4 fourth_window +# map kitty_mod+5 fifth_window +# map kitty_mod+6 sixth_window +# map kitty_mod+7 seventh_window +# map kitty_mod+8 eighth_window +# map kitty_mod+9 ninth_window +# map kitty_mod+0 tenth_window +#: }}} + +#: Tab management {{{ + +# map kitty_mod+right next_tab +# map kitty_mod+left previous_tab +# map kitty_mod+t new_tab +# map kitty_mod+q close_tab +# map kitty_mod+. move_tab_forward +# map kitty_mod+, move_tab_backward +# map kitty_mod+alt+t set_tab_title + +#: You can also create shortcuts to go to specific tabs, with 1 being +#: the first tab, 2 the second tab and -1 being the previously active +#: tab, and any number larger than the last tab being the last tab:: + +#: map ctrl+alt+1 goto_tab 1 +#: map ctrl+alt+2 goto_tab 2 + +#: Just as with new_window above, you can also pass the name of +#: arbitrary commands to run when using new_tab and use +#: new_tab_with_cwd. Finally, if you want the new tab to open next to +#: the current tab rather than at the end of the tabs list, use:: + +#: map ctrl+t new_tab !neighbor [optional cmd to run] +#: }}} + +#: Layout management {{{ + +# map kitty_mod+l next_layout + +#: You can also create shortcuts to switch to specific layouts:: + +#: map ctrl+alt+t goto_layout tall +#: map ctrl+alt+s goto_layout stack + +#: Similarly, to switch back to the previous layout:: + +#: map ctrl+alt+p last_used_layout +#: }}} + +#: Font sizes {{{ + +#: You can change the font size for all top-level kitty OS windows at +#: a time or only the current one. + +# map kitty_mod+equal change_font_size all +2.0 +# map kitty_mod+minus change_font_size all -2.0 +# map kitty_mod+backspace change_font_size all 0 + +#: To setup shortcuts for specific font sizes:: + +#: map kitty_mod+f6 change_font_size all 10.0 + +#: To setup shortcuts to change only the current OS window's font +#: size:: + +#: map kitty_mod+f6 change_font_size current 10.0 +#: }}} + +#: Select and act on visible text {{{ + +#: Use the hints kitten to select text and either pass it to an +#: external program or insert it into the terminal or copy it to the +#: clipboard. + +# map kitty_mod+e kitten hints + +#: Open a currently visible URL using the keyboard. The program used +#: to open the URL is specified in open_url_with. + +# map kitty_mod+p>f kitten hints --type path --program - + +#: Select a path/filename and insert it into the terminal. Useful, for +#: instance to run git commands on a filename output from a previous +#: git command. + +# map kitty_mod+p>shift+f kitten hints --type path + +#: Select a path/filename and open it with the default open program. + +# map kitty_mod+p>l kitten hints --type line --program - + +#: Select a line of text and insert it into the terminal. Use for the +#: output of things like: ls -1 + +# map kitty_mod+p>w kitten hints --type word --program - + +#: Select words and insert into terminal. + +# map kitty_mod+p>h kitten hints --type hash --program - + +#: Select something that looks like a hash and insert it into the +#: terminal. Useful with git, which uses sha1 hashes to identify +#: commits + +# map kitty_mod+p>n kitten hints --type linenum + +#: Select something that looks like filename:linenum and open it in +#: vim at the specified line number. + +# map kitty_mod+p>y kitten hints --type hyperlink + +#: Select a hyperlink (i.e. a URL that has been marked as such by the +#: terminal program, for example, by ls --hyperlink=auto). + + +#: The hints kitten has many more modes of operation that you can map +#: to different shortcuts. For a full description see kittens/hints. +#: }}} + +#: Miscellaneous {{{ + +# map kitty_mod+f11 toggle_fullscreen +# map kitty_mod+f10 toggle_maximized +# map kitty_mod+u kitten unicode_input +# map kitty_mod+f2 edit_config_file +# map kitty_mod+escape kitty_shell window + +#: Open the kitty shell in a new window/tab/overlay/os_window to +#: control kitty using commands. + +# 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 + +#: You can create shortcuts to clear/reset the terminal. For example:: + +#: # Reset the terminal +#: map kitty_mod+f9 clear_terminal reset active +#: # Clear the terminal screen by erasing all contents +#: map kitty_mod+f10 clear_terminal clear active +#: # Clear the terminal scrollback by erasing it +#: map kitty_mod+f11 clear_terminal scrollback active +#: # Scroll the contents of the screen into the scrollback +#: map kitty_mod+f12 clear_terminal scroll active + +#: If you want to operate on all windows instead of just the current +#: one, use all instead of active. + +#: It is also possible to remap Ctrl+L to both scroll the current +#: screen contents into the scrollback buffer and clear the screen, +#: instead of just clearing the screen:: + +#: map ctrl+l combine : clear_terminal scroll active : send_text normal,application \x0c + + +#: You can tell kitty to send arbitrary (UTF-8) encoded text to the +#: client program when pressing specified shortcut keys. For example:: + +#: map ctrl+alt+a send_text all Special text + +#: This will send "Special text" when you press the ctrl+alt+a key +#: combination. The text to be sent is a python string literal so you +#: can use escapes like \x1b to send control codes or \u21fb to send +#: unicode characters (or you can just input the unicode characters +#: directly as UTF-8 text). The first argument to send_text is the +#: keyboard modes in which to activate the shortcut. The possible +#: values are normal or application or kitty or a comma separated +#: combination of them. The special keyword all means all modes. The +#: modes normal and application refer to the DECCKM cursor key mode +#: for terminals, and kitty refers to the special kitty extended +#: keyboard protocol. + +#: Another example, that outputs a word and then moves the cursor to +#: the start of the line (same as pressing the Home key):: + +#: map ctrl+alt+a send_text normal Word\x1b[H +#: map ctrl+alt+a send_text application Word\x1bOH + +#: }}} + +# }}} diff --git a/configs/nvim/init.lua b/configs/nvim/init.lua index 2435540..a38bc4d 100644 --- a/configs/nvim/init.lua +++ b/configs/nvim/init.lua @@ -153,13 +153,6 @@ if u.has_plugin("cmp") then } ) - require("transparent").setup( - { - enable = true, - extra_groups = "All" - } - ) - g.markdown_fenced_languages = {"html", "python", "bash=sh"} -- Remove background color diff --git a/configs/nvim/lua/autocommands.lua b/configs/nvim/lua/autocommands.lua index b999f0b..b461ad3 100644 --- a/configs/nvim/lua/autocommands.lua +++ b/configs/nvim/lua/autocommands.lua @@ -12,6 +12,13 @@ cmd [[ au ColorScheme myspecialcolors hi Normal ctermbg=red guibg=red ]] +cmd [[ +augroup filetypedetect + au BufNewFile,BufRead *.frag setl ft=glsl + au BufNewFile,BufRead *.vert setl ft=glsl +augroup END +]] + cmd [[ augroup SaveManualFolds autocmd! diff --git a/configs/nvim/lua/formatter-conf.lua b/configs/nvim/lua/formatter-conf.lua index 047d669..3c5f2a2 100644 --- a/configs/nvim/lua/formatter-conf.lua +++ b/configs/nvim/lua/formatter-conf.lua @@ -1,8 +1,7 @@ local cmd = vim.cmd -local util = require "vim.lsp.util" -local utils = require("utils") +local g = vim.g -function tablelength(T) +local function tablelength(T) local count = 0 for _ in pairs(T) do count = count + 1 @@ -30,16 +29,15 @@ local function select_client(method) return supported_client end +g.neoformat_enabled_glsl = {} + function FormattingSync() vim.cmd("Neoformat") - -- local client = select_client("textDocument/formatting") -- if client == nil then -- vim.notify("No LSP Client with formatting connected") -- end - -- vim.notify("Formatting with LSP") - -- local params = util.make_formatting_params({}) -- local result, err = client.request_sync("textDocument/formatting", params, 500, vim.api.nvim_get_current_buf()) -- if result and result.result then diff --git a/configs/nvim/lua/keymappings.lua b/configs/nvim/lua/keymappings.lua index 92038e6..406604d 100644 --- a/configs/nvim/lua/keymappings.lua +++ b/configs/nvim/lua/keymappings.lua @@ -66,7 +66,7 @@ map("n", "r", "lua require('rest-nvim').run()", options) map("n", "q", ":q", options) -- Open Nerdtree -map("n", "", ":NvimTreeToggle", options) +map("n", "", ":NvimTreeToggle:TransparentEnable", options) -- Make ctrl+s work map("n", "", ":w", options) diff --git a/configs/nvim/lua/lsp-conf.lua b/configs/nvim/lua/lsp-conf.lua index 34c2415..ebc5d10 100644 --- a/configs/nvim/lua/lsp-conf.lua +++ b/configs/nvim/lua/lsp-conf.lua @@ -1,29 +1,17 @@ local lsp = require "lspconfig" local lsp_status = require("lsp-status") - -_G.lsp_organize_imports = function() - local params = { - command = "_typescript.organizeImports", - arguments = {vim.api.nvim_buf_get_name(0)}, - title = "" - } - vim.lsp.buf.execute_command(params) -end +local ts_utils = require("nvim-lsp-ts-utils") -- function to attach completion when setting up lsp -local function on_attach() +local function on_attach(client, bufnr) vim.api.nvim_buf_set_option(bufnr, "omnifunc", "v:lua.vim.lsp.omnifunc") - vim.cmd("command! LspOrganize lua lsp_organize_imports()") - vim.api.nvim_buf_map(bufnr, "n", "gs", ":LspOrganize", {silent = true}) end local runtime_path = vim.split(package.path, ";") table.insert(runtime_path, "lua/?.lua") table.insert(runtime_path, "lua/?/init.lua") -print(runtime_path) - -require "lspconfig".sumneko_lua.setup { +lsp.sumneko_lua.setup { settings = { Lua = { runtime = { @@ -50,8 +38,9 @@ require "lspconfig".sumneko_lua.setup { -- Ltex Language Server require("grammar-guard").init() + -- setup LSP config -require("lspconfig").grammar_guard.setup( +lsp.grammar_guard.setup( { cmd = {vim.fn.expand("~/.local/share/nvim/lsp_servers/ltex/ltex-ls/bin/ltex-ls")}, settings = { @@ -90,26 +79,74 @@ lsp.svelte.setup { capabilities = lsp_status.capabilities } -local function organize_imports() - local params = { - command = "_typescript.organizeImports", - arguments = {vim.api.nvim_buf_get_name(0)}, - title = "" - } - vim.lsp.buf.execute_command(params) -end - -- Typescript Language Server -lsp.tsserver.setup { - on_attach = on_attach, - capabilities = lsp_status.capabilities, - commands = { - OrganizeImports = { - organize_imports, - description = "Organize Imports" - } +lsp.tsserver.setup( + { + -- Needed for inlayHints. Merge this table with your settings or copy + -- it from the source if you want to add your own init_options. + init_options = require("nvim-lsp-ts-utils").init_options, + -- + on_attach = function(client, bufnr) + vim.notify("Eyyyy") + + -- defaults + ts_utils.setup( + { + debug = true, + disable_commands = false, + enable_import_on_completion = false, + -- import all + import_all_timeout = 5000, -- ms + -- lower numbers = higher priority + import_all_priorities = { + same_file = 1, -- add to existing import statement + local_files = 2, -- git files or files with relative path markers + buffer_content = 3, -- loaded buffer content + buffers = 4 -- loaded buffer names + }, + import_all_scan_buffers = 100, + import_all_select_source = false, + -- if false will avoid organizing imports + always_organize_imports = true, + -- filter diagnostics + filter_out_diagnostics_by_severity = {}, + filter_out_diagnostics_by_code = {}, + -- inlay hints + auto_inlay_hints = true, + inlay_hints_highlight = "Comment", + inlay_hints_priority = 200, -- priority of the hint extmarks + inlay_hints_throttle = 150, -- throttle the inlay hint request + inlay_hints_format = { + -- format options for individual hint kind + Type = {}, + Parameter = {}, + Enum = {} + -- Example format customization for `Type` kind: + -- Type = { + -- highlight = "Comment", + -- text = function(text) + -- return "->" .. text:sub(2) + -- end, + -- }, + }, + -- update imports on file move + update_imports_on_move = false, + require_confirmation_on_move = false, + watch_dir = nil + } + ) + + -- required to fix code action ranges and filter diagnostics + ts_utils.setup_client(client) + + -- no default maps, so you may want to define some here + local opts = {silent = true} + vim.api.nvim_buf_set_keymap(bufnr, "n", "gs", ":TSLspOrganize", opts) + vim.api.nvim_buf_set_keymap(bufnr, "n", "gr", ":TSLspRenameFile", opts) + vim.api.nvim_buf_set_keymap(bufnr, "n", "gi", ":TSLspImportAll", opts) + end } -} +) -- JSON ls setup lsp.jsonls.setup { @@ -117,6 +154,12 @@ lsp.jsonls.setup { capabilities = lsp_status.capabilities } +-- JSON ls setup +lsp.cssls.setup { + on_attach = on_attach, + capabilities = lsp_status.capabilities +} + -- Setup diagnostics formaters and linters for non LSP provided files lsp.diagnosticls.setup { on_attach = on_attach, diff --git a/configs/nvim/lua/lspinstaller-conf.lua b/configs/nvim/lua/lspinstaller-conf.lua index 1b57cfe..a6b0138 100644 --- a/configs/nvim/lua/lspinstaller-conf.lua +++ b/configs/nvim/lua/lspinstaller-conf.lua @@ -1,14 +1,16 @@ local lsp_installer = require("nvim-lsp-installer") -lsp_installer.on_server_ready(function(server) - local opts = {} +lsp_installer.on_server_ready( + function(server) + local opts = {} - -- (optional) Customize the options passed to the server - -- if server.name == "tsserver" then - -- opts.root_dir = function() ... end - -- end + -- (optional) Customize the options passed to the server + -- if server.name == "tsserver" then + -- opts.root_dir = function() ... end + -- end - -- This setup() function is exactly the same as lspconfig's setup function (:help lspconfig-quickstart) - server:setup(opts) - vim.cmd [[ do User LspAttachBuffers ]] -end) + -- This setup() function is exactly the same as lspconfig's setup function (:help lspconfig-quickstart) + -- server:setup(opts) + vim.cmd [[ do User LspAttachBuffers ]] + end +) diff --git a/configs/nvim/lua/plugins.lua b/configs/nvim/lua/plugins.lua index ea949d3..a237f4d 100644 --- a/configs/nvim/lua/plugins.lua +++ b/configs/nvim/lua/plugins.lua @@ -6,9 +6,8 @@ return require("packer").startup( -- General Helper Functions use "nvim-lua/plenary.nvim" - -- Faster Filetype Detection + -- Filetype Detection use "nathom/filetype.nvim" - use "alexghergh/nvim-tmux-navigation" -- Theming Section -- use 'folke/tokyonight.nvim' @@ -27,6 +26,7 @@ return require("packer").startup( use "windwp/nvim-autopairs" -- Code Navigation + use "alexghergh/nvim-tmux-navigation" use "dense-analysis/ale" use "nathanmsmith/nvim-ale-diagnostic" use "junegunn/fzf" @@ -52,6 +52,7 @@ return require("packer").startup( } -- Syntax / Autocomplete + use "terminalnode/sway-vim-syntax" --sway config syntax use "neovim/nvim-lspconfig" use "hrsh7th/nvim-cmp" use "hrsh7th/cmp-nvim-lsp" @@ -65,6 +66,7 @@ return require("packer").startup( use "saadparwaiz1/cmp_luasnip" use "williamboman/nvim-lsp-installer" use "nvim-lua/lsp-status.nvim" + use "jose-elias-alvarez/nvim-lsp-ts-utils" use "neoclide/jsonc.vim" use "brymer-meneses/grammar-guard.nvim" use { @@ -72,10 +74,6 @@ return require("packer").startup( run = ":TSUpdate" } - -- Language Supports - use "beyondmarc/glsl.vim" -- GLSL - use "ellisonleao/glow.nvim" -- MARKDOWN - -- Autoformat use "sbdchd/neoformat" -- use "lukas-reineke/format.nvim" diff --git a/configs/sway/config b/configs/sway/config index a98ba22..fd17cc3 100644 --- a/configs/sway/config +++ b/configs/sway/config @@ -1,5 +1,4 @@ -# vi: ft=confj -# /go +# vim: ft=swayconfig # Default config for sway # @@ -7,7 +6,7 @@ # # Read `man 5 sway` for a complete reference. -exec export $(dbus-launch --exit-with-session); +exec dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway ### Variables # @@ -32,26 +31,29 @@ set $screenshot wl-copy < "$($grimshot --notify save screen $screenshot_dir/scrn set $windowshot wl-copy < "$($grimshot --notify save window $screenshot_dir/scrn-$(date +"%Y-%m-%d-%H-%M-%S").png)" # Default Programs -set $term alacritty +set $term kitty set $explorer nautilus set $mail geary -set $browser google-chrome --enable-features=UseOzonePlatform --ozone-platform=wayland +set $browser google-chrome-beta --enable-features=UseOzonePlatform --ozone-platform=wayland set $config_editor ~/.config/sway/config_editor.sh +set $debug_window ~/.config/sway/debug_window.sh set $settings gnome-control-center set $toggle_layout ~/.config/sway/toggle_layout.sh set $toggle_gaps ~/.config/sway/toggle_gaps.sh +set $toggle_bar ~/.config/sway/toggle_bar.sh set $web_search $wofi_scripts/web-search.sh set $select_window ~/.config/sway/select_window.sh set $lock_screen ~/.config/sway/lock_screen.sh set $select_emoji $wofi_scripts/wofi-emoji -set $password_mngr rofi-rbw --selector wofi +set $password_mngr rofi-rbw --selector wofi --typer wtyper --cliboarder wl-copy +set $open_localhost $wofi_scripts/open-localhost +set $bluetooth_mngr blueman-manager # Input configuration input * { xkb_layout de xkb_capslock disabled - tap enabled } smart_gaps off @@ -89,12 +91,12 @@ exec swayidle -w \ # # Example configuration: # -# input "2:14:SynPS/2_Synaptics_TouchPad" { -# dwt enabled -# tap enabled -# natural_scroll enabled -# middle_emulation enabled -# } +input "1739:24385:Synaptics_TM2438-005" { + dwt enabled + tap enabled + natural_scroll enabled + middle_emulation enabled +} # # You can get the names of your inputs by running: swaymsg -t get_inputs # Read `man 5 sway-input` for more information about this section. @@ -110,6 +112,7 @@ exec swayidle -w \ bindsym $mod+e exec $explorer bindsym $mod+Comma exec $settings bindsym $mod+b exec $browser + bindsym $mod+Shift+b exec $bluetooth_mngr bindsym $mod+Shift+Comma exec $config_editor bindsym $mod+a exec $web_search bindsym $mod+p exec $password_mngr @@ -138,7 +141,7 @@ exec swayidle -w \ bindsym $mod+$left focus left bindsym $mod+$down focus down bindsym $mod+$up focus up - # bindsym $mod+$right focus right + bindsym $mod+$right focus right # Or use $mod+[up|down|left|right] bindsym $mod+Left focus left @@ -151,6 +154,7 @@ exec swayidle -w \ bindsym $mod+Shift+$down move down bindsym $mod+Shift+$up move up bindsym $mod+Shift+$right move right + # Ditto, with arrow keys bindsym $mod+Shift+Left move left bindsym $mod+Shift+Down move down @@ -159,46 +163,52 @@ exec swayidle -w \ # # Workspaces: # + for_window [class="zoom"] floating enable + for_window [app_id="gnome-calculator"] floating enable + for_window [title="Zoom Meeting.*"] floating disable + for_window [title="Zoom Meeting.*"] inhibit_idle visible + set $ws1 "1:  Code" - assign [class="Alacritty"] $ws1 + assign [app_id="Alacritty"] $ws1 set $ws2 "2:  Browser" assign [class="Firefox"] $ws2 - assign [class="Chromium"] $ws2 - assign [class="Google-chrome-beta"] $ws2 - assign [class="Google-chrome"] $ws2 + assign [class="Chromium"] $ws2 + assign [class="Google-chrome-beta"] $ws2 + assign [app_id="google-chrome-beta"] $ws2 + assign [class="Google-chrome"] $ws2 + assign [app_id="google-chrome"] $ws2 set $ws3 "3:  Music" - assign [class="Spotify"] $ws3 - assign [class="spotify"] $ws3 + assign [class="Spotify"] $ws3 + assign [class="spotify"] $ws3 + assign [app_id="dev.alextren.Spot"] $ws3 set $ws4 "4:  Chat" - # Switch to workspace - bindsym $mod+1 workspace $ws1 - bindsym $mod+2 workspace $ws2 - bindsym $mod+3 workspace $ws3 - bindsym $mod+4 workspace $ws4 - bindsym $mod+5 workspace number 5 - bindsym $mod+6 workspace number 6 - bindsym $mod+7 workspace number 7 - bindsym $mod+8 workspace number 8 - bindsym $mod+9 workspace number 9 - bindsym $mod+0 workspace number 10 - # Move focused container to workspace - bindsym $mod+Shift+1 move container to workspace $ws1 - bindsym $mod+Shift+2 move container to workspace $ws2 - bindsym $mod+Shift+3 move container to workspace $ws3 - bindsym $mod+Shift+4 move container to workspace $ws4 - bindsym $mod+Shift+5 move container to workspace number 5 - bindsym $mod+Shift+6 move container to workspace number 6 - bindsym $mod+Shift+7 move container to workspace number 7 - bindsym $mod+Shift+8 move container to workspace number 8 - bindsym $mod+Shift+9 move container to workspace number 9 - bindsym $mod+Shift+0 move container to workspace number 10 - # Note: workspaces can have any name you want, not just numbers. - # We just use 1-10 as the default. + # Switch to workspace + bindsym $mod+1 workspace $ws1 + bindsym $mod+2 workspace $ws2 + bindsym $mod+3 workspace $ws3 + bindsym $mod+4 workspace $ws4 + bindsym $mod+5 workspace number 5 + bindsym $mod+6 workspace number 6 + bindsym $mod+7 workspace number 7 + bindsym $mod+8 workspace number 8 + bindsym $mod+9 workspace number 9 + bindsym $mod+0 workspace number 10 + + # Move focused container to workspace + bindsym $mod+Shift+1 move container to workspace $ws1 + bindsym $mod+Shift+2 move container to workspace $ws2 + bindsym $mod+Shift+3 move container to workspace $ws3 + bindsym $mod+Shift+4 move container to workspace $ws4 + bindsym $mod+Shift+5 move container to workspace number 5 + bindsym $mod+Shift+6 move container to workspace number 6 + bindsym $mod+Shift+7 move container to workspace number 7 + bindsym $mod+Shift+8 move container to workspace number 8 + bindsym $mod+Shift+9 move container to workspace number 9 + bindsym $mod+Shift+0 move container to workspace number 10 + # Note: workspaces can have any name you want, not just numbers. + # We just use 1-10 as the default. -for_window [class="zoom"] floating enable -for_window [title="Zoom Meeting.*"] floating disable -for_window [title="Zoom Meeting.*"] inhibit_idle visible # # Layout stuff: @@ -212,6 +222,7 @@ for_window [title="Zoom Meeting.*"] inhibit_idle visible # Switch the current container between different layout styles bindsym $mod+w exec $toggle_layout bindsym $mod+g exec $toggle_gaps + bindsym $mod+Shift+g exec $toggle_bar # Make the current focus fullscreen bindsym $mod+f fullscreen @@ -226,16 +237,18 @@ for_window [title="Zoom Meeting.*"] inhibit_idle visible # bindsym $mod+a focus parent # Screenshots + # -- Entire Screen + bindsym $mod+s exec $screenshot # -- Area Screenshot bindsym $mod+Shift+s exec $screenclip # -- Select Window bindsym $mod+Control+s exec $windowshot - # -- Entire Screen - bindsym $mod+s exec $screenshot bindsym $mod+i exec $select_emoji - bindsym $mod+l exec $lock_screen - bindsym $mod+Tab exec $select_window + bindsym $mod+Shift+i exec $debug_window + bindsym $mod+o exec $open_localhost + bindsym $mod+c exec $lock_screen + bindsym Alt+Tab exec $select_window bindsym $mod+m exec $mail # # Scratchpad: @@ -257,10 +270,16 @@ mode "resize" { # right will grow the containers width # up will shrink the containers height # down will grow the containers height - bindsym $left resize shrink width 10px - bindsym $down resize grow height 10px - bindsym $up resize shrink height 10px - bindsym $right resize grow width 10px + bindsym $left resize shrink width 100px + bindsym $down resize grow height 100px + bindsym $up resize shrink height 100px + bindsym $right resize grow width 100px + + + bindsym Shift+$left resize shrink width 20px + bindsym Shift+$down resize grow height 20px + bindsym Shift+$up resize shrink height 20px + bindsym Shift+$right resize grow width 20px # Ditto, with arrow keys bindsym Left resize shrink width 10px @@ -274,10 +293,7 @@ mode "resize" { } bindsym $mod+r mode "resize" -exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK - # Do we need that? -exec_always nm-applet --indicator # Handles notifications exec_always mako @@ -294,4 +310,4 @@ bar { } include @sysconfdir@/sway/config.d/* -exec systemctl --user import-environment +exec "systemctl --user import-environment SWAYSOCK WAYLAND_DISPLAY"; diff --git a/configs/sway/debug_window.sh b/configs/sway/debug_window.sh new file mode 100755 index 0000000..c75d2a7 --- /dev/null +++ b/configs/sway/debug_window.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +ALL_NODES='recurse(.nodes[]?, .floating_nodes[]?) | select(.pid and .visible)' +WINDOW_NAME='(.app_id // .window_properties.class)' +ID_PREFIX='"\(.pid):"' +WINDOW_PROTOCOL='(if .shell == "xwayland" then "X11" else "wayland" end)' +WINDOW_GEOMETRY='(.rect | "\(.x),\(.y) \(.width)x\(.height) ")' +WINDOW_PID='(.pid | tostring)' +CLEAR_OBJ="del(.rect, .name, .focus, .border, .current_border_width, .window_rect, .orientation, .layout, .percent, .deco_rect, .geometry, .window, .urgent, .marks, .sticky, .type, .fullscreen_mode, .nodes, .floating_nodes, .shell, .max_render_time, .visible, .idle_inhibitors, .inhibit_idle)" + +# Output format, e.g. "1234 - 12:firefox (wayland)" or "5678 - 17:discord (X11)" +FORMAT="$WINDOW_PID" +FILT="$ALL_NODES | $WINDOW_GEOMETRY + $FORMAT" + +function getprop() { + typeset -A views + local selected + + while read POS GEOM INFO; do + views["$POS $GEOM"]="$INFO" + done + + + selected="$(printf "%s\n" "${!views[@]}" | slurp)" + if [[ -n "$selected" ]]; then + window_id=${views[${selected}]}; + SELECT_ID=$(echo ".. | (.nodes? // empty)[] | select(.pid == $window_id) | $CLEAR_OBJ ") + echo $SELECT_ID + notify "Debug:" "$(swaymsg -t get_tree | jq -r "$SELECT_ID")"; + fi +} + +swaymsg -t get_tree | jq -r "$FILT" | getprop diff --git a/configs/sway/screenshot.sh b/configs/sway/screenshot.sh deleted file mode 100644 index e69de29..0000000 diff --git a/configs/sway/toggle_bar.sh b/configs/sway/toggle_bar.sh new file mode 100755 index 0000000..34dadf0 --- /dev/null +++ b/configs/sway/toggle_bar.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +GAPS=3 + +# How to get the current inner border from swaymsg +#$ echo $(swaymsg -t get_config | jq ".config") | sed -n '/gaps\ inner/p' | sed 's/gaps\ inner//g' | xargs + +if [ "$(pgrep waybar)" != "" ]; then + killall waybar; + swaymsg gaps outer all set 0; + swaymsg gaps inner all set 0; +else + swaymsg gaps outer all set $GAPS; + swaymsg gaps inner all set $GAPS; + nohup waybar & 2&> /dev/null; +fi diff --git a/configs/wofi/open-localhost b/configs/wofi/open-localhost new file mode 100755 index 0000000..be4e540 --- /dev/null +++ b/configs/wofi/open-localhost @@ -0,0 +1,9 @@ +#!/bin/bash +open "http://localhost:$(sed '1,/^### DATA ###$/d' $0 | wofi --show dmenu -i | cut -d ' ' -f 1 | tr -d '\n')" +exit +### DATA ### +8000 +8080 +3000 +3001 +80 diff --git a/configs/wofi/wofi-emoji b/configs/wofi/wofi-emoji index f9fc04f..1882ce6 100755 --- a/configs/wofi/wofi-emoji +++ b/configs/wofi/wofi-emoji @@ -1,7 +1,306 @@ #!/bin/bash -sed '1,/^### DATA ###$/d' $0 | wofi --show dmenu -i | cut -d ' ' -f 1 | tr -d '\n' | wl-copy +EMOJI=$(sed '1,/^### DATA ###$/d' $0 | wofi --show dmenu -i | cut -d ' ' -f 1 | tr -d '\n') +wtype $EMOJI +wl-copy $EMOJI exit ### DATA ### +Ω Ohm +← Left Arrow +↑ Up Arrow +→ Right Arrow +↓ Down Arrow +↔ Left Right Arrow +↕ Up Down Arrow +↖ North West Arrow +↗ North East Arrow +↘ South East Arrow +↙ South West Arrow +↚ Left Arrow with Stroke +↛ Right Arrow with Stroke +↜ Left Wave Arrow +↝ Right Wave Arrow +↞ Left Two Headed Arrow +↟ Up Two Headed Arrow +↠ Right Two Headed Arrow +↡ Down Two Headed Arrow +↢ Left Arrow with Tail +↣ Right Arrow with Tail +↤ Left Arrow from Bar +↥ Up Arrow from Bar +↦ Right Arrow from Bar +↧ Down Arrow from Bar +↨ Up Down Arrow with Base +↩ Left Arrow with Hook +↪ Right Arrow with Hook +↫ Left Arrow with Loop +↬ Right Arrow with Loop +↭ Left Right Wave Arrow +↮ Left Right Arrow with Stroke +↯ Down Zigzag Arrow +↰ Up Arrow with Tip Left +↱ Up Arrow with Tip Right +↲ Down Arrow with Tip Left +↳ Down Arrow with Tip Right +↴ Right Arrow with Corner Down +↵ Down Arrow with Corner Left +↶ Anticlockwise Top Semicircle Arrow +↷ Clockwise Top Semicircle Arrow +↸ North West Arrow to Long Bar +↹ Left Arrow to Bar over Right Arrow to bar +↺ Anticlockwise Open Circle Arrow +↻ Clockwise Open Circle Arrow +↼ Left Harpoon with Barb Up +↽ Left Harpoon with Barb Down +↾ Up Harpoon with Barb Right +↿ Up Harpoon with Barb Left +⇀ Right Harpoon with Barb Up +⇁ Right Harpoon with Barb Down +⇂ Down Harpoon with Barb Right +⇃ Down Harpoon with Barb Left +⇄ Right Arrow over Left Arrow +⇅ Up Arrow Left of Down Arrow +⇆ Left Arrow over Right Arrow +⇇ Left Paired Arrows +⇈ Up Paired Arrows +⇉ Right Paired Arrows +⇊ Downards Paired Arrows +⇋ Left Harpoon over Right Harpoon +⇌ Right Harpoon over Left Harpoon +⇍ Left Double Arrow with Stroke +⇎ Left Right Double Arrow with Stroke +⇏ Right Double Arrow with Stroke +⇐ Left Double Arrow +⇑ Up Double Arrow +⇒ Right Double Arrow +⇓ Down Double Arrow +⇔ Left Right Double Arrow +⇕ Up Down Double Arrow +⇖ North West Double Arrow +⇗ North East Double Arrow +⇘ South East Double Arrow +⇙ South West Double Arrow +⇚ Left Triple Arrow +⇛ Right Triple Arrow +⇜ Left Squiggle Arrow +⇝ Right Squiggle Arrow +⇞ Up Arrow with Double Stroke +⇟ Down Arrow with Double Stroke +⇠ Left Dashed Arrow +⇡ Up Dashed Arrow +⇢ Right Dashed Arrow +⇣ Down Dashed Arrow +⇤ Left Arrow to Bar +⇥ Right Arrow to Bar +⇥ Right Arrow to Bar +⇦ Left White Arrow +⇧ Up White Arrow +⇨ Right White Arrow +⇩ Down White Arrow +⇪ Up White Arrow from Bar +⇫ Up White Arrow on Pedestal +⇬ Up White Arrow on Pedestal with Horizontal Bar +⇭ Up White Arrow on Pedestal with Vertical Bar +⇮ Up White Double Arrow +⇯ Up White Double Arrow on Pedestal +⇰ Right White Arrow from Wall +⇱ North West Arrow to Corner +⇲ South East Arrow to Corner +⇳ Up Down White Arrow +⇴ Right Arrow with Small Circle +⇵ Down Arrow Left of Up Arrow +⇶ Three Right Arrows +⇷ Left Arrow with Vertical Stroke +⇸ Right Arrow with Vertical Stroke +⇹ Left Right Arrow with Vertical Stroke +⇺ Left Arrow with Double Vertical Stroke +⇻ Right Arrow with Double Vertical Stroke +⇼ Left Right Arrow with Double Vertical Stroke +⇽ Left Open-headed Arrow +⇾ Right Open-headed Arrow +⇿ Left Right Open-headed Arrow +⟰ Up Quadruple Arrow +⟱ Down Quadruple Arrow +⟲ Anticlockwise Gapped Circle Arrow +⟳ Clockwise Gapped Circle Arrow +⟴ Right Arrow With Circled Plus +⟵ Long Left Arrow +⟶ Long Right Arrow +⟷ Long Left Right Arrow +⟸ Long Left Double Arrow +⟹ Long Right Double Arrow +⟺ Long Left Right Double Arrow +⟻ Long Left Arrow From Bar +⟼ Long Right Arrow From Bar +⟽ Long Left Double Arrow From Bar +⟾ Long Right Double Arrow From Bar +⟿ Long Right Squiggle Arrow +⤀ Right Two-Headed Arrow With Vertical Stroke +⤁ Right Two-Headed Arrow With Double Vertical Stroke +⤂ Left Double Arrow With Vertical Stroke +⤃ Right Double Arrow With Vertical Stroke +⤄ Left Right Double Arrow With Vertical Stroke +⤅ Right Two-Headed Arrow From Bar +⤆ Left Double Arrow From Bar +⤇ Right Double Arrow From Bar +⤈ Down Arrow With Horizontal Stroke +⤉ Up Arrow With Horizontal Stroke +⤊ Up Triple Arrow +⤋ Down Triple Arrow +⤌ Left Double Dash Arrow +⤍ Right Double Dash Arrow +⤎ Left Triple Dash Arrow +⤏ Right Triple Dash Arrow +⤐ Right Two-Headed Triple Dash Arrow +⤑ Right Arrow With Dotted Stem +⤒ Up Arrow to Bar +⤓ Down Arrow to Bar +⤔ Right Arrow With Tail With Vertical Stroke +⤕ Right Arrow With Tail With Double Vertical Stroke +⤖ Right Two-Headed Arrow With Tail +⤗ Right Two-Headed Arrow With Tail With Vertical Stroke +⤘ Right Two-Headed Arrow With Tail With Double Vertical Stroke +⤙ Left Arrow-Tail +⤚ Right Arrow-Tail +⤛ Left Double Arrow-Tail +⤜ Right Double Arrow-Tail +⤝ Left Arrow to Black Diamond +⤞ Right Arrow to Black Diamond +⤟ Left Arrow From Bar to Black Diamond +⤠ Right Arrow From Bar to Black Diamond +⤡ North West and South East Arrow +⤢ North East and South West Arrow +⤣ North West Arrow With Hook +⤤ North East Arrow With Hook +⤥ South East Arrow With Hook +⤦ South West Arrow With Hook +⤧ North West Arrow and North East Arrow +⤨ North East Arrow and South East Arrow +⤩ South East Arrow and South West Arrow +⤪ South West Arrow and North West Arrow +⤫ Rising Diagonal Crossing Falling Diagonal +⤬ Falling Diagonal Crossing Rising Diagonal +⤭ South East Arrow Crossing North East Arrow +⤮ North East Arrow Crossing South East Arrow +⤯ Falling Diagonal Crossing North East Arrow +⤰ Rising Diagonal Crossing South East Arrow +⤱ North East Arrow Crossing North West Arrow +⤲ North West Arrow Crossing North East Arrow +⤳ Wave Arrow Pointing Directly Right +⤴ Arrow Pointing Right Then Curving Up +⤵ Arrow Pointing Right Then Curving Down +⤶ Arrow Pointing Down Then Curving Left +⤷ Arrow Pointing Down Then Curving Right +⤸ Right-Side Arc Clockwise Arrow +⤹ Left-Side Arc Anticlockwise Arrow +⤺ Top Arc Anticlockwise Arrow +⤻ Bottom Arc Anticlockwise Arrow +⤼ Top Arc Clockwise Arrow With Minus +⤽ Top Arc Anticlockwise Arrow With Plus +⤾ Lower Right Semicircular Clockwise Arrow +⤿ Lower Left Semicircular Anticlockwise Arrow +⥀ Anticlockwise Closed Circle Arrow +⥁ Clockwise Closed Circle Arrow +⥂ Right Arrow Above Short Left Arrow +⥃ Left Arrow Above Short Right Arrow +⥄ Short Right Arrow Above Left Arrow +⥅ Right Arrow With Plus Below +⥆ Left Arrow With Plus Below +⥇ Right Arrow Through X +⥈ Left Right Arrow Through Small Circle +⥉ Up Two-Headed Arrow From Small Circle +⥊ Left Barb Up Right Barb Down Harpoon +⥋ Left Barb Down Right Barb Up Harpoon +⥌ Up Barb Right Down Barb Left Harpoon +⥍ Up Barb Left Down Barb Right Harpoon +⥎ Left Barb Up Right Barb Up Harpoon +⥏ Up Barb Right Down Barb Right Harpoon +⥐ Left Barb Down Right Barb Down Harpoon +⥑ Up Barb Left Down Barb Left Harpoon +⥒ Left Harpoon With Barb Up to Bar +⥓ Right Harpoon With Barb Up to Bar +⥔ Up Harpoon With Barb Right to Bar +⥕ Down Harpoon With Barb Right to Bar +⥖ Left Harpoon With Barb Down to Bar +⥗ Right Harpoon With Barb Down to Bar +⥘ Up Harpoon With Barb Left to Bar +⥙ Down Harpoon With Barb Left to Bar +⥚ Left Harpoon With Barb Up From Bar +⥛ Right Harpoon With Barb Up From Bar +⥜ Up Harpoon With Barb Right From Bar +⥝ Down Harpoon With Barb Right From Bar +⥞ Left Harpoon With Barb Down From Bar +⥟ Right Harpoon With Barb Down From Bar +⥠ Up Harpoon With Barb Left From Bar +⥡ Down Harpoon With Barb Left From Bar +⥢ Left Harpoon With Barb Up Above Left Harpoon With Barb Down +⥣ Up Harpoon With Barb Left Beside Up Harpoon With Barb Right +⥤ Right Harpoon With Barb Up Above Right Harpoon With Barb Down +⥥ Down Harpoon With Barb Left Beside Down Harpoon With Barb Right +⥦ Left Harpoon With Barb Up Above Right Harpoon With Barb Up +⥧ Left Harpoon With Barb Down Above Right Harpoon With Barb Down +⥨ Right Harpoon With Barb Up Above Left Harpoon With Barb Up +⥩ Right Harpoon With Barb Down Above Left Harpoon With Barb Down +⥪ Left Harpoon With Barb Up Above Long Dash +⥫ Left Harpoon With Barb Down Below Long Dash +⥬ Right Harpoon With Barb Up Above Long Dash +⥭ Right Harpoon With Barb Down Below Long Dash +⥮ Up Harpoon With Barb Left Beside Down Harpoon With Barb Right +⥯ Down Harpoon With Barb Left Beside Up Harpoon With Barb Right +⥰ Right Double Arrow With Rounded Head +⥱ Equals Sign Above Right Arrow +⥲ Tilde Operator Above Right Arrow +⥳ Left Arrow Above Tilde Operator +⥴ Right Arrow Above Tilde Operator +⥵ Right Arrow Above Almost Equal To +⥶ Less-Than Above Left Arrow +⥷ Left Arrow Through Less-Than +⥸ Greater-Than Above Right Arrow +⥹ Subset Above Right Arrow +⥺ Left Arrow Through Subset +⥻ Superset Above Left Arrow +⥼ Left Fish Tail +⥽ Right Fish Tail +⥾ Up Fish Tail +⥿ Down Fish Tail +➔ Heavy Wide-Headed Right Arrow +➘ Heavy South East Arrow +➙ Heavy Right Arrow +➚ Heavy North East Arrow +➛ Drafting Point Right Arrow +➜ Heavy Round-Tipped Right Arrow +➝ Triangle-Headed Right Arrow +➞ Heavy Triangle-Headed Right Arrow +➟ Dashed Triangle-Headed Right Arrow +➠ Heavy Dashed Triangle-Headed Right Arrow +➡ Black Right Arrow +➢ Three-D Top-Lighted Right Arrowhead +➣ Three-D Bottom-Lighted Right Arrowhead +➤ Black Right Arrowhead +➥ Heavy Black Curved Down and Right Arrow +➦ Heavy Black Curved Up and Right Arrow +➧ Squat Black Right Arrow +➨ Heavy Concave-Pointed Black Right Arrow +➩ Right-Shaded White Right Arrow +➪ Left-Shaded White Right Arrow +➫ Back-Tilted Shadowed White Right Arrow +➬ Front-Tilted Shadowed White Right Arrow +➭ Heavy Lower Right-Shadowed White Right Arrow +➮ Heavy Upper Right-Shadowed White Right Arrow +➯ Notched Lower Right-Shadowed White Right Arrow +➱ Notched Upper Right-Shadowed White Right Arrow +➲ Circled Heavy White Right Arrow +➳ White-Feathered Right Arrow +➴ Black-Feathered South East Arrow +➵ Black-Feathered Right Arrow +➶ Black-Feathered North East Arrow +➷ Heavy Black-Feathered South East Arrow +➸ Heavy Black-Feathered Right Arrow +➹ Heavy Black-Feathered North East Arrow +➺ Teardrop-Barbed Right Arrow +➻ Heavy Teardrop-Shanked Right Arrow +➼ Wedge-Tailed Right Arrow +➽ Heavy Wedge-Tailed Right Arrow +➾ Open-Outlined Right Arrow 😀 grinning face 😃 grinning face with big eyes 😄 grinning face with smiling eyes diff --git a/configs/wofi/wofi-emoji-new b/configs/wofi/wofi-emoji-new new file mode 100755 index 0000000..48fd03d --- /dev/null +++ b/configs/wofi/wofi-emoji-new @@ -0,0 +1,3 @@ +#!/bin/bash + +rofimoji diff --git a/configs/wofi/wofi-emoji-old-2 b/configs/wofi/wofi-emoji-old-2 new file mode 100755 index 0000000..ee6b6f8 --- /dev/null +++ b/configs/wofi/wofi-emoji-old-2 @@ -0,0 +1,138 @@ +#!/usr/bin/env bash + +# Source: https://gist.github.com/NearHuscarl/5d366e1a3b788814bcbea62c1f66241d +# +# Use wofi to pick emoji because that's what this +# century is about apparently... +# +# Requirements: +# wofi, wlroots based compositor +# +# Usage: +# 1. Download all emoji +# $ wofi-emoji --download +# +# 2. Run it! +# $ wofi-emoji +# +# Notes: +# * You'll need a emoji font like "Noto Emoji" or "EmojiOne". +# * Confirming an item will automatically paste it WITHOUT +# writing it to your clipboard. +# * Ctrl+C will copy it to your clipboard WITHOUT pasting it. +# + +# Where to save the emojis file. +EMOJI_FILE="$HOME/.cache/emojis.txt" + +# Urls of emoji to download. +# You can remove what you don't need. +URLS=( +'https://emojipedia.org/people/' +'https://emojipedia.org/nature/' +'https://emojipedia.org/food-drink/' +'https://emojipedia.org/activity/' +'https://emojipedia.org/travel-places/' +'https://emojipedia.org/objects/' +'https://emojipedia.org/symbols/' +'https://emojipedia.org/flags/' +) + + +function notify() { + if [ "$(command -v notify-send)" ]; then + notify-send "$1" "$2" + fi +} + + +function download() { + notify "$(basename "$0")" 'Downloading all emoji for your pleasure' + + echo "" > "$EMOJI_FILE" + + for url in "${URLS[@]}"; do + echo "Downloading: $url" + + # Download the list of emoji and remove all the junk around it + emojis=$(curl -s "$url" | \ + xmllint --html \ + --xpath '//ul[@class="emoji-list"]' - 2>/dev/null) + + # Get rid of starting/closing ul tags + emojis=$(echo "$emojis" | head -n -1 | tail -n +1) + + # Extract the emoji and its description + emojis=$(echo "$emojis" | \ + sed -rn 's/.*(.*)<\/span> (.*)<\/a><\/li>/\1 \2/p') + + echo "$emojis" >> "$EMOJI_FILE" + done + + notify "$(basename "$0")" "We're all set!" +} + +function wofi_menu() { # {{{ + wofi -width 25 -lines 7 -dmenu -i -p 'emoji: ' \ + -kb-row-tab '' \ + -kb-row-select Tab \ + -kb-custom-1 Ctrl+c +} +# }}} + +function repeat() { # {{{ + local rplc str="$1" count="$2" + rplc="$(printf "%${count}s")" + echo "${rplc// /"$str"}" +} +# }}} + +function toclipboard() { # {{{ + wl-copy +} +# }}} + +function pastedirectly() { #{{{ + wtype - +} +# }}} + +function display() { + local emoji line exit_code quantifier + + emoji=$(cat "$EMOJI_FILE" | grep -v '#' | grep -v '^[[:space:]]*$') + line="$(echo "$emoji" | wofi_menu)" + exit_code=$? + + line=($line) + last=${line[${#line[@]}-1]} + quantifier="${last:${#last}-1:1}" + if [[ ! "$quantifier" =~ [0-9] ]]; then + quantifier=1 + fi + emoijs="$(repeat "${line[0]}" "$quantifier")" + + if [ $exit_code == 0 ]; then + echo -n "$emoijs" | pastedirectly + elif [ $exit_code == 10 ]; then + echo -n "$emoijs" | toclipboard + fi +} + + +# Some simple argparsing +if [[ "$1" =~ -D|--download ]]; then + download + exit 0 +elif [[ "$1" =~ -h|--help ]]; then + echo "usage: $0 [-D|--download]" + exit 0 +fi + +# Download all emoji if they don't exist yet +if [ ! -f "$EMOJI_FILE" ]; then + download +fi + +# display displays :) +display diff --git a/configs/zsh/aliases.sh b/configs/zsh/aliases.sh index 7799d69..0730510 100644 --- a/configs/zsh/aliases.sh +++ b/configs/zsh/aliases.sh @@ -9,21 +9,12 @@ alias yoink="curl" alias pls='sudo -E env "PATH=$PATH"' -alias zshi="cd ~/.dotfiles && vim configs/init.lua && cd -" -alias zshc="cd ~/.dotfiles && vim configs/.zshrc && cd -" -alias zshu="source ~/.zshrc" - alias online="ping 1.1.1.1" alias vim="nvim" alias v="nvim" -alias gs="git status" -alias gaa="git add ." -alias gpm="git push origin main" alias gcm="git commit -m " -alias czi="commitizen init cz-conventional-changelog --yarn --dev --exact" -alias cz="git-cz" alias D="run dev" alias B="run build" diff --git a/configs/zsh/functions.zsh b/configs/zsh/functions.zsh index 555688c..41df11b 100644 --- a/configs/zsh/functions.zsh +++ b/configs/zsh/functions.zsh @@ -5,8 +5,9 @@ source $(dirname "$0")/functions/wp.zsh; source $(dirname "$0")/functions/fp.zsh; source $(dirname "$0")/functions/rn.zsh; source $(dirname "$0")/functions/sum.zsh; -source $(dirname "$0")/functions/mke.zsh; source $(dirname "$0")/functions/myip.zsh; source $(dirname "$0")/functions/cht.zsh; source $(dirname "$0")/functions/dv.zsh; source $(dirname "$0")/functions/run.zsh; +source $(dirname "$0")/functions/conf.zsh; +source $(dirname "$0")/functions/note.zsh; diff --git a/configs/zsh/functions/conf.zsh b/configs/zsh/functions/conf.zsh new file mode 100644 index 0000000..0abc073 --- /dev/null +++ b/configs/zsh/functions/conf.zsh @@ -0,0 +1,27 @@ +function conf(){ + + if [ "$1" = "u" ]; then + source ~/.zshrc + else + cd ~/.dotfiles/ + + if [ "$1" != "" ]; then + cd configs + cd $1 + fi + + if [[ -f "init.lua" ]]; then + nvim init.lua + elif [[ -f ".zshrc" ]]; then + nvim .zshrc + source ~/.zshrc + elif [[ -f "config" ]]; then + nvim config + else + nvim . + fi + + + fi + +} diff --git a/configs/zsh/functions/mke.zsh b/configs/zsh/functions/mke.zsh deleted file mode 100644 index dc9dfed..0000000 --- a/configs/zsh/functions/mke.zsh +++ /dev/null @@ -1,4 +0,0 @@ -function mke(){ - mkdir -p $1 - cd $1 -} \ No newline at end of file diff --git a/configs/zsh/functions/note.zsh b/configs/zsh/functions/note.zsh new file mode 100644 index 0000000..3d87701 --- /dev/null +++ b/configs/zsh/functions/note.zsh @@ -0,0 +1,15 @@ +function note(){ + cd ~/Notes + + if [ "$1" != "" ]; then + cd $1 + fi + + if [[ -f "index.md" ]]; then + nvim index.md + else + nvim . + fi +} + +compctl -/ -W ~/Notes/$@ note diff --git a/configs/zsh/functions/run.zsh b/configs/zsh/functions/run.zsh index 01b8c68..4c83701 100644 --- a/configs/zsh/functions/run.zsh +++ b/configs/zsh/functions/run.zsh @@ -1,11 +1,7 @@ function run(){ - HAS_MAKE="$(ls | grep Makefile)" - HAS_PACKAGE="$(ls | grep package.json)" - - if [ "$HAS_PACKAGE" != "" ]; then + if [[ -f "package.json" ]]; then pnpm $1 - elif [ "$HAS_MAKE" != "" ]; then + elif [[ -f "Makefile" ]]; then make $1 fi - }