diff --git a/.zshrc b/.zshrc deleted file mode 100644 index 6bb491d..0000000 --- a/.zshrc +++ /dev/null @@ -1,162 +0,0 @@ -if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then - source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" -fi - -# The following lines were added by compinstall -zstyle :compinstall filename '$HOME/.zshrc' - -autoload -Uz compinit -compinit -########## - -HISTFILE=~/.histfile -HISTSIZE=1000 -SAVEHIST=1000 -# End of lines configured by zsh-newuser-install -# -source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh -source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme - -# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh -typeset -g POWERLEVEL9K_INSTANT_PROMPT=quiet - -export PATH=$PATH:~/.local/bin -export PATH=$PATH:~/.cargo/bin -export GPG_TTY=$TTY -export TEXMFHOME=$HOME/.texmf -export MANGOHUD_CONFIG=position=top-right,font_scale=0.7,round_corners=10.0 -export MOZ_ENABLE_WAYLAND=1 -export QT_AUTO_SCREEN_SCALE_FACTOR=0 -export VISUAL=nvim; -export EDITOR=nvim; - -alias sudo='sudo ' -alias ls='lsd' -alias :q='exit' -alias gh='git push origin' -alias gl='git pull origin' -alias gm='git commit -m' -alias ga="git add -A" -alias g+='bear -- g++ -Wextra -Werror -std=c++20' -alias s="kitty +kitten ssh" - -# zoxide -## ============================================================================= -# -# Utility functions for zoxide. -# - -# pwd based on the value of _ZO_RESOLVE_SYMLINKS. -function __zoxide_pwd() { - \builtin pwd -L -} - -# cd + custom logic based on the value of _ZO_ECHO. -function __zoxide_cd() { - # shellcheck disable=SC2164 - \builtin cd -- "$@" >/dev/null -} - -# ============================================================================= -# -# Hook configuration for zoxide. -# - -# Hook to add new entries to the database. -function __zoxide_hook() { - # shellcheck disable=SC2312 - \command zoxide add -- "$(__zoxide_pwd)" -} - -# Initialize hook. -# shellcheck disable=SC2154 -if [[ ${precmd_functions[(Ie)__zoxide_hook]:-} -eq 0 ]] && [[ ${chpwd_functions[(Ie)__zoxide_hook]:-} -eq 0 ]]; then - chpwd_functions+=(__zoxide_hook) -fi - -# ============================================================================= -# -# When using zoxide with --no-cmd, alias these internal functions as desired. -# - -__zoxide_z_prefix='z#' - -# Jump to a directory using only keywords. -function __zoxide_z() { - # shellcheck disable=SC2199 - if [[ "$#" -eq 0 ]]; then - __zoxide_cd ~ - elif [[ "$#" -eq 1 ]] && { [[ -d "$1" ]] || [[ "$1" = '-' ]] || [[ "$1" =~ ^[-+][0-9]$ ]]; }; then - __zoxide_cd "$1" - elif [[ "$@[-1]" == "${__zoxide_z_prefix}"* ]]; then - # shellcheck disable=SC2124 - \builtin local result="${@[-1]}" - __zoxide_cd "${result:${#__zoxide_z_prefix}}" - else - \builtin local result - # shellcheck disable=SC2312 - result="$(\command zoxide query --exclude "$(__zoxide_pwd)" -- "$@")" && - __zoxide_cd "${result}" - fi -} - -# Jump to a directory using interactive search. -function __zoxide_zi() { - \builtin local result - result="$(\command zoxide query -i -- "$@")" && __zoxide_cd "${result}" -} - -# ============================================================================= -# -# Commands for zoxide. Disable these using --no-cmd. -# - -\builtin unalias z &>/dev/null || \builtin true -function z() { - __zoxide_z "$@" -} - -\builtin unalias zi &>/dev/null || \builtin true -function zi() { - __zoxide_zi "$@" -} - -if [[ -o zle ]]; then - function __zoxide_z_complete() { - # Only show completions when the cursor is at the end of the line. - # shellcheck disable=SC2154 - [[ "${#words[@]}" -eq "${CURRENT}" ]] || return - - if [[ "${#words[@]}" -eq 2 ]]; then - _files -/ - elif [[ "${words[-1]}" == '' ]]; then - \builtin local result - # shellcheck disable=SC2086,SC2312 - if result="$(\command zoxide query --exclude "$(__zoxide_pwd)" -i -- ${words[2,-1]})"; then - __zoxide_result="${result}" - else - __zoxide_result='' - fi - \builtin printf '\e[5n' - fi - } - - function __zoxide_z_complete_helper() { - \builtin local result="${__zoxide_z_prefix}${__zoxide_result}" - # shellcheck disable=SC2296 - [[ -n "${__zoxide_result}" ]] && LBUFFER="${LBUFFER}${(q-)result}" - \builtin zle reset-prompt - } - - \builtin zle -N __zoxide_z_complete_helper - \builtin bindkey "\e[0n" __zoxide_z_complete_helper - if [[ "${+functions[compdef]}" -ne 0 ]]; then - \compdef -d z - \compdef -d zi - \compdef __zoxide_z_complete z - fi -fi - -# ============================================================================= diff --git a/README.md b/README.md deleted file mode 100644 index 72a49a0..0000000 --- a/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# dotFiles - -## General -Personal Dotfiles with many being combined together to get this, and other things coming from myself directly. - -## [Keymaps](nvim/README.md) -## [Packages](scripts/README.md) diff --git a/anyrun/config.ron b/anyrun/config.ron deleted file mode 100644 index 9954bd4..0000000 --- a/anyrun/config.ron +++ /dev/null @@ -1,35 +0,0 @@ -Config( - // `width` and `vertical_offset` use an enum for the value it can be either: - // Absolute(n): The absolute value in pixels - // Fraction(n): A fraction of the width or height of the full screen (depends on exclusive zones and the settings related to them) window respectively - - // How wide the input box and results are. - width: Absolute(800), - - // Where Anyrun is located on the screen: Top, Center - position: Center, - - // How much the runner is shifted vertically - vertical_offset: Absolute(0), - - // Hide match and plugin info icons - hide_icons: false, - - // ignore exclusive zones, f.e. Waybar - ignore_exclusive_zones: false, - - // Layer shell layer: Background, Bottom, Top, Overlay - layer: Overlay, - - // Hide the plugin info panel - hide_plugin_info: false, - - // List of plugins to be loaded by default, can be specified with a relative path to be loaded from the - // `/plugins` directory or with an absolute path to just load the file the path points to. - plugins: [ - "libapplications.so", - "libshell.so", - "librink.so", - "libanyrun_websearch.so" - ], -) diff --git a/anyrun/config.ron b/anyrun/config.ron new file mode 120000 index 0000000..8996a77 --- /dev/null +++ b/anyrun/config.ron @@ -0,0 +1 @@ +/nix/store/3l33jmknaxv3ri2f9qxcp3kb7vsszk6k-home-manager-files/.config/anyrun/config.ron \ No newline at end of file diff --git a/anyrun/plugins/libanyrun_websearch.so b/anyrun/plugins/libanyrun_websearch.so deleted file mode 100755 index 956091d..0000000 Binary files a/anyrun/plugins/libanyrun_websearch.so and /dev/null differ diff --git a/anyrun/plugins/libapplications.so b/anyrun/plugins/libapplications.so deleted file mode 100755 index 3a7ab5e..0000000 Binary files a/anyrun/plugins/libapplications.so and /dev/null differ diff --git a/anyrun/plugins/libkidex.so b/anyrun/plugins/libkidex.so deleted file mode 100755 index 75aba92..0000000 Binary files a/anyrun/plugins/libkidex.so and /dev/null differ diff --git a/anyrun/plugins/librink.so b/anyrun/plugins/librink.so deleted file mode 100755 index 58de8f5..0000000 Binary files a/anyrun/plugins/librink.so and /dev/null differ diff --git a/anyrun/plugins/libshell.so b/anyrun/plugins/libshell.so deleted file mode 100755 index e7341cb..0000000 Binary files a/anyrun/plugins/libshell.so and /dev/null differ diff --git a/anyrun/plugins/libsymbols.so b/anyrun/plugins/libsymbols.so deleted file mode 100755 index e1630ea..0000000 Binary files a/anyrun/plugins/libsymbols.so and /dev/null differ diff --git a/anyrun/plugins/libtranslate.so b/anyrun/plugins/libtranslate.so deleted file mode 100755 index 232a238..0000000 Binary files a/anyrun/plugins/libtranslate.so and /dev/null differ diff --git a/anyrun/style.css b/anyrun/style.css deleted file mode 100644 index 43f7385..0000000 --- a/anyrun/style.css +++ /dev/null @@ -1,47 +0,0 @@ - -#window { - border-radius: 10px; - background-color: none; -} - -box#main { - border-radius: 10px; -} - -list#main { - border-radius: 10px; - margin: 0px 10px 10px 10px; -} - -list#plugin { - border-radius: 10px; -} - -list#match { - border-radius: 10px; -} - -entry#entry { - border: none; - border-radius: 10px; - margin: 10px 10px 0px 10px; -} - -label#match-desc { - font-size: 12px; - border-radius: 10px; -} - -label#match-title { - font-size: 12px; - border-radius: 10px; -} - -label#plugin { - font-size: 16px; - border-radius: 10px; -} - -* { - border-radius: 10px; -} diff --git a/anyrun/style.css b/anyrun/style.css new file mode 120000 index 0000000..207a277 --- /dev/null +++ b/anyrun/style.css @@ -0,0 +1 @@ +/nix/store/3l33jmknaxv3ri2f9qxcp3kb7vsszk6k-home-manager-files/.config/anyrun/style.css \ No newline at end of file diff --git a/anyrun/websearch.ron b/anyrun/websearch.ron deleted file mode 100644 index 67dc035..0000000 --- a/anyrun/websearch.ron +++ /dev/null @@ -1,6 +0,0 @@ -Config ( - prefix_url_map: { - ":g": "https://google.com/search?q=", - ":b": "https://search.brave.com/search?q=", - } -) diff --git a/copy_dotfiles.sh b/copy_dotfiles.sh old mode 100644 new mode 100755 index b66563d..ac84113 --- a/copy_dotfiles.sh +++ b/copy_dotfiles.sh @@ -1,7 +1,8 @@ find $PWD -maxdepth 1 -mindepth 0 -exec ln -s '{}' $HOME/.config/ \; -mv $HOME/.config/.zshrc ../.zshrc unlink $HOME/.config/.git unlink $HOME/.config/.gitignore unlink $HOME/.config/README.md unlink $HOME/.config/setup.sh +unlink $HOME/.config/copy_dotfiles.sh unlink $HOME/.config/dotFiles + diff --git a/copyq/copyq-bak.conf b/copyq/copyq-bak.conf deleted file mode 100644 index 6ae5aec..0000000 --- a/copyq/copyq-bak.conf +++ /dev/null @@ -1,216 +0,0 @@ -[General] -plugin_priority=itemimage, itemencrypted, itemfakevim, itemnotes, itempinned, itemsync, itemtags, itemtext - -[Options] -activate_closes=true -activate_focuses=true -activate_item_with_single_click=false -activate_pastes=true -always_on_top=false -autocompletion=true -autostart=false -change_clipboard_owner_delay_ms=150 -check_clipboard=true -check_selection=false -clipboard_notification_lines=0 -clipboard_tab=&clipboard -close_on_unfocus=false -close_on_unfocus_delay_ms=500 -command_history_size=100 -confirm_exit=true -copy_clipboard=false -copy_selection=false -disable_tray=false -edit_ctrl_return=true -editor=gedit --standalone -- %1 -expire_tab=0 -filter_case_insensitive=true -filter_regular_expression=false -hide_main_window=true -hide_main_window_in_task_bar=false -hide_tabs=false -hide_toolbar=false -hide_toolbar_labels=true -item_popup_interval=0 -language=en -max_process_manager_rows=1000 -maxitems=200 -move=true -native_menu_bar=true -native_notifications=true -native_tray_menu=false -notification_horizontal_offset=10 -notification_maximum_height=100 -notification_maximum_width=300 -notification_position=3 -notification_vertical_offset=10 -number_search=false -open_windows_on_current_screen=true -restore_geometry=true -row_index_from_one=true -run_selection=true -save_delay_ms_on_item_added=300000 -save_delay_ms_on_item_edited=1000 -save_delay_ms_on_item_modified=300000 -save_delay_ms_on_item_moved=1800000 -save_delay_ms_on_item_removed=600000 -save_filter_history=false -save_on_app_deactivated=true -script_paste_delay_ms=250 -show_advanced_command_settings=false -show_simple_items=false -show_tab_item_count=false -style= -tab_tree=false -tabs=&clipboard -text_tab_width=8 -text_wrap=true -transparency=0 -transparency_focused=0 -tray_commands=true -tray_images=true -tray_item_paste=true -tray_items=5 -tray_menu_open_on_left_click=false -tray_tab= -tray_tab_is_current=true -vi=false -window_key_press_time_ms=50 -window_paste_with_ctrl_v_regex= -window_wait_after_raised_ms=50 -window_wait_before_raise_ms=20 -window_wait_for_modifier_released_ms=2000 -window_wait_raised_ms=150 - -[Plugins] -itemencrypted\enabled=true -itemfakevim\enabled=true -itemimage\enabled=true -itemimage\image_editor= -itemimage\max_image_height=240 -itemimage\max_image_width=320 -itemimage\svg_editor= -itemnotes\enabled=true -itempinned\enabled=true -itemsync\enabled=true -itemtags\enabled=true -itemtext\enabled=true - -[Shortcuts] -about=shift+f1 -change_tab_icon=ctrl+shift+t -commands=f6 -copy_selected_items=ctrl+c -delete_item=del -edit=f2 -edit_notes=shift+f2 -editor=ctrl+e -editor_background= -editor_bold=ctrl+b -editor_cancel=esc -editor_erase_style= -editor_font= -editor_foreground= -editor_italic=ctrl+i -editor_redo=ctrl+shift+z -editor_save=f2 -editor_search=ctrl+f -editor_strikethrough= -editor_underline=ctrl+u -editor_undo=ctrl+z -exit=ctrl+q -export=ctrl+s -find_items=ctrl+g -help=f1 -import=ctrl+i -item-menu=shift+f10 -move_down=ctrl+down -move_to_bottom=ctrl+end -move_to_clipboard= -move_to_top=ctrl+home -move_up=ctrl+up -new=ctrl+n -new_tab=ctrl+t -next_tab=right -paste_selected_items=ctrl+v -preferences=ctrl+p -previous_tab=left -process_manager=ctrl+shift+z -remove_tab=ctrl+w -rename_tab=ctrl+f2 -reverse_selected_items=ctrl+shift+r -show-log=f12 -show_clipboard_content=ctrl+shift+c -show_item_content=f4 -show_item_preview=f7 -sort_selected_items=ctrl+shift+s -system-run=f5 -toggle_clipboard_storing=ctrl+shift+x - -[Tabs] -1\icon= -1\max_item_count=0 -1\name=&clipboard -1\store_items=true -size=1 - -[Theme] -alt_bg=default_alt_bg -alt_item_css= -bg=default_bg -css= -css_template_items=items -css_template_main_window=main_window -css_template_menu=menu -css_template_notification=notification -cur_item_css="\n ;border: 0.1em solid ${sel_bg}" -edit_bg=default_bg -edit_fg=default_text -edit_font= -fg=default_text -find_bg=#ff0 -find_fg=#000 -find_font= -font= -font_antialiasing=true -hover_item_css= -icon_size=16 -item_css= -item_spacing= -menu_bar_css="\n ;background: ${bg}\n ;color: ${fg}" -menu_bar_disabled_css="\n ;color: ${bg - #666}" -menu_bar_selected_css="\n ;background: ${sel_bg}\n ;color: ${sel_fg}" -menu_css="\n ;border: 1px solid ${sel_bg}\n ;background: ${bg}\n ;color: ${fg}" -notes_bg=default_tooltip_bg -notes_css= -notes_fg=default_tooltip_text -notes_font= -notification_bg=#333 -notification_fg=#ddd -notification_font= -num_fg=default_placeholder_text -num_font= -num_margin=2 -search_bar="\n ;background: ${edit_bg}\n ;color: ${edit_fg}\n ;border: 1px solid ${alt_bg}\n ;margin: 2px" -search_bar_focused="\n ;border: 1px solid ${sel_bg}" -sel_bg=default_highlight_bg -sel_fg=default_highlight_text -sel_item_css= -show_number=true -show_scrollbars=true -style_main_window=false -tab_bar_css="\n ;background: ${bg - #222}" -tab_bar_item_counter="\n ;color: ${fg - #044 + #400}\n ;font-size: 6pt" -tab_bar_scroll_buttons_css="\n ;background: ${bg - #222}\n ;color: ${fg}\n ;border: 0" -tab_bar_sel_item_counter="\n ;color: ${sel_bg - #044 + #400}" -tab_bar_tab_selected_css="\n ;padding: 0.5em\n ;background: ${bg}\n ;border: 0.05em solid ${bg}\n ;color: ${fg}" -tab_bar_tab_unselected_css="\n ;border: 0.05em solid ${bg}\n ;padding: 0.5em\n ;background: ${bg - #222}\n ;color: ${fg - #333}" -tab_tree_css="\n ;color: ${fg}\n ;background-color: ${bg}" -tab_tree_item_counter="\n ;color: ${fg - #044 + #400}\n ;font-size: 6pt" -tab_tree_sel_item_counter="\n ;color: ${sel_fg - #044 + #400}" -tab_tree_sel_item_css="\n ;color: ${sel_fg}\n ;background-color: ${sel_bg}\n ;border-radius: 2px" -tool_bar_css="\n ;color: ${fg}\n ;background-color: ${bg}\n ;border: 0" -tool_button_css="\n ;color: ${fg}\n ;background: ${bg}\n ;border: 0\n ;border-radius: 2px" -tool_button_pressed_css="\n ;background: ${sel_bg}" -tool_button_selected_css="\n ;background: ${sel_bg - #222}\n ;color: ${sel_fg}\n ;border: 1px solid ${sel_bg}" -use_system_icons=false diff --git a/copyq/copyq-commands.ini b/copyq/copyq-commands.ini deleted file mode 100644 index ae62c0a..0000000 --- a/copyq/copyq-commands.ini +++ /dev/null @@ -1,44 +0,0 @@ -[Commands] -1\Command=copyq: plugins.itempinned.pin() -1\Icon=\xf08d -1\InMenu=true -1\Input=!OUTPUT -1\InternalId=copyq_pinned_pin -1\Name=Pin -1\Output=application/x-copyq-item-pinned -2\Command=copyq: plugins.itempinned.unpin() -2\Icon=\xf08d -2\InMenu=true -2\Input=application/x-copyq-item-pinned -2\InternalId=copyq_pinned_unpin -2\Name=Unpin -3\Command=copyq: plugins.itemtags.tag(decodeURIComponent('Important')) -3\Icon=\xf02b -3\InMenu=true -3\InternalId=copyq_tags_tag:Important -3\MatchCommand=copyq: plugins.itemtags.hasTag(decodeURIComponent('Important')) && fail() -3\Name=Tag as \x201cImportant\x201d -4\Command=copyq: plugins.itemtags.untag(decodeURIComponent('Important')) -4\Icon=\xf02b -4\InMenu=true -4\InternalId=copyq_tags_untag:Important -4\MatchCommand=copyq: plugins.itemtags.hasTag(decodeURIComponent('Important')) || fail() -4\Name=Remove tag \x201cImportant\x201d -5\Command=copyq: plugins.itemtags.tag() -5\Icon=\xf02b -5\InMenu=true -5\InternalId=copyq_tags_tag -5\Name=Add a Tag -6\Command=copyq: plugins.itemtags.untag() -6\Icon=\xf02b -6\InMenu=true -6\Input=application/x-copyq-tags -6\InternalId=copyq_tags_untag -6\Name=Remove a Tag -7\Command=copyq: plugins.itemtags.clearTags() -7\Icon=\xf02b -7\InMenu=true -7\Input=application/x-copyq-tags -7\InternalId=copyq_tags_clear -7\Name=Clear all tags -size=7 diff --git a/copyq/copyq-commands.ini.bak b/copyq/copyq-commands.ini.bak deleted file mode 100644 index ae62c0a..0000000 --- a/copyq/copyq-commands.ini.bak +++ /dev/null @@ -1,44 +0,0 @@ -[Commands] -1\Command=copyq: plugins.itempinned.pin() -1\Icon=\xf08d -1\InMenu=true -1\Input=!OUTPUT -1\InternalId=copyq_pinned_pin -1\Name=Pin -1\Output=application/x-copyq-item-pinned -2\Command=copyq: plugins.itempinned.unpin() -2\Icon=\xf08d -2\InMenu=true -2\Input=application/x-copyq-item-pinned -2\InternalId=copyq_pinned_unpin -2\Name=Unpin -3\Command=copyq: plugins.itemtags.tag(decodeURIComponent('Important')) -3\Icon=\xf02b -3\InMenu=true -3\InternalId=copyq_tags_tag:Important -3\MatchCommand=copyq: plugins.itemtags.hasTag(decodeURIComponent('Important')) && fail() -3\Name=Tag as \x201cImportant\x201d -4\Command=copyq: plugins.itemtags.untag(decodeURIComponent('Important')) -4\Icon=\xf02b -4\InMenu=true -4\InternalId=copyq_tags_untag:Important -4\MatchCommand=copyq: plugins.itemtags.hasTag(decodeURIComponent('Important')) || fail() -4\Name=Remove tag \x201cImportant\x201d -5\Command=copyq: plugins.itemtags.tag() -5\Icon=\xf02b -5\InMenu=true -5\InternalId=copyq_tags_tag -5\Name=Add a Tag -6\Command=copyq: plugins.itemtags.untag() -6\Icon=\xf02b -6\InMenu=true -6\Input=application/x-copyq-tags -6\InternalId=copyq_tags_untag -6\Name=Remove a Tag -7\Command=copyq: plugins.itemtags.clearTags() -7\Icon=\xf02b -7\InMenu=true -7\Input=application/x-copyq-tags -7\InternalId=copyq_tags_clear -7\Name=Clear all tags -size=7 diff --git a/copyq/copyq-filter.ini b/copyq/copyq-filter.ini deleted file mode 100644 index 50b0ec1..0000000 --- a/copyq/copyq-filter.ini +++ /dev/null @@ -1,2 +0,0 @@ -[General] -filter_history=@Invalid() diff --git a/copyq/copyq-monitor.ini b/copyq/copyq-monitor.ini deleted file mode 100644 index bff2024..0000000 --- a/copyq/copyq-monitor.ini +++ /dev/null @@ -1,2 +0,0 @@ -[General] -running=true diff --git a/copyq/copyq-monitor.ini.lock b/copyq/copyq-monitor.ini.lock deleted file mode 100644 index f757675..0000000 --- a/copyq/copyq-monitor.ini.lock +++ /dev/null @@ -1,5 +0,0 @@ -85151 -copyq -spaceship -a10dc6f271ba47d988a3b282250928e2 -7a5c3018-9d8d-4024-8ca6-df464de8b3dd diff --git a/copyq/copyq.conf b/copyq/copyq.conf deleted file mode 100644 index 2430b72..0000000 --- a/copyq/copyq.conf +++ /dev/null @@ -1,216 +0,0 @@ -[General] -plugin_priority=itemimage, itemencrypted, itemfakevim, itemnotes, itempinned, itemsync, itemtags, itemtext - -[Options] -activate_closes=true -activate_focuses=true -activate_item_with_single_click=true -activate_pastes=true -always_on_top=true -autocompletion=true -autostart=false -change_clipboard_owner_delay_ms=150 -check_clipboard=true -check_selection=false -clipboard_notification_lines=0 -clipboard_tab=&clipboard -close_on_unfocus=false -close_on_unfocus_delay_ms=500 -command_history_size=100 -confirm_exit=true -copy_clipboard=false -copy_selection=true -disable_tray=false -edit_ctrl_return=true -editor=gedit --standalone -- %1 -expire_tab=0 -filter_case_insensitive=true -filter_regular_expression=false -hide_main_window=true -hide_main_window_in_task_bar=false -hide_tabs=false -hide_toolbar=false -hide_toolbar_labels=true -item_popup_interval=0 -language=en -max_process_manager_rows=1000 -maxitems=200 -move=true -native_menu_bar=true -native_notifications=true -native_tray_menu=false -notification_horizontal_offset=10 -notification_maximum_height=100 -notification_maximum_width=300 -notification_position=3 -notification_vertical_offset=10 -number_search=false -open_windows_on_current_screen=true -restore_geometry=true -row_index_from_one=true -run_selection=true -save_delay_ms_on_item_added=300000 -save_delay_ms_on_item_edited=1000 -save_delay_ms_on_item_modified=300000 -save_delay_ms_on_item_moved=1800000 -save_delay_ms_on_item_removed=600000 -save_filter_history=false -save_on_app_deactivated=true -script_paste_delay_ms=250 -show_advanced_command_settings=false -show_simple_items=false -show_tab_item_count=false -style= -tab_tree=false -tabs=&clipboard -text_tab_width=8 -text_wrap=true -transparency=0 -transparency_focused=0 -tray_commands=true -tray_images=true -tray_item_paste=true -tray_items=5 -tray_menu_open_on_left_click=false -tray_tab= -tray_tab_is_current=true -vi=false -window_key_press_time_ms=50 -window_paste_with_ctrl_v_regex= -window_wait_after_raised_ms=50 -window_wait_before_raise_ms=20 -window_wait_for_modifier_released_ms=2000 -window_wait_raised_ms=150 - -[Plugins] -itemencrypted\enabled=true -itemfakevim\enabled=true -itemimage\enabled=true -itemimage\image_editor= -itemimage\max_image_height=240 -itemimage\max_image_width=320 -itemimage\svg_editor= -itemnotes\enabled=true -itempinned\enabled=true -itemsync\enabled=true -itemtags\enabled=true -itemtext\enabled=true - -[Shortcuts] -about=shift+f1 -change_tab_icon=ctrl+shift+t -commands=f6 -copy_selected_items=ctrl+c -delete_item=del -edit=f2 -edit_notes=shift+f2 -editor=ctrl+e -editor_background= -editor_bold=ctrl+b -editor_cancel=esc -editor_erase_style= -editor_font= -editor_foreground= -editor_italic=ctrl+i -editor_redo=ctrl+shift+z -editor_save=f2 -editor_search=ctrl+f -editor_strikethrough= -editor_underline=ctrl+u -editor_undo=ctrl+z -exit=ctrl+q -export=ctrl+s -find_items=ctrl+g -help=f1 -import=ctrl+i -item-menu=shift+f10 -move_down=ctrl+down -move_to_bottom=ctrl+end -move_to_clipboard= -move_to_top=ctrl+home -move_up=ctrl+up -new=ctrl+n -new_tab=ctrl+t -next_tab=right -paste_selected_items=ctrl+v -preferences=ctrl+p -previous_tab=left -process_manager=ctrl+shift+z -remove_tab=ctrl+w -rename_tab=ctrl+f2 -reverse_selected_items=ctrl+shift+r -show-log=f12 -show_clipboard_content=ctrl+shift+c -show_item_content=f4 -show_item_preview=f7 -sort_selected_items=ctrl+shift+s -system-run=f5 -toggle_clipboard_storing=ctrl+shift+x - -[Tabs] -1\icon= -1\max_item_count=0 -1\name=&clipboard -1\store_items=true -size=1 - -[Theme] -alt_bg=default_alt_bg -alt_item_css= -bg=default_bg -css= -css_template_items=items -css_template_main_window=main_window -css_template_menu=menu -css_template_notification=notification -cur_item_css="\n ;border: 0.1em solid ${sel_bg}" -edit_bg=default_bg -edit_fg=default_text -edit_font= -fg=default_text -find_bg=#ff0 -find_fg=#000 -find_font= -font= -font_antialiasing=true -hover_item_css= -icon_size=16 -item_css= -item_spacing= -menu_bar_css="\n ;background: ${bg}\n ;color: ${fg}" -menu_bar_disabled_css="\n ;color: ${bg - #666}" -menu_bar_selected_css="\n ;background: ${sel_bg}\n ;color: ${sel_fg}" -menu_css="\n ;border: 1px solid ${sel_bg}\n ;background: ${bg}\n ;color: ${fg}" -notes_bg=default_tooltip_bg -notes_css= -notes_fg=default_tooltip_text -notes_font= -notification_bg=#333 -notification_fg=#ddd -notification_font= -num_fg=default_placeholder_text -num_font= -num_margin=2 -search_bar="\n ;background: ${edit_bg}\n ;color: ${edit_fg}\n ;border: 1px solid ${alt_bg}\n ;margin: 2px" -search_bar_focused="\n ;border: 1px solid ${sel_bg}" -sel_bg=default_highlight_bg -sel_fg=default_highlight_text -sel_item_css= -show_number=true -show_scrollbars=true -style_main_window=false -tab_bar_css="\n ;background: ${bg - #222}" -tab_bar_item_counter="\n ;color: ${fg - #044 + #400}\n ;font-size: 6pt" -tab_bar_scroll_buttons_css="\n ;background: ${bg - #222}\n ;color: ${fg}\n ;border: 0" -tab_bar_sel_item_counter="\n ;color: ${sel_bg - #044 + #400}" -tab_bar_tab_selected_css="\n ;padding: 0.5em\n ;background: ${bg}\n ;border: 0.05em solid ${bg}\n ;color: ${fg}" -tab_bar_tab_unselected_css="\n ;border: 0.05em solid ${bg}\n ;padding: 0.5em\n ;background: ${bg - #222}\n ;color: ${fg - #333}" -tab_tree_css="\n ;color: ${fg}\n ;background-color: ${bg}" -tab_tree_item_counter="\n ;color: ${fg - #044 + #400}\n ;font-size: 6pt" -tab_tree_sel_item_counter="\n ;color: ${sel_fg - #044 + #400}" -tab_tree_sel_item_css="\n ;color: ${sel_fg}\n ;background-color: ${sel_bg}\n ;border-radius: 2px" -tool_bar_css="\n ;color: ${fg}\n ;background-color: ${bg}\n ;border: 0" -tool_button_css="\n ;color: ${fg}\n ;background: ${bg}\n ;border: 0\n ;border-radius: 2px" -tool_button_pressed_css="\n ;background: ${sel_bg}" -tool_button_selected_css="\n ;background: ${sel_bg - #222}\n ;color: ${sel_fg}\n ;border: 1px solid ${sel_bg}" -use_system_icons=false diff --git a/copyq/copyq.pub b/copyq/copyq.pub deleted file mode 100644 index a32e7f1..0000000 Binary files a/copyq/copyq.pub and /dev/null differ diff --git a/dashie.json b/dashie.json deleted file mode 100644 index 7e3e561..0000000 --- a/dashie.json +++ /dev/null @@ -1,491 +0,0 @@ -{ - "version": 1, - "notes": "", - "documentation": "\"This file is a QMK Configurator export. You can import this at . It can also be used directly with QMK's source code.\n\nTo setup your QMK environment check out the tutorial: \n\nYou can convert this file to a keymap.c using this command: `qmk json2c {keymap}`\n\nYou can compile this keymap using this command: `qmk compile {keymap}`\"\n", - "keyboard": "rgbkb/sol3/rev1", - "keymap": "dashie", - "layout": "LAYOUT", - "layers": [ - [ - "KC_ESC", - "KC_1", - "KC_2", - "KC_3", - "KC_4", - "KC_5", - "KC_MINS", - "KC_EQL", - "KC_6", - "KC_7", - "KC_8", - "KC_9", - "KC_0", - "KC_BSPC", - "KC_TAB", - "KC_Q", - "KC_W", - "KC_E", - "KC_R", - "KC_T", - "KC_LBRC", - "KC_RBRC", - "KC_Y", - "KC_U", - "KC_I", - "KC_O", - "KC_P", - "KC_BSLS", - "MO(1)", - "KC_A", - "KC_S", - "KC_D", - "KC_F", - "KC_G", - "KC_LPRN", - "KC_RPRN", - "KC_H", - "KC_J", - "KC_K", - "KC_L", - "KC_SCLN", - "KC_QUOT", - "KC_LSFT", - "KC_Z", - "KC_X", - "KC_C", - "KC_V", - "KC_B", - "KC_LCBR", - "KC_RCBR", - "KC_N", - "KC_M", - "KC_COMM", - "KC_DOT", - "KC_SLSH", - "KC_GRV", - "KC_LCTL", - "MO(4)", - "RGB_TOG", - "KC_LALT", - "KC_LGUI", - "KC_SPC", - "KC_PGDN", - "KC_DEL", - "KC_BSPC", - "KC_PGUP", - "KC_ENT", - "KC_RCTL", - "KC_RALT", - "KC_CAPS", - "KC_HOME", - "KC_RCTL", - "KC_VOLD", - "KC_VOLU", - "KC_VOLD", - "KC_VOLU", - "KC_VOLD", - "KC_VOLU", - "KC_VOLD", - "KC_VOLU", - "KC_VOLD", - "KC_VOLU", - "KC_VOLD", - "KC_VOLU", - "KC_VOLD", - "KC_VOLU", - "KC_MNXT", - "KC_MPLY", - "KC_MPRV", - "KC_VOLD", - "KC_VOLU", - "KC_MNXT", - "KC_MPLY", - "KC_MPRV" - ], - [ - "KC_ESC", - "KC_F1", - "KC_F2", - "KC_F3", - "KC_F4", - "KC_F5", - "KC_F6", - "KC_F7", - "KC_F8", - "KC_F9", - "KC_F10", - "KC_F11", - "KC_F12", - "KC_DEL", - "KC_TRNS", - "KC_MPRV", - "KC_MNXT", - "KC_MPLY", - "KC_MUTE", - "KC_G", - "KC_TRNS", - "KC_TRNS", - "KC_BTN2", - "KC_MS_L", - "KC_MS_D", - "KC_MS_U", - "KC_MS_R", - "KC_BTN1", - "KC_TRNS", - "KC_VOLD", - "KC_VOLU", - "KC_S", - "KC_T", - "KC_D", - "KC_TRNS", - "KC_TRNS", - "KC_H", - "KC_LEFT", - "KC_DOWN", - "KC_UP", - "KC_RGHT", - "KC_TRNS", - "KC_TRNS", - "KC_Z", - "KC_X", - "KC_C", - "KC_V", - "KC_B", - "KC_TRNS", - "KC_TRNS", - "KC_K", - "KC_M", - "KC_COMM", - "KC_DOT", - "KC_SLSH", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_CAPS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS" - ], - [ - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_F1", - "KC_F5", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_Q", - "KC_W", - "KC_E", - "KC_R", - "KC_T", - "KC_F2", - "KC_F6", - "KC_Y", - "KC_U", - "KC_I", - "KC_O", - "KC_P", - "KC_TRNS", - "KC_TRNS", - "KC_A", - "KC_S", - "KC_D", - "KC_F", - "KC_G", - "KC_F3", - "KC_F7", - "KC_H", - "KC_J", - "KC_K", - "KC_L", - "KC_SCLN", - "KC_TRNS", - "KC_TRNS", - "KC_Z", - "KC_X", - "KC_C", - "KC_V", - "KC_B", - "KC_F4", - "KC_F8", - "KC_N", - "KC_M", - "KC_COMM", - "KC_DOT", - "KC_SLSH", - "KC_TRNS", - "KC_TRNS", - "KC_NO", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS" - ], - [ - "KC_TRNS", - "KC_F1", - "KC_F2", - "KC_F3", - "KC_F4", - "KC_F5", - "KC_F11", - "KC_F12", - "KC_F6", - "KC_F7", - "KC_F8", - "KC_F9", - "KC_F10", - "KC_TRNS", - "KC_TRNS", - "KC_HOME", - "KC_UP", - "KC_END", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_HOME", - "KC_UP", - "KC_END", - "KC_PSCR", - "KC_PGUP", - "KC_TRNS", - "KC_LEFT", - "KC_DOWN", - "KC_RGHT", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_LEFT", - "KC_DOWN", - "KC_RGHT", - "KC_INS", - "KC_PGDN", - "KC_TRNS", - "ANY(AU_TOGG)", - "ANY(MU_TOGG)", - "ANY(MU_NEXT)", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "ANY(CK_TOGG)", - "ANY(CK_UP)", - "ANY(CK_DOWN)", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_MPLY", - "KC_MNXT", - "KC_MUTE", - "KC_VOLD", - "KC_VOLU", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS" - ], - [ - "KC_TRNS", - "KC_F1", - "KC_F2", - "KC_F3", - "KC_F4", - "KC_F5", - "KC_F11", - "KC_F12", - "KC_F6", - "KC_F7", - "KC_F8", - "KC_F9", - "KC_F10", - "KC_TRNS", - "KC_TRNS", - "RGB_SAD", - "RGB_VAI", - "RGB_SAI", - "QK_BOOT", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_P7", - "KC_P8", - "KC_P9", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "RGB_HUD", - "RGB_VAD", - "RGB_HUI", - "KC_NO", - "KC_TRNS", - "ANY(DM_REC1)", - "KC_TRNS", - "KC_TRNS", - "KC_P4", - "KC_P5", - "KC_P6", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "RGB_SPD", - "KC_TRNS", - "RGB_SPI", - "KC_TRNS", - "KC_TRNS", - "ANY(DM_RSTP)", - "KC_TRNS", - "KC_TRNS", - "KC_P1", - "KC_P2", - "KC_P3", - "KC_TRNS", - "DF(2)", - "KC_TRNS", - "RGB_RMOD", - "RGB_TOG", - "RGB_MOD", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_P0", - "KC_PDOT", - "KC_NUM", - "DF(0)", - "DF(1)", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS", - "KC_TRNS" - ] - ], - "author": "" -} \ No newline at end of file diff --git a/environment.d/10-home-manager.conf b/environment.d/10-home-manager.conf new file mode 120000 index 0000000..a7a52ed --- /dev/null +++ b/environment.d/10-home-manager.conf @@ -0,0 +1 @@ +/nix/store/3l33jmknaxv3ri2f9qxcp3kb7vsszk6k-home-manager-files/.config/environment.d/10-home-manager.conf \ No newline at end of file diff --git a/environment.d/envvars.conf b/environment.d/envvars.conf deleted file mode 100644 index f63c10f..0000000 --- a/environment.d/envvars.conf +++ /dev/null @@ -1,8 +0,0 @@ -NEOVIDE_MAXIMIZED=0 -GPG_TTY=$(tty) -PATH=/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:~/.local/bin:~/.cargo/bin:$PATH -EDITOR="neovide --no-fork" -SUDO_EDITOR="neovide --no-fork" -PKG_CONFIG_PATH=/usr/local/lib/pkgconfig -LD_LIBRARY_PATH=/usr/local/lib -SCRIPTS=$HOME/.config/scripts diff --git a/fish/completions/tide.fish b/fish/completions/tide.fish deleted file mode 100644 index 2d3784d..0000000 --- a/fish/completions/tide.fish +++ /dev/null @@ -1,12 +0,0 @@ -complete tide --no-files - -set -l subcommands bug-report configure - -complete tide -x -n __fish_use_subcommand -a bug-report -d "Print info for use in bug reports" -complete tide -x -n __fish_use_subcommand -a configure -d "Run the configuration wizard" - -complete tide -x -n "not __fish_seen_subcommand_from $subcommands" -s h -l help -d "Print help message" -complete tide -x -n "not __fish_seen_subcommand_from $subcommands" -s v -l version -d "Print tide version" - -complete tide -x -n '__fish_seen_subcommand_from bug-report' -l clean -d "Run clean Fish instance and install Tide" -complete tide -x -n '__fish_seen_subcommand_from bug-report' -l verbose -d "Print full Tide configuration" diff --git a/fish/conf.d/_tide_init.fish b/fish/conf.d/_tide_init.fish deleted file mode 100644 index 939f17c..0000000 --- a/fish/conf.d/_tide_init.fish +++ /dev/null @@ -1,41 +0,0 @@ -function _tide_init_install --on-event _tide_init_install - set -U VIRTUAL_ENV_DISABLE_PROMPT true - - source (functions --details _tide_sub_configure) - _load_config lean - _tide_finish - - if status is-interactive - tide bug-report --check || sleep 4 - - if contains ilancosman/tide (string lower $_fisher_plugins) - set_color bryellow - echo "ilancosman/tide is a development branch. Please install from a release tag:" - echo -ns "fisher install ilancosman/tide@v5" | fish_indent --ansi - sleep 3 - end - - switch (read --prompt-str="Configure tide prompt? [Y/n] " | string lower) - case y ye yes '' - tide configure - case '*' - echo -s \n 'Run ' (echo -ns "tide configure" | fish_indent --ansi) ' to customize your prompt.' - end - end -end - -function _tide_init_update --on-event _tide_init_update - # Warn users who install from main branch - if contains ilancosman/tide (string lower $_fisher_plugins) - set_color bryellow - echo "ilancosman/tide is a development branch. Please install from a release tag:" - echo -ns "fisher install ilancosman/tide@v5" | fish_indent --ansi - sleep 3 - end -end - -function _tide_init_uninstall --on-event _tide_init_uninstall - set -e VIRTUAL_ENV_DISABLE_PROMPT - set -e (set -U --names | string match --entire -r '^_?tide') - functions --erase (functions --all | string match --entire -r '^_?tide') -end diff --git a/fish/config.fish b/fish/config.fish index 0ea4023..f7244c9 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -1,31 +1,17 @@ if status is-interactive # Commands to run in interactive sessions can go here end + # ============================================================================= # # Utility functions for zoxide. # -set fish_greeting -function sudo --description "Replacement for Bash 'sudo !!' command to run last command using sudo." - if test "$argv" = !! - echo sudo $history[1] - eval command sudo $history[1] - else - command sudo $argv - end -end -function y - set tmp (mktemp -t "yazi-cwd.XXXXX") - yazi $argv --cwd-file="$tmp" - if set cwd (cat -- "$tmp"); and [ -n "$cwd" ]; and [ "$cwd" != "$PWD" ] - cd -- "$cwd" - end - rm -- "$tmp" -end +export NIX_PATH="$NIX_PATH:$HOME/gits/dotFiles/nix/." set EDITOR "neovide --no-fork" +alias rebuild='sudo nixos-rebuild switch --flake /home/dashie/gits/dotFiles/nix/.' alias ls='lsd' alias :q='exit' alias gh='git push origin' @@ -43,6 +29,7 @@ alias cat='bat' alias find='fd' alias rm='rip' +set fish_greeting # pwd based on the value of _ZO_RESOLVE_SYMLINKS. function __zoxide_pwd builtin pwd -L @@ -50,9 +37,9 @@ end # A copy of fish's internal cd function. This makes it possible to use # `alias cd=z` without causing an infinite loop. -if ! builtin functions -q __zoxide_cd_internal - if builtin functions -q cd - builtin functions -c cd __zoxide_cd_internal +if ! builtin functions --query __zoxide_cd_internal + if builtin functions --query cd + builtin functions --copy cd __zoxide_cd_internal else alias __zoxide_cd_internal='builtin cd' end @@ -79,20 +66,21 @@ end # When using zoxide with --no-cmd, alias these internal functions as desired. # -set __zoxide_z_prefix 'z!' +if test -z $__zoxide_z_prefix + set __zoxide_z_prefix 'z!' +end +set __zoxide_z_prefix_regex ^(string escape --style=regex $__zoxide_z_prefix) # Jump to a directory using only keywords. function __zoxide_z set -l argc (count $argv) - set -l completion_regex '^'(string escape --style=regex $__zoxide_z_prefix)'(.*)$' - if test $argc -eq 0 __zoxide_cd $HOME else if test "$argv" = - __zoxide_cd - else if test $argc -eq 1 -a -d $argv[1] __zoxide_cd $argv[1] - else if set -l result (string match --groups-only --regex $completion_regex $argv[-1]) + else if set -l result (string replace --regex $__zoxide_z_prefix_regex '' $argv[-1]); and test -n $result __zoxide_cd $result else set -l result (command zoxide query --exclude (__zoxide_pwd) -- $argv) @@ -100,26 +88,28 @@ function __zoxide_z end end -# Completions for `z`. +# Completions. function __zoxide_z_complete set -l tokens (commandline --current-process --tokenize) set -l curr_tokens (commandline --cut-at-cursor --current-process --tokenize) if test (count $tokens) -le 2 -a (count $curr_tokens) -eq 1 # If there are < 2 arguments, use `cd` completions. - __fish_complete_directories "$tokens[2]" '' - else if test (count $tokens) -eq (count $curr_tokens) - # If the last argument is empty, use interactive selection. + complete --do-complete "'' "(commandline --cut-at-cursor --current-token) | string match --regex '.*/$' + else if test (count $tokens) -eq (count $curr_tokens); and ! string match --quiet --regex $__zoxide_z_prefix_regex. $tokens[-1] + # If the last argument is empty and the one before doesn't start with + # $__zoxide_z_prefix, use interactive selection. set -l query $tokens[2..-1] - set -l result (zoxide query --exclude (__zoxide_pwd) -i -- $query) + set -l result (zoxide query --exclude (__zoxide_pwd) --interactive -- $query) and echo $__zoxide_z_prefix$result commandline --function repaint end end +complete --command __zoxide_z --no-files --arguments '(__zoxide_z_complete)' # Jump to a directory using interactive search. function __zoxide_zi - set -l result (command zoxide query -i -- $argv) + set -l result (command zoxide query --interactive -- $argv) and __zoxide_cd $result end @@ -129,17 +119,10 @@ end # abbr --erase z &>/dev/null -complete --command z --erase -function z - __zoxide_z $argv -end -complete --command z --no-files --arguments '(__zoxide_z_complete)' +alias z=__zoxide_z abbr --erase zi &>/dev/null -complete --command zi --erase -function zi - __zoxide_zi $argv -end +alias zi=__zoxide_zi # ============================================================================= # @@ -147,6 +130,5 @@ end # ~/.config/fish/config.fish): # # zoxide init fish | source -# -# Note: zoxide only supports fish v3.4.0 and above. -# + +direnv hook fish | source diff --git a/fish/fish_plugins b/fish/fish_plugins deleted file mode 100644 index b2d5f77..0000000 --- a/fish/fish_plugins +++ /dev/null @@ -1 +0,0 @@ -ilancosman/tide@v5 diff --git a/fish/functions/_tide_1_line_prompt.fish b/fish/functions/_tide_1_line_prompt.fish deleted file mode 100644 index 5772223..0000000 --- a/fish/functions/_tide_1_line_prompt.fish +++ /dev/null @@ -1,19 +0,0 @@ -function _tide_1_line_prompt - set -g add_prefix - _tide_side=left for item in $_tide_left_items - _tide_item_$item - end - set_color $prev_bg_color -b normal - echo $tide_left_prompt_suffix - - set -g add_prefix - _tide_side=right for item in $_tide_right_items - _tide_item_$item - end - set_color $prev_bg_color -b normal - echo $tide_right_prompt_suffix -end - -function _tide_item_pwd - _tide_print_item pwd @PWD@ -end diff --git a/fish/functions/_tide_2_line_prompt.fish b/fish/functions/_tide_2_line_prompt.fish deleted file mode 100644 index e9017af..0000000 --- a/fish/functions/_tide_2_line_prompt.fish +++ /dev/null @@ -1,31 +0,0 @@ -function _tide_2_line_prompt - set -g add_prefix - _tide_side=left for item in $_tide_left_items - _tide_item_$item - end - if not set -e add_prefix - set_color $prev_bg_color -b normal - echo $tide_left_prompt_suffix - end - - echo - - set -g add_prefix - _tide_side=right for item in $_tide_right_items - _tide_item_$item - end - if not set -e add_prefix - set_color $prev_bg_color -b normal - echo $tide_right_prompt_suffix - end -end - -function _tide_item_pwd - _tide_print_item pwd @PWD@ -end - -function _tide_item_newline - set_color $prev_bg_color -b normal - v=tide_"$_tide_side"_prompt_suffix echo $$v - set -g add_prefix -end diff --git a/fish/functions/_tide_cache_variables.fish b/fish/functions/_tide_cache_variables.fish deleted file mode 100644 index 31e3850..0000000 --- a/fish/functions/_tide_cache_variables.fish +++ /dev/null @@ -1,17 +0,0 @@ -function _tide_cache_variables - # Same-color-separator color - set_color $tide_prompt_color_separator_same_color | read -gx _tide_color_separator_same_color - - # git - contains git $_tide_left_items $_tide_right_items && set_color $tide_git_color_branch | read -gx _tide_location_color - - # private_mode - if contains private_mode $_tide_left_items $_tide_right_items && test -n "$fish_private_mode" - set -gx _tide_private_mode - else - set -e _tide_private_mode - end - - # item padding - test "$tide_prompt_pad_items" = true && set -gx _tide_pad ' ' || set -e _tide_pad -end diff --git a/fish/functions/_tide_detect_os.fish b/fish/functions/_tide_detect_os.fish deleted file mode 100644 index 5a3263f..0000000 --- a/fish/functions/_tide_detect_os.fish +++ /dev/null @@ -1,75 +0,0 @@ -# Outputs icon, color, bg_color -function _tide_detect_os - set -lx defaultColor 080808 CED7CF - switch (uname | string lower) - case darwin - printf %s\n  D6D6D6 333333 # from apple.com header - case freebsd openbsd dragonfly - printf %s\n  FFFFFF AB2B28 # https://freebsdfoundation.org/about-us/about-the-foundation/project/ - case 'cygwin*' 'mingw*_nt*' 'msys_nt*' - printf %s\n  FFFFFF 00CCFF # https://answers.microsoft.com/en-us/windows/forum/all/what-is-the-official-windows-8-blue-rgb-or-hex/fd57144b-f69b-42d8-8c21-6ca911646e44 - case linux - if test (uname -o) = Android - echo ﲎ # This character is evil and messes up code display, so it's put on its own line - # https://developer.android.com/distribute/marketing-tools/brand-guidelines - printf %s\n 3DDC84 3C3F41 # fg is from above link, bg is from Android Studio default dark theme - else - _tide_detect_os_linux_cases /etc/os-release ID || - _tide_detect_os_linux_cases /etc/os-release ID_LIKE || - _tide_detect_os_linux_cases /etc/lsb-release DISTRIB_ID || - printf %s\n  $defaultColor - end - case '*' - echo -ns '?' - end -end - -function _tide_detect_os_linux_cases -a file key - test -e $file || return - set -l split_file (string split '=' <$file) - set -l key_index (contains --index $key $split_file) || return - set -l value (string trim --chars='"' $split_file[(math $key_index + 1)]) - - # Anything which would have pure white background has been changed to D4D4D4 - # It was just too bright otherwise - switch (string lower $value) - case alpine - printf %s\n  FFFFFF 0D597F # from alpine logo - case arch - printf %s\n  1793D1 4D4D4D # from arch wiki header - case centos - printf %s\n  000000 D4D4D4 # https://wiki.centos.org/ArtWork/Brand/Logo, monochromatic - case debian - printf %s\n  C70036 D4D4D4 # from debian logo https://www.debian.org/logos/openlogo-nd-100.png - case devuan - printf %s\n  $defaultColor # logo is monochromatic - case elementary - printf %s\n  000000 D4D4D4 # https://elementary.io/brand, encouraged to be monochromatic - case fedora - printf %s\n  FFFFFF 294172 # from logo https://fedoraproject.org/w/uploads/2/2d/Logo_fedoralogo.png - case gentoo - printf %s\n  FFFFFF 54487A # https://wiki.gentoo.org/wiki/Project:Artwork/Colors - case mageia - printf %s\n  FFFFFF 262F45 # https://wiki.mageia.org/en/Artwork_guidelines - case manjaro - printf %s\n  FFFFFF 35BF5C # from https://gitlab.manjaro.org/artwork/branding/logo/-/blob/master/logo.svg - case mint linuxmint - printf %s\n  FFFFFF 69B53F # extracted from https://linuxmint.com/web/img/favicon.ico - case nixos - printf %s\n  FFFFFF 5277C3 # https://github.com/NixOS/nixos-artwork/tree/master/logo - case opensuse-leap opensuse-tumbleweed opensuse-microos - printf %s\n  73BA25 173f4f # https://en.opensuse.org/openSUSE:Artwork_brand - case raspbian - printf %s\n  FFFFFF A22846 # https://static.raspberrypi.org/files/Raspberry_Pi_Visual_Guidelines_2020.pdf - case rhel - printf %s\n  EE0000 000000 # https://www.redhat.com/en/about/brand/standards/color - case sabayon - printf %s\n  $defaultColor # Can't find colors, and they are rebranding anyway - case slackware - printf %s\n  $defaultColor # Doesn't really have a logo, and the colors are too close to PWD blue anyway - case ubuntu - printf %s\n  E95420 D4D4D4 # https://design.ubuntu.com/brand/ - case '*' - return 1 - end -end diff --git a/fish/functions/_tide_find_and_remove.fish b/fish/functions/_tide_find_and_remove.fish deleted file mode 100644 index 29f2180..0000000 --- a/fish/functions/_tide_find_and_remove.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_find_and_remove -a name list --no-scope-shadowing - contains --index $name $$list | read -l index && set -e "$list"[$index] -end diff --git a/fish/functions/_tide_item_aws.fish b/fish/functions/_tide_item_aws.fish deleted file mode 100644 index 7cb6338..0000000 --- a/fish/functions/_tide_item_aws.fish +++ /dev/null @@ -1,11 +0,0 @@ -function _tide_item_aws - # AWS_PROFILE overrides AWS_DEFAULT_PROFILE, AWS_REGION overrides AWS_DEFAULT_REGION - set -q AWS_PROFILE && set -l AWS_DEFAULT_PROFILE $AWS_PROFILE - set -q AWS_REGION && set -l AWS_DEFAULT_REGION $AWS_REGION - - if test -n "$AWS_DEFAULT_PROFILE" && test -n "$AWS_DEFAULT_REGION" - _tide_print_item aws $tide_aws_icon' ' "$AWS_DEFAULT_PROFILE/$AWS_DEFAULT_REGION" - else if test -n "$AWS_DEFAULT_PROFILE$AWS_DEFAULT_REGION" - _tide_print_item aws $tide_aws_icon' ' "$AWS_DEFAULT_PROFILE$AWS_DEFAULT_REGION" - end -end diff --git a/fish/functions/_tide_item_character.fish b/fish/functions/_tide_item_character.fish deleted file mode 100644 index 10bb324..0000000 --- a/fish/functions/_tide_item_character.fish +++ /dev/null @@ -1,17 +0,0 @@ -function _tide_item_character - test $_tide_status = 0 && set_color $tide_character_color || set_color $tide_character_color_failure - - set -q add_prefix || echo -ns ' ' - - test "$fish_key_bindings" = fish_default_key_bindings && echo -ns $tide_character_icon || - switch $fish_bind_mode - case insert - echo -ns $tide_character_icon - case default - echo -ns $tide_character_vi_icon_default - case replace replace_one - echo -ns $tide_character_vi_icon_replace - case visual - echo -ns $tide_character_vi_icon_visual - end -end diff --git a/fish/functions/_tide_item_chruby.fish b/fish/functions/_tide_item_chruby.fish deleted file mode 100644 index 02d5fbd..0000000 --- a/fish/functions/_tide_item_chruby.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_chruby - test -n "$RUBY_VERSION" && _tide_print_item chruby $tide_chruby_icon' ' $RUBY_VERSION -end diff --git a/fish/functions/_tide_item_cmd_duration.fish b/fish/functions/_tide_item_cmd_duration.fish deleted file mode 100644 index bc48bac..0000000 --- a/fish/functions/_tide_item_cmd_duration.fish +++ /dev/null @@ -1,12 +0,0 @@ -function _tide_item_cmd_duration - test $CMD_DURATION -gt $tide_cmd_duration_threshold && t=( - math -s0 "$CMD_DURATION/3600000" # Hours - math -s0 "$CMD_DURATION/60000"%60 # Minutes - math -s$tide_cmd_duration_decimals "$CMD_DURATION/1000"%60) if test $t[1] != 0 - _tide_print_item cmd_duration $tide_cmd_duration_icon' ' "$t[1]h $t[2]m $t[3]s" - else if test $t[2] != 0 - _tide_print_item cmd_duration $tide_cmd_duration_icon' ' "$t[2]m $t[3]s" - else - _tide_print_item cmd_duration $tide_cmd_duration_icon' ' "$t[3]s" - end -end diff --git a/fish/functions/_tide_item_context.fish b/fish/functions/_tide_item_context.fish deleted file mode 100644 index 575c438..0000000 --- a/fish/functions/_tide_item_context.fish +++ /dev/null @@ -1,15 +0,0 @@ -function _tide_item_context - if set -q SSH_TTY - set -lx tide_context_color $tide_context_color_ssh - test "$tide_context_hostname_parts" = 0 && _tide_print_item context $USER || - h=(string split . $hostname) _tide_print_item context $USER@(string join . $h[..$tide_context_hostname_parts]) - else if test "$EUID" = 0 - set -lx tide_context_color $tide_context_color_root - test "$tide_context_hostname_parts" = 0 && _tide_print_item context $USER || - h=(string split . $hostname) _tide_print_item context $USER@(string join . $h[..$tide_context_hostname_parts]) - else if test "$tide_context_always_display" = true - set -lx tide_context_color $tide_context_color_default - test "$tide_context_hostname_parts" = 0 && _tide_print_item context $USER || - h=(string split . $hostname) _tide_print_item context $USER@(string join . $h[..$tide_context_hostname_parts]) - end -end diff --git a/fish/functions/_tide_item_crystal.fish b/fish/functions/_tide_item_crystal.fish deleted file mode 100644 index cec9752..0000000 --- a/fish/functions/_tide_item_crystal.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_crystal - path is $_tide_parent_dirs/shard.yml && - _tide_print_item crystal $tide_crystal_icon' ' (crystal --version | string match -r "[\d.]+")[1] -end diff --git a/fish/functions/_tide_item_direnv.fish b/fish/functions/_tide_item_direnv.fish deleted file mode 100644 index 5084674..0000000 --- a/fish/functions/_tide_item_direnv.fish +++ /dev/null @@ -1,7 +0,0 @@ -function _tide_item_direnv - set -q DIRENV_DIR || return - direnv status | string match -q 'Found RC allowed false' \ - && set -lx tide_direnv_color $tide_direnv_color_denied \ - && set -lx tide_direnv_bg_color $tide_direnv_bg_color_denied - _tide_print_item direnv $tide_direnv_icon -end diff --git a/fish/functions/_tide_item_distrobox.fish b/fish/functions/_tide_item_distrobox.fish deleted file mode 100644 index 5e06a8b..0000000 --- a/fish/functions/_tide_item_distrobox.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_distrobox - test -e /etc/profile.d/distrobox_profile.sh && test -e /run/.containerenv && - _tide_print_item distrobox $tide_distrobox_icon' ' (string match -rg 'name="(.*)"' .*)' <$CLOUDSDK_CONFIG/configurations/config_$config \ - && _tide_print_item gcloud $tide_gcloud_icon' ' $project -end diff --git a/fish/functions/_tide_item_git.fish b/fish/functions/_tide_item_git.fish deleted file mode 100644 index c419695..0000000 --- a/fish/functions/_tide_item_git.fish +++ /dev/null @@ -1,67 +0,0 @@ -function _tide_item_git - if git branch --show-current 2>/dev/null | string shorten -"$tide_git_truncation_strategy"m$tide_git_truncation_length | read -l location - git rev-parse --git-dir --is-inside-git-dir | read -fL gdir in_gdir - set location $_tide_location_color$location - else if test $pipestatus[1] != 0 - return - else if git tag --points-at HEAD | string shorten -"$tide_git_truncation_strategy"m$tide_git_truncation_length | read location - git rev-parse --git-dir --is-inside-git-dir | read -fL gdir in_gdir - set location '#'$_tide_location_color$location - else - git rev-parse --git-dir --is-inside-git-dir --short HEAD | read -fL gdir in_gdir location - set location @$_tide_location_color$location - end - - # Operation - if test -d $gdir/rebase-merge - read -f step <$gdir/rebase-merge/msgnum - read -f total_steps <$gdir/rebase-merge/end - test -f $gdir/rebase-merge/interactive && set -f operation rebase-i || set -f operation rebase-m - else if test -d $gdir/rebase-apply - read -f step <$gdir/rebase-apply/next - read -f total_steps <$gdir/rebase-apply/last - if test -f $gdir/rebase-apply/rebasing - set -f operation rebase - else if test -f $gdir/rebase-apply/applying - set -f operation am - else - set -f operation am/rebase - end - else if test -f $gdir/MERGE_HEAD - set -f operation merge - else if test -f $gdir/CHERRY_PICK_HEAD - set -f operation cherry-pick - else if test -f $gdir/REVERT_HEAD - set -f operation revert - else if test -f $gdir/BISECT_LOG - set -f operation bisect - end - - # Git status/stash + Upstream behind/ahead - test $in_gdir = true && set -l _set_dir_opt -C $gdir/.. - # Suppress errors in case we are in a bare repo or there is no upstream - set -l stat (git $_set_dir_opt --no-optional-locks status --porcelain 2>/dev/null) - string match -qr '(0|(?.*))\n(0|(?.*))\n(0|(?.*)) -(0|(?.*))\n(0|(?.*))(\n(0|(?.*))\t(0|(?.*)))?' \ - "$(git $_set_dir_opt stash list 2>/dev/null | count - string match -r ^UU $stat | count - string match -r ^[ADMR]. $stat | count - string match -r ^.[ADMR] $stat | count - string match -r '^\?\?' $stat | count - git rev-list --count --left-right @{upstream}...HEAD 2>/dev/null)" - - if test -n "$operation$conflicted" - set -g tide_git_bg_color $tide_git_bg_color_urgent - else if test -n "$staged$dirty$untracked" - set -g tide_git_bg_color $tide_git_bg_color_unstable - end - - _tide_print_item git $_tide_location_color$tide_git_icon' ' (set_color white; echo -ns $location - set_color $tide_git_color_operation; echo -ns ' '$operation ' '$step/$total_steps - set_color $tide_git_color_upstream; echo -ns ' ⇣'$behind ' ⇡'$ahead - set_color $tide_git_color_stash; echo -ns ' *'$stash - set_color $tide_git_color_conflicted; echo -ns ' ~'$conflicted - set_color $tide_git_color_staged; echo -ns ' +'$staged - set_color $tide_git_color_dirty; echo -ns ' !'$dirty - set_color $tide_git_color_untracked; echo -ns ' ?'$untracked) -end diff --git a/fish/functions/_tide_item_go.fish b/fish/functions/_tide_item_go.fish deleted file mode 100644 index 7c5919f..0000000 --- a/fish/functions/_tide_item_go.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_go - path is $_tide_parent_dirs/go.mod && - _tide_print_item go $tide_go_icon' ' (go version | string match -r "[\d.]+") -end diff --git a/fish/functions/_tide_item_java.fish b/fish/functions/_tide_item_java.fish deleted file mode 100644 index 6105acc..0000000 --- a/fish/functions/_tide_item_java.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_java - path is $_tide_parent_dirs/pom.xml && - _tide_print_item java $tide_java_icon' ' (java -version &| string match -r "[\d.]+")[1] -end diff --git a/fish/functions/_tide_item_jobs.fish b/fish/functions/_tide_item_jobs.fish deleted file mode 100644 index 96cf902..0000000 --- a/fish/functions/_tide_item_jobs.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_jobs - set -q _tide_jobs && _tide_print_item jobs $tide_jobs_icon -end diff --git a/fish/functions/_tide_item_kubectl.fish b/fish/functions/_tide_item_kubectl.fish deleted file mode 100644 index ab044b3..0000000 --- a/fish/functions/_tide_item_kubectl.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_kubectl - kubectl config view --minify --output 'jsonpath={.current-context}/{..namespace}' 2>/dev/null | read -l context && - _tide_print_item kubectl $tide_kubectl_icon' ' (string replace -r '/(|default)$' '' $context) -end diff --git a/fish/functions/_tide_item_nix_shell.fish b/fish/functions/_tide_item_nix_shell.fish deleted file mode 100644 index 647f606..0000000 --- a/fish/functions/_tide_item_nix_shell.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_nix_shell - set -q IN_NIX_SHELL && _tide_print_item nix_shell $tide_nix_shell_icon' ' $IN_NIX_SHELL -end diff --git a/fish/functions/_tide_item_node.fish b/fish/functions/_tide_item_node.fish deleted file mode 100644 index 0588051..0000000 --- a/fish/functions/_tide_item_node.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_node - path is $_tide_parent_dirs/package.json && - _tide_print_item node $tide_node_icon' ' (node --version | string trim --chars=v) -end diff --git a/fish/functions/_tide_item_os.fish b/fish/functions/_tide_item_os.fish deleted file mode 100644 index 8a6208c..0000000 --- a/fish/functions/_tide_item_os.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_os - _tide_print_item os $tide_os_icon -end diff --git a/fish/functions/_tide_item_php.fish b/fish/functions/_tide_item_php.fish deleted file mode 100644 index abc104e..0000000 --- a/fish/functions/_tide_item_php.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_php - path is $_tide_parent_dirs/composer.json && - _tide_print_item php $tide_php_icon' ' (php --version | string match -r 'PHP ([\d.]+)')[2] -end diff --git a/fish/functions/_tide_item_private_mode.fish b/fish/functions/_tide_item_private_mode.fish deleted file mode 100644 index 4eb4684..0000000 --- a/fish/functions/_tide_item_private_mode.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_private_mode - set -q _tide_private_mode && _tide_print_item private_mode $tide_private_mode_icon -end diff --git a/fish/functions/_tide_item_pulumi.fish b/fish/functions/_tide_item_pulumi.fish deleted file mode 100644 index 9f5e2db..0000000 --- a/fish/functions/_tide_item_pulumi.fish +++ /dev/null @@ -1,19 +0,0 @@ -function _tide_item_pulumi - if path filter $_tide_parent_dirs/Pulumi.yaml | read -l yaml_path - if command -q sha1sum - echo -n "$yaml_path" | sha1sum | string sub -e40 | read -f path_hash - else if command -q shasum - echo -n "$yaml_path" | shasum | string sub -e40 | read -f path_hash - end - - if test -n "$path_hash" - string match -rg 'name: *(.*)' <$yaml_path | read -l project_name - set -l workspace_file "$HOME/.pulumi/workspaces/$project_name-$path_hash-workspace.json" - - if test -e $workspace_file - string match -rg '"stack": *"(.*)"' <$workspace_file | read -l stack - _tide_print_item pulumi $tide_pulumi_icon' ' $stack - end - end - end -end diff --git a/fish/functions/_tide_item_rustc.fish b/fish/functions/_tide_item_rustc.fish deleted file mode 100644 index 2e71645..0000000 --- a/fish/functions/_tide_item_rustc.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_rustc - path is $_tide_parent_dirs/Cargo.toml && - _tide_print_item rustc $tide_rustc_icon' ' (rustc --version | string split ' ')[2] -end diff --git a/fish/functions/_tide_item_shlvl.fish b/fish/functions/_tide_item_shlvl.fish deleted file mode 100644 index 95dd5ff..0000000 --- a/fish/functions/_tide_item_shlvl.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_shlvl - # Non-interactive shells do not increment SHLVL, so we don't need to subtract 1 - test $SHLVL -gt $tide_shlvl_threshold && _tide_print_item shlvl $tide_shlvl_icon' ' $SHLVL -end diff --git a/fish/functions/_tide_item_status.fish b/fish/functions/_tide_item_status.fish deleted file mode 100644 index 3a040fd..0000000 --- a/fish/functions/_tide_item_status.fish +++ /dev/null @@ -1,15 +0,0 @@ -function _tide_item_status - if string match -qv 0 $_tide_pipestatus # If there is a failure anywhere in the pipestatus - if test "$_tide_pipestatus" = 1 # If simple failure - contains character $_tide_left_items || tide_status_bg_color=$tide_status_bg_color_failure \ - tide_status_color=$tide_status_color_failure _tide_print_item status $tide_status_icon_failure' ' 1 - else - fish_status_to_signal $_tide_pipestatus | string replace SIG '' | string join '|' | read -l out - test $_tide_status = 0 && _tide_print_item status $tide_status_icon' ' $out || - tide_status_bg_color=$tide_status_bg_color_failure tide_status_color=$tide_status_color_failure \ - _tide_print_item status $tide_status_icon_failure' ' $out - end - else if not contains character $_tide_left_items - _tide_print_item status $tide_status_icon - end -end diff --git a/fish/functions/_tide_item_terraform.fish b/fish/functions/_tide_item_terraform.fish deleted file mode 100644 index 8d99fb7..0000000 --- a/fish/functions/_tide_item_terraform.fish +++ /dev/null @@ -1,6 +0,0 @@ -function _tide_item_terraform - if path is $_tide_parent_dirs/.terraform - terraform workspace show | read -l workspace - test $workspace != default && _tide_print_item terraform $tide_terraform_icon' ' $workspace - end -end diff --git a/fish/functions/_tide_item_time.fish b/fish/functions/_tide_item_time.fish deleted file mode 100644 index b8522bc..0000000 --- a/fish/functions/_tide_item_time.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _tide_item_time - _tide_print_item time (date +$tide_time_format) -end diff --git a/fish/functions/_tide_item_toolbox.fish b/fish/functions/_tide_item_toolbox.fish deleted file mode 100644 index 0b33f29..0000000 --- a/fish/functions/_tide_item_toolbox.fish +++ /dev/null @@ -1,4 +0,0 @@ -function _tide_item_toolbox - test -e /run/.toolboxenv && - _tide_print_item toolbox $tide_toolbox_icon' ' (string match -rg 'name="(.*)"' \..|.)\" \$dir_section - while v=\$parent_dir/\$trunc*/ set -q v[2] && string match -qr \"(?\$trunc.)\" \$dir_section - end - test -n \"\$trunc\" && set split_output[\$i] \"$color_truncated\$trunc$reset_to_color_dirs\" && - string join / \$split_output | string length -V | read _tide_pwd_len - end - end - - string join -- / \"$reset_to_color_dirs\$split_output[1]\" \$split_output[2..] -end" diff --git a/fish/functions/_tide_remove_unusable_items.fish b/fish/functions/_tide_remove_unusable_items.fish deleted file mode 100644 index a2e5698..0000000 --- a/fish/functions/_tide_remove_unusable_items.fish +++ /dev/null @@ -1,25 +0,0 @@ -function _tide_remove_unusable_items - # Remove tool-specific items for tools the machine doesn't have installed - set -l removed_items - for item in aws chruby crystal direnv distrobox docker elixir gcloud git go java kubectl nix_shell node php pulumi rustc terraform toolbox virtual_env - contains $item $tide_left_prompt_items $tide_right_prompt_items || continue - - set -l cli_names $item - switch $item - case distrobox # there is no 'distrobox' command inside the container - set cli_names distrobox-export # 'distrobox-export' and 'distrobox-host-exec' are available - case virtual_env - set cli_names python python3 - case nix_shell - set cli_names nix nix-shell - end - type --query $cli_names || set -a removed_items $item - end - - set -U _tide_left_items (for item in $tide_left_prompt_items - contains $item $removed_items || echo $item - end) - set -U _tide_right_items (for item in $tide_right_prompt_items - contains $item $removed_items || echo $item - end) -end diff --git a/fish/functions/_tide_sub_bug-report.fish b/fish/functions/_tide_sub_bug-report.fish deleted file mode 100644 index 5f087c8..0000000 --- a/fish/functions/_tide_sub_bug-report.fish +++ /dev/null @@ -1,73 +0,0 @@ -function _tide_sub_bug-report - argparse c/clean v/verbose check -- $argv - - set -l fish_path (status fish-path) - - if set -q _flag_clean - HOME=(mktemp -d) $fish_path --init-command "curl --silent \ - https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | - source && fisher install ilancosman/tide@v5" - else if set -q _flag_verbose - set --long | string match -r "^_?tide.*" | # Get only tide variables - string match -r --invert "^_tide_prompt_var.*" # Remove _tide_prompt_var - else - set -l fish_version ($fish_path --version | string match -r "fish, version (\d\.\d\.\d)")[2] - _tide_check_version Fish fish-shell/fish-shell "(\d\.\d\.\d)" $fish_version || return - - set -l tide_version (tide --version | string match -r "tide, version (\d\.\d\.\d)")[2] - _tide_check_version Tide IlanCosman/tide "v(\d\.\d\.\d)" $tide_version || return - - if command --query git - test (git --version | string match -r "git version ([\d\.]*)" | string replace --all . '')[2] -gt 2220 - _tide_check_condition \ - "Your git version is too old." \ - "Tide requires at least version 2.22." \ - "Please update before submitting a bug report." || return - end - - # Check that omf is not installed - not functions --query omf - _tide_check_condition \ - "Tide does not work with oh-my-fish installed." \ - "Please uninstall it before submitting a bug report." || return - - if not set -q _flag_check - set -l fish_startup_time ($fish_path -ic "time $fish_path -c exit" 2>| - string match -r "Executed in(.*)fish" | string trim)[2] - - read --local --prompt-str "What operating system are you using? (e.g Ubuntu 20.04): " os - read --local --prompt-str "What terminal emulator are you using? (e.g Kitty): " terminal_emulator - - printf '%b\n' "\nPlease copy the following information into the issue:\n" \ - "fish version: $fish_version" \ - "tide version: $tide_version" \ - "term: $TERM" \ - "os: $os" \ - "terminal emulator: $terminal_emulator" \ - "fish startup: $fish_startup_time" \ - "fisher plugins: $_fisher_plugins" - end - end -end - -function _tide_check_version -a program_name repo_name regex_to_get_version current_version - curl --silent https://github.com/$repo_name/releases/latest | - string match -r ".*$repo_name/releases/tag/$regex_to_get_version.*" | - read --local --line __ latestVersion - - string match --quiet -r "^$latestVersion" "$current_version" - _tide_check_condition \ - "Your $program_name version is out of date." \ - "The latest is $latestVersion. You have $current_version." \ - "Please update before submitting a bug report." -end - -function _tide_check_condition - if test "$status" != 0 - set_color red - printf '%s\n' $argv - set_color normal - return 1 - end - return 0 -end diff --git a/fish/functions/_tide_sub_configure.fish b/fish/functions/_tide_sub_configure.fish deleted file mode 100644 index cb87290..0000000 --- a/fish/functions/_tide_sub_configure.fish +++ /dev/null @@ -1,95 +0,0 @@ -set -g _tide_color_dark_blue 0087AF -set -g _tide_color_dark_green 5FAF00 -set -g _tide_color_gold D7AF00 -set -g _tide_color_green 5FD700 -set -g _tide_color_light_blue 00AFFF - -# Create an empty fake function for each item -for func in _fake(functions --all | string match --entire _tide_item) - function $func - end -end - -for file in (status dirname)/tide/configure/{choices, functions}/**.fish - source $file -end - -function _tide_sub_configure - if test $COLUMNS -lt 55 -o $LINES -lt 21 - echo 'Terminal size too small; must be at least 55 x 21' - return 1 - end - - _tide_detect_os | read -g --line os_branding_icon os_branding_color os_branding_bg_color - - set -g fake_columns $COLUMNS - test $fake_columns -gt 90 && set fake_columns 90 - set -g fake_lines $LINES - - set -g _tide_selected_option - _next_choice all/style -end - -function _next_choice -a nextChoice - set -q _tide_selected_option || return 0 - set -l cmd (string split '/' $nextChoice)[2] - $cmd -end - -function _tide_title -a text - command -q clear && clear - set_color -o - string pad --width (math --scale=0 "$fake_columns/2" + (string length $text)/2) $text - set_color normal -end - -function _tide_option -a symbol text - set -ga _tide_option_list $symbol - - set_color -o - echo "($symbol) $text" - set_color normal -end - -function _tide_menu - set -l list_with_slashes (string join '/' $_tide_option_list) - - echo '(r) Restart from the beginning' - echo '(q) Quit and do nothing'\n - - while true - set_color -o - read --nchars 1 --prompt-str "Choice [$list_with_slashes/r/q] " input - set_color normal - - switch $input - case r - set -e _tide_option_list - _next_choice all/style - break - case q - set -e _tide_selected_option # Skip through all the _next_choices - set -e _tide_option_list - command -q clear && clear - break - case $_tide_option_list - set -e _tide_option_list - set -g _tide_selected_option $input - break - end - end -end - -function _tide_display_prompt -a var_name var_value - test -n "$var_name" && set -g $var_name $var_value - _fake_tide_cache_variables - set -l prompt (_fake_tide_prompt) - - set -l bottom_left_prompt_string_length (string length --visible $prompt[-1]) - set -l right_prompt_string (string pad --width (math $fake_columns-$bottom_left_prompt_string_length) $prompt[1]) - set -l prompt[-1] "$prompt[-1]$right_prompt_string" - - string unescape $prompt[2..] - set_color normal - echo -end diff --git a/fish/functions/fish_mode_prompt.fish b/fish/functions/fish_mode_prompt.fish deleted file mode 100644 index f37cf7d..0000000 --- a/fish/functions/fish_mode_prompt.fish +++ /dev/null @@ -1 +0,0 @@ -# Disable default vi prompt diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish deleted file mode 100644 index 3e820c4..0000000 --- a/fish/functions/fish_prompt.fish +++ /dev/null @@ -1,90 +0,0 @@ -function fish_prompt -end # In case this file gets loaded non-interactively, e.g by conda -status is-interactive || exit - -_tide_remove_unusable_items -_tide_cache_variables -_tide_parent_dirs -source (functions --details _tide_pwd) - -set -l prompt_var _tide_prompt_$fish_pid -set -U $prompt_var # Set var here so if we erase $prompt_var, bg job won't set a uvar - -set_color normal | read -l color_normal -status fish-path | read -l fish_path - -# _tide_repaint prevents us from creating a second background job -function _tide_refresh_prompt --on-variable $prompt_var --on-variable COLUMNS - set -g _tide_repaint - commandline -f repaint -end - -if contains newline $_tide_left_items # two line prompt initialization - test "$tide_prompt_add_newline_before" = true && set -l add_newline '\n' - - set_color $tide_prompt_color_frame_and_connection -b normal | read -l prompt_and_frame_color - - set -l column_offset 5 - test "$tide_left_prompt_frame_enabled" = true && - set -l top_left_frame "$prompt_and_frame_color╭─" && - set -l bot_left_frame "$prompt_and_frame_color╰─" && - set column_offset (math $column_offset-2) - test "$tide_right_prompt_frame_enabled" = true && - set -l top_right_frame "$prompt_and_frame_color─╮" && - set -l bot_right_frame "$prompt_and_frame_color─╯" && - set column_offset (math $column_offset-2) - - eval " -function fish_prompt - _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint - jobs -q && set -lx _tide_jobs - $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus -set _tide_parent_dirs \$_tide_parent_dirs -PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_2_line_prompt)\" & - builtin disown - - command kill \$_tide_last_pid 2>/dev/null - set -g _tide_last_pid \$last_pid - end - - math \$COLUMNS-(string length -V \"\$$prompt_var[1][1]\$$prompt_var[1][3]\")+$column_offset | read -lx dist_btwn_sides - - echo -ns $add_newline'$top_left_frame'(string replace @PWD@ (_tide_pwd) \"\$$prompt_var[1][1]\")'$prompt_and_frame_color' - string repeat -Nm(math max 0, \$dist_btwn_sides-\$_tide_pwd_len) '$tide_prompt_icon_connection' - echo -ns \"\$$prompt_var[1][3]$top_right_frame\"\n\"$bot_left_frame\$$prompt_var[1][2]$color_normal \" -end - -function fish_right_prompt - string unescape \"\$$prompt_var[1][4]$bot_right_frame$color_normal\" -end" -else # one line prompt initialization - test "$tide_prompt_add_newline_before" = true && set -l add_newline '\0' - - math 5 -$tide_prompt_min_cols | read -l column_offset - test $column_offset -ge 0 && set column_offset "+$column_offset" - - eval " -function fish_prompt - _tide_status=\$status _tide_pipestatus=\$pipestatus if not set -e _tide_repaint - jobs -q && set -lx _tide_jobs - $fish_path -c \"set _tide_pipestatus \$_tide_pipestatus -set _tide_parent_dirs \$_tide_parent_dirs -PATH=\$(string escape \"\$PATH\") CMD_DURATION=\$CMD_DURATION fish_bind_mode=\$fish_bind_mode set $prompt_var (_tide_1_line_prompt)\" & - builtin disown - - command kill \$_tide_last_pid 2>/dev/null - set -g _tide_last_pid \$last_pid - end - - math \$COLUMNS-(string length -V \"\$$prompt_var[1][1]\$$prompt_var[1][2]\")$column_offset | read -lx dist_btwn_sides - string replace @PWD@ (_tide_pwd) $add_newline \$$prompt_var[1][1]'$color_normal ' -end - -function fish_right_prompt - string unescape \"\$$prompt_var[1][2]$color_normal\" -end" -end - -eval "function _tide_on_fish_exit --on-event fish_exit - set -e $prompt_var -end" diff --git a/fish/functions/nheko.fish b/fish/functions/nheko.fish deleted file mode 100644 index 78672b0..0000000 --- a/fish/functions/nheko.fish +++ /dev/null @@ -1,4 +0,0 @@ -function nheko --description 'alias nheko nheko --style Breeze' - command nheko --style Breeze $argv - -end diff --git a/fish/functions/tide.fish b/fish/functions/tide.fish deleted file mode 100644 index 84bbbf1..0000000 --- a/fish/functions/tide.fish +++ /dev/null @@ -1,27 +0,0 @@ -function tide --description 'Manage your Tide prompt' - argparse --stop-nonopt v/version h/help -- $argv - - if set -q _flag_version - echo 'tide, version 5.6.0' - else if set -q _flag_help - _tide_help - else if functions --query _tide_sub_$argv[1] - _tide_sub_$argv[1] $argv[2..] - else - _tide_help - return 1 - end -end - -function _tide_help - printf %s\n \ - 'Usage: tide [options] subcommand [options]' \ - '' \ - 'Options:' \ - ' -v or --version print tide version number' \ - ' -h or --help print this help message' \ - '' \ - 'Subcommands:' \ - ' configure run interactive configuration wizard' \ - ' bug-report print info for use in bug reports' -end diff --git a/fish/functions/tide/configure/choices/all/finish.fish b/fish/functions/tide/configure/choices/all/finish.fish deleted file mode 100644 index f60a128..0000000 --- a/fish/functions/tide/configure/choices/all/finish.fish +++ /dev/null @@ -1,33 +0,0 @@ -function finish - set_color red - _tide_title 'Overwrite tide config?' - set_color normal - - _tide_option y Yes - echo - - _tide_menu - switch $_tide_selected_option - case y - _tide_finish - command -q clear && clear - end -end - -function _tide_finish - set -e _tide_selected_option # Skip through all the _next_choices - - # Deal with prompt char/vi mode - contains character $fake_tide_left_prompt_items || set -p fake_tide_left_prompt_items vi_mode - - # Set the real variables - for fakeVar in (set --names | string match -r "^fake_tide.*") - set -U (string replace 'fake_' '' $fakeVar) $$fakeVar - end - - # Make sure old prompt won't display - set -e $_tide_prompt_var 2>/dev/null - - # Re-initialize the prompt - source (functions --details fish_prompt) -end diff --git a/fish/functions/tide/configure/choices/all/icons.fish b/fish/functions/tide/configure/choices/all/icons.fish deleted file mode 100644 index e53bffa..0000000 --- a/fish/functions/tide/configure/choices/all/icons.fish +++ /dev/null @@ -1,33 +0,0 @@ -function icons - _tide_title Icons - - _tide_option 1 'Few icons' - _tide_display_prompt - - _tide_option 2 'Many icons' - _enable_icons - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - _disable_icons - end - _next_choice all/finish -end - -function _enable_icons - set -p fake_tide_left_prompt_items os - set -g fake_tide_pwd_icon  - set -g fake_tide_pwd_icon_home  - set -g fake_tide_cmd_duration_icon  - set -g fake_tide_git_icon  -end - -function _disable_icons - _tide_find_and_remove os fake_tide_left_prompt_items - set fake_tide_pwd_icon - set fake_tide_pwd_icon_home - set fake_tide_cmd_duration_icon - set fake_tide_git_icon -end diff --git a/fish/functions/tide/configure/choices/all/prompt_colors.fish b/fish/functions/tide/configure/choices/all/prompt_colors.fish deleted file mode 100644 index 90b1a9d..0000000 --- a/fish/functions/tide/configure/choices/all/prompt_colors.fish +++ /dev/null @@ -1,26 +0,0 @@ -function prompt_colors - _tide_title 'Prompt Colors' - - _tide_option 1 'True color' - _tide_display_prompt - - _tide_option 2 '16 colors' - _load_config "$_tide_configure_style"_16color - set -g _tide_16color true - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - _load_config "$_tide_configure_style" - set -e _tide_16color - switch $_tide_configure_style - case lean rainbow - _next_choice all/show_time - case classic - _next_choice classic/classic_prompt_color - end - case 2 - _next_choice all/show_time - end -end diff --git a/fish/functions/tide/configure/choices/all/prompt_connection.fish b/fish/functions/tide/configure/choices/all/prompt_connection.fish deleted file mode 100644 index ae31ef3..0000000 --- a/fish/functions/tide/configure/choices/all/prompt_connection.fish +++ /dev/null @@ -1,28 +0,0 @@ -function prompt_connection - _tide_title 'Prompt Connection' - - _tide_option 1 Disconnected - _tide_display_prompt fake_tide_prompt_icon_connection ' ' - - _tide_option 2 Dotted - _tide_display_prompt fake_tide_prompt_icon_connection '·' - - _tide_option 3 Solid - _tide_display_prompt fake_tide_prompt_icon_connection '─' - - _tide_menu - switch $_tide_selected_option - case 1 - set -g fake_tide_prompt_icon_connection ' ' - case 2 - set -g fake_tide_prompt_icon_connection '·' - case 3 - set -g fake_tide_prompt_icon_connection '─' - end - switch $_tide_configure_style - case lean - _next_choice all/prompt_connection_andor_frame_color - case classic rainbow - _next_choice powerline/powerline_prompt_frame - end -end diff --git a/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish b/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish deleted file mode 100644 index b8803b4..0000000 --- a/fish/functions/tide/configure/choices/all/prompt_connection_andor_frame_color.fish +++ /dev/null @@ -1,36 +0,0 @@ -function prompt_connection_andor_frame_color - if test "$_tide_16color" = true || - test "$fake_tide_left_prompt_frame_enabled" = false -a \ - "$fake_tide_right_prompt_frame_enabled" = false -a \ - "$fake_tide_prompt_icon_connection" = ' ' - _next_choice all/prompt_spacing - return 0 - end - - _tide_title "Connection & Frame Color" - - _tide_option 1 Lightest - _tide_display_prompt fake_tide_prompt_color_frame_and_connection 808080 - - _tide_option 2 Light - _tide_display_prompt fake_tide_prompt_color_frame_and_connection 6C6C6C - - _tide_option 3 Dark - _tide_display_prompt fake_tide_prompt_color_frame_and_connection 585858 - - _tide_option 4 Darkest - _tide_display_prompt fake_tide_prompt_color_frame_and_connection 444444 - - _tide_menu - switch $_tide_selected_option - case 1 - set -g fake_tide_prompt_color_frame_and_connection 808080 - case 2 - set -g fake_tide_prompt_color_frame_and_connection 6C6C6C - case 3 - set -g fake_tide_prompt_color_frame_and_connection 585858 - case 4 - set -g fake_tide_prompt_color_frame_and_connection 444444 - end - _next_choice all/prompt_spacing -end diff --git a/fish/functions/tide/configure/choices/all/prompt_spacing.fish b/fish/functions/tide/configure/choices/all/prompt_spacing.fish deleted file mode 100644 index a5bb98b..0000000 --- a/fish/functions/tide/configure/choices/all/prompt_spacing.fish +++ /dev/null @@ -1,21 +0,0 @@ -function prompt_spacing - _tide_title 'Prompt Spacing' - - _tide_option 1 Compact - _tide_display_prompt - printf \e\[1A # Move cursor up 1 row - _tide_display_prompt - - _tide_option 2 Sparse - _tide_display_prompt - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - set -g fake_tide_prompt_add_newline_before false - case 2 - set -g fake_tide_prompt_add_newline_before true - end - _next_choice all/icons -end diff --git a/fish/functions/tide/configure/choices/all/show_time.fish b/fish/functions/tide/configure/choices/all/show_time.fish deleted file mode 100644 index 8cf1843..0000000 --- a/fish/functions/tide/configure/choices/all/show_time.fish +++ /dev/null @@ -1,31 +0,0 @@ -function show_time - _tide_title 'Show current time?' - - _tide_option 1 No - _tide_display_prompt - - set -a fake_tide_right_prompt_items time - - _tide_option 2 '24-hour format' - _tide_display_prompt fake_tide_time_format %T - - _tide_option 3 '12-hour format' - _tide_display_prompt fake_tide_time_format '%r' - - _tide_menu - switch $_tide_selected_option - case 1 - set -g fake_tide_time_format '' - set -e fake_tide_right_prompt_items[-1] - case 2 - set -g fake_tide_time_format %T - case 3 - set -g fake_tide_time_format '%r' - end - switch $_tide_configure_style - case lean - _next_choice "$_tide_configure_style"/"$_tide_configure_style"_prompt_height - case classic rainbow - _next_choice "$_tide_configure_style"/"$_tide_configure_style"_prompt_separators - end -end diff --git a/fish/functions/tide/configure/choices/all/style.fish b/fish/functions/tide/configure/choices/all/style.fish deleted file mode 100644 index ae52bc5..0000000 --- a/fish/functions/tide/configure/choices/all/style.fish +++ /dev/null @@ -1,57 +0,0 @@ -function style - _tide_title 'Prompt Style' - - _tide_option 1 Lean - _load_config lean - _tide_display_prompt - - _tide_option 2 Classic - _load_config classic - _tide_display_prompt - - _tide_option 3 Rainbow - _load_config rainbow - _tide_display_prompt - - _tide_style_menu - switch $_tide_selected_option - case 1 - _load_config lean - set -g _tide_configure_style lean - case 2 - _load_config classic - set -g _tide_configure_style classic - case 3 - _load_config rainbow - set -g _tide_configure_style rainbow - end - _next_choice all/prompt_colors -end - -function _load_config -a name - string replace -r '^' 'set -g fake_' <(status dirname)/../../configs/$name.fish | source -end - -function _tide_style_menu # Exactly like _tide_menu except that it doesn't have (r) option - set -l list_with_slashes (string join '/' $_tide_option_list) - - echo '(q) Quit and do nothing'\n - - while true - set_color -o - read --nchars 1 --prompt-str "Choice [$list_with_slashes/q] " input - set_color normal - - switch $input - case q - set -e _tide_selected_option # Skip through all the _next_choices - set -e _tide_option_list - command -q clear && clear - break - case $_tide_option_list - set -e _tide_option_list - set -g _tide_selected_option $input - break - end - end -end diff --git a/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish b/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish deleted file mode 100644 index 2189f36..0000000 --- a/fish/functions/tide/configure/choices/classic/classic_prompt_color.fish +++ /dev/null @@ -1,38 +0,0 @@ -function classic_prompt_color - _tide_title 'Prompt Color' - - _tide_option 1 Lightest - _set_all_items_bg_color 585858 - _tide_display_prompt - - _tide_option 2 Light - _set_all_items_bg_color 444444 - _tide_display_prompt - - _tide_option 3 Dark - _set_all_items_bg_color 303030 - _tide_display_prompt - - _tide_option 4 Darkest - _set_all_items_bg_color 1C1C1C - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - _set_all_items_bg_color 585858 - case 2 - _set_all_items_bg_color 444444 - case 3 - _set_all_items_bg_color 303030 - case 4 - _set_all_items_bg_color 1C1C1C - end - _next_choice all/show_time -end - -function _set_all_items_bg_color -a color - for var in (set --names | string match -r "fake_.*_bg_color.*") - set $var $color - end -end diff --git a/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish b/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish deleted file mode 100644 index 17b88e4..0000000 --- a/fish/functions/tide/configure/choices/classic/classic_prompt_separators.fish +++ /dev/null @@ -1,40 +0,0 @@ -function classic_prompt_separators - _tide_title 'Prompt Separators' - - _tide_option 1 Angled - set -g fake_tide_left_prompt_separator_same_color  - set -g fake_tide_right_prompt_separator_same_color  - _tide_display_prompt - - _tide_option 2 Vertical - set -g fake_tide_left_prompt_separator_same_color '│' - set -g fake_tide_right_prompt_separator_same_color '│' - _tide_display_prompt - - _tide_option 3 Slanted - set -g fake_tide_left_prompt_separator_same_color '╱' - set -g fake_tide_right_prompt_separator_same_color '╱' - _tide_display_prompt - - _tide_option 4 Round - set -g fake_tide_left_prompt_separator_same_color '' - set -g fake_tide_right_prompt_separator_same_color '' - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - set -g fake_tide_left_prompt_separator_same_color  - set -g fake_tide_right_prompt_separator_same_color  - case 2 - set -g fake_tide_left_prompt_separator_same_color '│' - set -g fake_tide_right_prompt_separator_same_color '│' - case 3 - set -g fake_tide_left_prompt_separator_same_color '╱' - set -g fake_tide_right_prompt_separator_same_color '╱' - case 4 - set -g fake_tide_left_prompt_separator_same_color '' - set -g fake_tide_right_prompt_separator_same_color '' - end - _next_choice powerline/powerline_prompt_heads -end diff --git a/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish b/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish deleted file mode 100644 index 4db04a8..0000000 --- a/fish/functions/tide/configure/choices/lean/lean_prompt_height.fish +++ /dev/null @@ -1,26 +0,0 @@ -function lean_prompt_height - _tide_title 'Prompt Height' - - _tide_option 1 'One line' - _tide_find_and_remove newline fake_tide_left_prompt_items - set -g fake_tide_left_prompt_suffix '' - _tide_display_prompt - - _tide_option 2 'Two lines' - set -g fake_tide_left_prompt_items $fake_tide_left_prompt_items[1..-2] newline $fake_tide_left_prompt_items[-1] - set -g fake_tide_left_prompt_suffix ' ' - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - _tide_find_and_remove newline fake_tide_left_prompt_items - set fake_tide_left_prompt_suffix '' - _next_choice all/prompt_connection_andor_frame_color - case 2 - _tide_find_and_remove newline fake_tide_left_prompt_items - set -g fake_tide_left_prompt_items $fake_tide_left_prompt_items[1..-2] newline $fake_tide_left_prompt_items[-1] - set -g fake_tide_left_prompt_suffix ' ' - _next_choice all/prompt_connection - end -end diff --git a/fish/functions/tide/configure/choices/powerline/powerline_prompt_frame.fish b/fish/functions/tide/configure/choices/powerline/powerline_prompt_frame.fish deleted file mode 100644 index 19b3588..0000000 --- a/fish/functions/tide/configure/choices/powerline/powerline_prompt_frame.fish +++ /dev/null @@ -1,46 +0,0 @@ -function powerline_prompt_frame - _tide_title 'Prompt Frame' - - _tide_option 1 'No frame' - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled false - set -a fake_tide_left_prompt_items character - _tide_display_prompt - set -e fake_tide_left_prompt_items[-1] - - _tide_option 2 Left - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled false - _tide_display_prompt - - _tide_option 3 Right - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled true - set -a fake_tide_left_prompt_items character - _tide_display_prompt - set -e fake_tide_left_prompt_items[-1] - - _tide_option 4 Full - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled true - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled false - set -a fake_tide_left_prompt_items character - case 2 - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled false - case 3 - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled true - set -a fake_tide_left_prompt_items character - case 4 - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled true - end - _next_choice all/prompt_connection_andor_frame_color -end diff --git a/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish b/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish deleted file mode 100644 index ac187c9..0000000 --- a/fish/functions/tide/configure/choices/powerline/powerline_prompt_heads.fish +++ /dev/null @@ -1,40 +0,0 @@ -function powerline_prompt_heads - _tide_title 'Prompt Heads' - - _tide_option 1 Sharp - set -g fake_tide_left_prompt_suffix  - set -g fake_tide_right_prompt_prefix  - _tide_display_prompt - - _tide_option 2 Blurred - set -g fake_tide_left_prompt_suffix '▓▒░' - set -g fake_tide_right_prompt_prefix '░▒▓' - _tide_display_prompt - - _tide_option 3 Slanted - set -g fake_tide_left_prompt_suffix '' - set -g fake_tide_right_prompt_prefix '' - _tide_display_prompt - - _tide_option 4 Round - set -g fake_tide_left_prompt_suffix '' - set -g fake_tide_right_prompt_prefix '' - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - set -g fake_tide_left_prompt_suffix  - set -g fake_tide_right_prompt_prefix  - case 2 - set -g fake_tide_left_prompt_suffix '▓▒░' - set -g fake_tide_right_prompt_prefix '░▒▓' - case 3 - set -g fake_tide_left_prompt_suffix '' - set -g fake_tide_right_prompt_prefix '' - case 4 - set -g fake_tide_left_prompt_suffix '' - set -g fake_tide_right_prompt_prefix '' - end - _next_choice powerline/powerline_prompt_tails -end diff --git a/fish/functions/tide/configure/choices/powerline/powerline_prompt_height.fish b/fish/functions/tide/configure/choices/powerline/powerline_prompt_height.fish deleted file mode 100644 index 83fef05..0000000 --- a/fish/functions/tide/configure/choices/powerline/powerline_prompt_height.fish +++ /dev/null @@ -1,30 +0,0 @@ -function powerline_prompt_height - _tide_title 'Prompt Height' - - _tide_option 1 'One line' - _tide_find_and_remove newline fake_tide_left_prompt_items - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled false - _tide_display_prompt - - _tide_option 2 'Two lines' - set -g fake_tide_left_prompt_items $fake_tide_left_prompt_items newline - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled true - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - _tide_find_and_remove newline fake_tide_left_prompt_items - set fake_tide_left_prompt_frame_enabled false - set fake_tide_right_prompt_frame_enabled false - _next_choice all/prompt_connection_andor_frame_color - case 2 - _tide_find_and_remove newline fake_tide_left_prompt_items - set -g fake_tide_left_prompt_items $fake_tide_left_prompt_items newline - set fake_tide_left_prompt_frame_enabled true - set fake_tide_right_prompt_frame_enabled true - _next_choice all/prompt_connection - end -end diff --git a/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish b/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish deleted file mode 100644 index 02f4609..0000000 --- a/fish/functions/tide/configure/choices/powerline/powerline_prompt_tails.fish +++ /dev/null @@ -1,48 +0,0 @@ -function powerline_prompt_tails - _tide_title 'Prompt Tails' - - _tide_option 1 Flat - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' - _tide_display_prompt - - _tide_option 2 Blurred - set -g fake_tide_left_prompt_prefix '░▒▓' - set -g fake_tide_right_prompt_suffix '▓▒░' - _tide_display_prompt - - _tide_option 3 Sharp - set -g fake_tide_left_prompt_prefix  - set -g fake_tide_right_prompt_suffix  - _tide_display_prompt - - _tide_option 4 Slanted - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' - _tide_display_prompt - - _tide_option 5 Round - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' - case 2 - set -g fake_tide_left_prompt_prefix '░▒▓' - set -g fake_tide_right_prompt_suffix '▓▒░' - case 3 - set -g fake_tide_left_prompt_prefix  - set -g fake_tide_right_prompt_suffix  - case 4 - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' - case 5 - set -g fake_tide_left_prompt_prefix '' - set -g fake_tide_right_prompt_suffix '' - end - _next_choice powerline/powerline_prompt_height -end diff --git a/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish b/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish deleted file mode 100644 index 29f6ccc..0000000 --- a/fish/functions/tide/configure/choices/rainbow/rainbow_prompt_separators.fish +++ /dev/null @@ -1,40 +0,0 @@ -function rainbow_prompt_separators - _tide_title 'Prompt Separators' - - _tide_option 1 Angled - set -g fake_tide_left_prompt_separator_diff_color  - set -g fake_tide_right_prompt_separator_diff_color  - _tide_display_prompt - - _tide_option 2 Vertical - set -g fake_tide_left_prompt_separator_diff_color '' - set -g fake_tide_right_prompt_separator_diff_color '' - _tide_display_prompt - - _tide_option 3 Slanted - set -g fake_tide_left_prompt_separator_diff_color '' - set -g fake_tide_right_prompt_separator_diff_color '' - _tide_display_prompt - - _tide_option 4 Round - set -g fake_tide_left_prompt_separator_diff_color '' - set -g fake_tide_right_prompt_separator_diff_color '' - _tide_display_prompt - - _tide_menu - switch $_tide_selected_option - case 1 - set -g fake_tide_left_prompt_separator_diff_color  - set -g fake_tide_right_prompt_separator_diff_color  - case 2 - set -g fake_tide_left_prompt_separator_diff_color '' - set -g fake_tide_right_prompt_separator_diff_color '' - case 3 - set -g fake_tide_left_prompt_separator_diff_color '' - set -g fake_tide_right_prompt_separator_diff_color '' - case 4 - set -g fake_tide_left_prompt_separator_diff_color '' - set -g fake_tide_right_prompt_separator_diff_color '' - end - _next_choice powerline/powerline_prompt_heads -end diff --git a/fish/functions/tide/configure/configs/classic.fish b/fish/functions/tide/configure/configs/classic.fish deleted file mode 100644 index f844676..0000000 --- a/fish/functions/tide/configure/configs/classic.fish +++ /dev/null @@ -1,151 +0,0 @@ -tide_aws_bg_color 444444 -tide_aws_color FF9900 -tide_aws_icon  -tide_character_color $_tide_color_green -tide_character_color_failure FF0000 -tide_character_icon ❯ -tide_character_vi_icon_default ❮ -tide_character_vi_icon_replace ▶ -tide_character_vi_icon_visual V -tide_chruby_bg_color 444444 -tide_chruby_color B31209 -tide_chruby_icon  -tide_cmd_duration_bg_color 444444 -tide_cmd_duration_color 87875F -tide_cmd_duration_decimals 0 -tide_cmd_duration_icon -tide_cmd_duration_threshold 3000 -tide_context_always_display false -tide_context_bg_color 444444 -tide_context_color_default D7AF87 -tide_context_color_root $_tide_color_gold -tide_context_color_ssh D7AF87 -tide_context_hostname_parts 1 -tide_crystal_bg_color 444444 -tide_crystal_color FFFFFF -tide_crystal_icon ⬢ -tide_direnv_bg_color 444444 -tide_direnv_bg_color_denied 444444 -tide_direnv_color $_tide_color_gold -tide_direnv_color_denied FF0000 -tide_direnv_icon ▼ -tide_distrobox_bg_color 444444 -tide_distrobox_color FF00FF -tide_distrobox_icon ⬢ -tide_docker_bg_color 444444 -tide_docker_color 2496ED -tide_docker_default_contexts default colima -tide_docker_icon  -tide_elixir_bg_color 444444 -tide_elixir_color 4E2A8E -tide_elixir_icon  -tide_gcloud_bg_color 444444 -tide_gcloud_color 4285F4 -tide_gcloud_icon  -tide_git_bg_color 444444 -tide_git_bg_color_unstable 444444 -tide_git_bg_color_urgent 444444 -tide_git_color_branch $_tide_color_green -tide_git_color_conflicted FF0000 -tide_git_color_dirty $_tide_color_gold -tide_git_color_operation FF0000 -tide_git_color_staged $_tide_color_gold -tide_git_color_stash $_tide_color_green -tide_git_color_untracked $_tide_color_light_blue -tide_git_color_upstream $_tide_color_green -tide_git_icon -tide_git_truncation_length 24 -tide_git_truncation_strategy -tide_go_bg_color 444444 -tide_go_color 00ACD7 -tide_go_icon  -tide_java_bg_color 444444 -tide_java_color ED8B00 -tide_java_icon  -tide_jobs_bg_color 444444 -tide_jobs_color $_tide_color_dark_green -tide_jobs_icon  -tide_kubectl_bg_color 444444 -tide_kubectl_color 326CE5 -tide_kubectl_icon ⎈ -tide_left_prompt_frame_enabled true -tide_left_prompt_items pwd git newline -tide_left_prompt_prefix '' -tide_left_prompt_separator_diff_color  -tide_left_prompt_separator_same_color  -tide_left_prompt_suffix  -tide_nix_shell_bg_color 444444 -tide_nix_shell_color 7EBAE4 -tide_nix_shell_icon  -tide_node_bg_color 444444 -tide_node_color 44883E -tide_node_icon ⬢ -tide_os_bg_color 444444 -tide_os_color EEEEEE -tide_os_icon $os_branding_icon -tide_php_bg_color 444444 -tide_php_color 617CBE -tide_php_icon  -tide_private_mode_bg_color 444444 -tide_private_mode_color FFFFFF -tide_private_mode_icon 﫸 -tide_prompt_add_newline_before true -tide_prompt_color_frame_and_connection 6C6C6C -tide_prompt_color_separator_same_color 949494 -tide_prompt_icon_connection ' ' -tide_prompt_min_cols 34 -tide_prompt_pad_items true -tide_pulumi_bg_color 444444 -tide_pulumi_color F7BF2A -tide_pulumi_icon '' -tide_pwd_bg_color 444444 -tide_pwd_color_anchors $_tide_color_light_blue -tide_pwd_color_dirs $_tide_color_dark_blue -tide_pwd_color_truncated_dirs 8787AF -tide_pwd_icon -tide_pwd_icon_home -tide_pwd_icon_unwritable  -tide_pwd_markers .bzr .citc .git .hg .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform Cargo.toml composer.json CVS go.mod package.json -tide_right_prompt_frame_enabled true -tide_right_prompt_items status cmd_duration context jobs direnv node virtual_env rustc java php pulumi chruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir -tide_right_prompt_prefix  -tide_right_prompt_separator_diff_color  -tide_right_prompt_separator_same_color  -tide_right_prompt_suffix '' -tide_rustc_bg_color 444444 -tide_rustc_color F74C00 -tide_rustc_icon  -tide_shlvl_bg_color 444444 -tide_shlvl_color d78700 -tide_shlvl_icon  -tide_shlvl_threshold 1 -tide_status_bg_color 444444 -tide_status_bg_color_failure 444444 -tide_status_color $_tide_color_dark_green -tide_status_color_failure D70000 -tide_status_icon ✔ -tide_status_icon_failure ✘ -tide_terraform_bg_color 444444 -tide_terraform_color 844FBA -tide_terraform_icon -tide_time_bg_color 444444 -tide_time_color 5F8787 -tide_time_format %T -tide_toolbox_bg_color 444444 -tide_toolbox_color 613583 -tide_toolbox_icon ⬢ -tide_vi_mode_bg_color_default 444444 -tide_vi_mode_bg_color_insert 444444 -tide_vi_mode_bg_color_replace 444444 -tide_vi_mode_bg_color_visual 444444 -tide_vi_mode_color_default 949494 -tide_vi_mode_color_insert 87AFAF -tide_vi_mode_color_replace 87AF87 -tide_vi_mode_color_visual FF8700 -tide_vi_mode_icon_default D -tide_vi_mode_icon_insert I -tide_vi_mode_icon_replace R -tide_vi_mode_icon_visual V -tide_virtual_env_bg_color 444444 -tide_virtual_env_color 00AFAF -tide_virtual_env_icon  diff --git a/fish/functions/tide/configure/configs/classic_16color.fish b/fish/functions/tide/configure/configs/classic_16color.fish deleted file mode 100644 index 6043117..0000000 --- a/fish/functions/tide/configure/configs/classic_16color.fish +++ /dev/null @@ -1,87 +0,0 @@ -tide_aws_bg_color black -tide_aws_color yellow -tide_character_color brgreen -tide_character_color_failure brred -tide_chruby_bg_color black -tide_chruby_color red -tide_cmd_duration_bg_color black -tide_cmd_duration_color brblack -tide_context_bg_color black -tide_context_color_default yellow -tide_context_color_root bryellow -tide_context_color_ssh yellow -tide_crystal_bg_color black -tide_crystal_color brwhite -tide_direnv_bg_color black -tide_direnv_bg_color_denied black -tide_direnv_color bryellow -tide_direnv_color_denied brred -tide_distrobox_bg_color black -tide_distrobox_color brmagenta -tide_docker_bg_color black -tide_docker_color blue -tide_elixir_bg_color black -tide_elixir_color magenta -tide_gcloud_bg_color black -tide_gcloud_color blue -tide_git_bg_color black -tide_git_bg_color_unstable black -tide_git_bg_color_urgent black -tide_git_color_branch brgreen -tide_git_color_conflicted brred -tide_git_color_dirty bryellow -tide_git_color_operation brred -tide_git_color_staged bryellow -tide_git_color_stash brgreen -tide_git_color_untracked brblue -tide_git_color_upstream brgreen -tide_go_bg_color black -tide_go_color brcyan -tide_java_bg_color black -tide_java_color yellow -tide_jobs_bg_color black -tide_jobs_color green -tide_kubectl_bg_color black -tide_kubectl_color blue -tide_nix_shell_bg_color black -tide_nix_shell_color brblue -tide_node_bg_color black -tide_node_color green -tide_os_bg_color black -tide_os_color brwhite -tide_php_bg_color black -tide_php_color blue -tide_private_mode_bg_color black -tide_private_mode_color brwhite -tide_prompt_color_frame_and_connection brblack -tide_prompt_color_separator_same_color brblack -tide_pulumi_bg_color black -tide_pulumi_color yellow -tide_pwd_bg_color black -tide_pwd_color_anchors brcyan -tide_pwd_color_dirs cyan -tide_pwd_color_truncated_dirs magenta -tide_rustc_bg_color black -tide_rustc_color red -tide_shlvl_bg_color black -tide_shlvl_color yellow -tide_status_bg_color black -tide_status_bg_color_failure black -tide_status_color green -tide_status_color_failure red -tide_terraform_bg_color black -tide_terraform_color magenta -tide_time_bg_color black -tide_time_color brblack -tide_toolbox_bg_color black -tide_toolbox_color magenta -tide_vi_mode_bg_color_default black -tide_vi_mode_bg_color_insert black -tide_vi_mode_bg_color_replace black -tide_vi_mode_bg_color_visual black -tide_vi_mode_color_default white -tide_vi_mode_color_insert cyan -tide_vi_mode_color_replace green -tide_vi_mode_color_visual yellow -tide_virtual_env_bg_color black -tide_virtual_env_color cyan diff --git a/fish/functions/tide/configure/configs/lean.fish b/fish/functions/tide/configure/configs/lean.fish deleted file mode 100644 index 853bde9..0000000 --- a/fish/functions/tide/configure/configs/lean.fish +++ /dev/null @@ -1,151 +0,0 @@ -tide_aws_bg_color normal -tide_aws_color FF9900 -tide_aws_icon  -tide_character_color $_tide_color_green -tide_character_color_failure FF0000 -tide_character_icon ❯ -tide_character_vi_icon_default ❮ -tide_character_vi_icon_replace ▶ -tide_character_vi_icon_visual V -tide_chruby_bg_color normal -tide_chruby_color B31209 -tide_chruby_icon  -tide_cmd_duration_bg_color normal -tide_cmd_duration_color 87875F -tide_cmd_duration_decimals 0 -tide_cmd_duration_icon -tide_cmd_duration_threshold 3000 -tide_context_always_display false -tide_context_bg_color normal -tide_context_color_default D7AF87 -tide_context_color_root $_tide_color_gold -tide_context_color_ssh D7AF87 -tide_context_hostname_parts 1 -tide_crystal_bg_color normal -tide_crystal_color FFFFFF -tide_crystal_icon ⬢ -tide_direnv_bg_color normal -tide_direnv_bg_color_denied normal -tide_direnv_color $_tide_color_gold -tide_direnv_color_denied FF0000 -tide_direnv_icon ▼ -tide_distrobox_bg_color normal -tide_distrobox_color FF00FF -tide_distrobox_icon ⬢ -tide_docker_bg_color normal -tide_docker_color 2496ED -tide_docker_default_contexts default colima -tide_docker_icon  -tide_elixir_bg_color normal -tide_elixir_color 4E2A8E -tide_elixir_icon  -tide_gcloud_bg_color normal -tide_gcloud_color 4285F4 -tide_gcloud_icon  -tide_git_bg_color normal -tide_git_bg_color_unstable normal -tide_git_bg_color_urgent normal -tide_git_color_branch $_tide_color_green -tide_git_color_conflicted FF0000 -tide_git_color_dirty $_tide_color_gold -tide_git_color_operation FF0000 -tide_git_color_staged $_tide_color_gold -tide_git_color_stash $_tide_color_green -tide_git_color_untracked $_tide_color_light_blue -tide_git_color_upstream $_tide_color_green -tide_git_icon -tide_git_truncation_length 24 -tide_git_truncation_strategy -tide_go_bg_color normal -tide_go_color 00ACD7 -tide_go_icon  -tide_java_bg_color normal -tide_java_color ED8B00 -tide_java_icon  -tide_jobs_bg_color normal -tide_jobs_color $_tide_color_dark_green -tide_jobs_icon  -tide_kubectl_bg_color normal -tide_kubectl_color 326CE5 -tide_kubectl_icon ⎈ -tide_left_prompt_frame_enabled false -tide_left_prompt_items pwd git newline character -tide_left_prompt_prefix '' -tide_left_prompt_separator_diff_color ' ' -tide_left_prompt_separator_same_color ' ' -tide_left_prompt_suffix ' ' -tide_nix_shell_bg_color normal -tide_nix_shell_color 7EBAE4 -tide_nix_shell_icon  -tide_node_bg_color normal -tide_node_color 44883E -tide_node_icon ⬢ -tide_os_bg_color normal -tide_os_color normal -tide_os_icon $os_branding_icon -tide_php_bg_color normal -tide_php_color 617CBE -tide_php_icon  -tide_private_mode_bg_color normal -tide_private_mode_color FFFFFF -tide_private_mode_icon 﫸 -tide_prompt_add_newline_before true -tide_prompt_color_frame_and_connection 6C6C6C -tide_prompt_color_separator_same_color 949494 -tide_prompt_icon_connection ' ' -tide_prompt_min_cols 34 -tide_prompt_pad_items false -tide_pulumi_bg_color normal -tide_pulumi_color F7BF2A -tide_pulumi_icon '' -tide_pwd_bg_color normal -tide_pwd_color_anchors $_tide_color_light_blue -tide_pwd_color_dirs $_tide_color_dark_blue -tide_pwd_color_truncated_dirs 8787AF -tide_pwd_icon -tide_pwd_icon_home -tide_pwd_icon_unwritable  -tide_pwd_markers .bzr .citc .git .hg .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform Cargo.toml composer.json CVS go.mod package.json -tide_right_prompt_frame_enabled false -tide_right_prompt_items status cmd_duration context jobs direnv node virtual_env rustc java php pulumi chruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir -tide_right_prompt_prefix ' ' -tide_right_prompt_separator_diff_color ' ' -tide_right_prompt_separator_same_color ' ' -tide_right_prompt_suffix '' -tide_rustc_bg_color normal -tide_rustc_color F74C00 -tide_rustc_icon  -tide_shlvl_bg_color normal -tide_shlvl_color d78700 -tide_shlvl_icon  -tide_shlvl_threshold 1 -tide_status_bg_color normal -tide_status_bg_color_failure normal -tide_status_color $_tide_color_dark_green -tide_status_color_failure D70000 -tide_status_icon ✔ -tide_status_icon_failure ✘ -tide_terraform_bg_color normal -tide_terraform_color 844FBA -tide_terraform_icon -tide_time_bg_color normal -tide_time_color 5F8787 -tide_time_format %T -tide_toolbox_bg_color normal -tide_toolbox_color 613583 -tide_toolbox_icon ⬢ -tide_vi_mode_bg_color_default normal -tide_vi_mode_bg_color_insert normal -tide_vi_mode_bg_color_replace normal -tide_vi_mode_bg_color_visual normal -tide_vi_mode_color_default 949494 -tide_vi_mode_color_insert 87AFAF -tide_vi_mode_color_replace 87AF87 -tide_vi_mode_color_visual FF8700 -tide_vi_mode_icon_default D -tide_vi_mode_icon_insert I -tide_vi_mode_icon_replace R -tide_vi_mode_icon_visual V -tide_virtual_env_bg_color normal -tide_virtual_env_color 00AFAF -tide_virtual_env_icon  diff --git a/fish/functions/tide/configure/configs/lean_16color.fish b/fish/functions/tide/configure/configs/lean_16color.fish deleted file mode 100644 index 546868d..0000000 --- a/fish/functions/tide/configure/configs/lean_16color.fish +++ /dev/null @@ -1,87 +0,0 @@ -tide_aws_bg_color normal -tide_aws_color yellow -tide_character_color brgreen -tide_character_color_failure brred -tide_chruby_bg_color normal -tide_chruby_color red -tide_cmd_duration_bg_color normal -tide_cmd_duration_color brblack -tide_context_bg_color normal -tide_context_color_default yellow -tide_context_color_root bryellow -tide_context_color_ssh yellow -tide_crystal_bg_color normal -tide_crystal_color brwhite -tide_direnv_bg_color normal -tide_direnv_bg_color_denied normal -tide_direnv_color bryellow -tide_direnv_color_denied brred -tide_distrobox_bg_color normal -tide_distrobox_color brmagenta -tide_docker_bg_color normal -tide_docker_color blue -tide_elixir_bg_color normal -tide_elixir_color magenta -tide_gcloud_bg_color normal -tide_gcloud_color blue -tide_git_bg_color normal -tide_git_bg_color_unstable normal -tide_git_bg_color_urgent normal -tide_git_color_branch brgreen -tide_git_color_conflicted brred -tide_git_color_dirty bryellow -tide_git_color_operation brred -tide_git_color_staged bryellow -tide_git_color_stash brgreen -tide_git_color_untracked brblue -tide_git_color_upstream brgreen -tide_go_bg_color normal -tide_go_color brcyan -tide_java_bg_color normal -tide_java_color yellow -tide_jobs_bg_color normal -tide_jobs_color green -tide_kubectl_bg_color normal -tide_kubectl_color blue -tide_nix_shell_bg_color normal -tide_nix_shell_color brblue -tide_node_bg_color normal -tide_node_color green -tide_os_bg_color normal -tide_os_color brwhite -tide_php_bg_color normal -tide_php_color blue -tide_private_mode_bg_color normal -tide_private_mode_color brwhite -tide_prompt_color_frame_and_connection brblack -tide_prompt_color_separator_same_color brblack -tide_pulumi_bg_color normal -tide_pulumi_color yellow -tide_pwd_bg_color normal -tide_pwd_color_anchors brcyan -tide_pwd_color_dirs cyan -tide_pwd_color_truncated_dirs magenta -tide_rustc_bg_color normal -tide_rustc_color red -tide_shlvl_bg_color normal -tide_shlvl_color yellow -tide_status_bg_color normal -tide_status_bg_color_failure normal -tide_status_color green -tide_status_color_failure red -tide_terraform_bg_color normal -tide_terraform_color magenta -tide_time_bg_color normal -tide_time_color brblack -tide_toolbox_bg_color normal -tide_toolbox_color magenta -tide_vi_mode_bg_color_default normal -tide_vi_mode_bg_color_insert normal -tide_vi_mode_bg_color_replace normal -tide_vi_mode_bg_color_visual normal -tide_vi_mode_color_default white -tide_vi_mode_color_insert cyan -tide_vi_mode_color_replace green -tide_vi_mode_color_visual yellow -tide_virtual_env_bg_color normal -tide_virtual_env_color cyan diff --git a/fish/functions/tide/configure/configs/rainbow.fish b/fish/functions/tide/configure/configs/rainbow.fish deleted file mode 100644 index 5087f36..0000000 --- a/fish/functions/tide/configure/configs/rainbow.fish +++ /dev/null @@ -1,151 +0,0 @@ -tide_aws_bg_color FF9900 -tide_aws_color 232F3E -tide_aws_icon  -tide_character_color $_tide_color_green -tide_character_color_failure FF0000 -tide_character_icon ❯ -tide_character_vi_icon_default ❮ -tide_character_vi_icon_replace ▶ -tide_character_vi_icon_visual V -tide_chruby_bg_color B31209 -tide_chruby_color 000000 -tide_chruby_icon  -tide_cmd_duration_bg_color C4A000 -tide_cmd_duration_color 000000 -tide_cmd_duration_decimals 0 -tide_cmd_duration_icon -tide_cmd_duration_threshold 3000 -tide_context_always_display false -tide_context_bg_color 444444 -tide_context_color_default D7AF87 -tide_context_color_root $_tide_color_gold -tide_context_color_ssh D7AF87 -tide_context_hostname_parts 1 -tide_crystal_bg_color FFFFFF -tide_crystal_color 000000 -tide_crystal_icon ⬢ -tide_direnv_bg_color $_tide_color_gold -tide_direnv_bg_color_denied FF0000 -tide_direnv_color 000000 -tide_direnv_color_denied 000000 -tide_direnv_icon ▼ -tide_distrobox_bg_color FF00FF -tide_distrobox_color 000000 -tide_distrobox_icon ⬢ -tide_docker_bg_color 2496ED -tide_docker_color 000000 -tide_docker_default_contexts default colima -tide_docker_icon  -tide_elixir_bg_color 4E2A8E -tide_elixir_color 000000 -tide_elixir_icon  -tide_gcloud_bg_color 4285F4 -tide_gcloud_color 000000 -tide_gcloud_icon  -tide_git_bg_color 4E9A06 -tide_git_bg_color_unstable C4A000 -tide_git_bg_color_urgent CC0000 -tide_git_color_branch 000000 -tide_git_color_conflicted 000000 -tide_git_color_dirty 000000 -tide_git_color_operation 000000 -tide_git_color_staged 000000 -tide_git_color_stash 000000 -tide_git_color_untracked 000000 -tide_git_color_upstream 000000 -tide_git_icon -tide_git_truncation_length 24 -tide_git_truncation_strategy -tide_go_bg_color 00ACD7 -tide_go_color 000000 -tide_go_icon  -tide_java_bg_color ED8B00 -tide_java_color 000000 -tide_java_icon  -tide_jobs_bg_color 444444 -tide_jobs_color 4E9A06 -tide_jobs_icon  -tide_kubectl_bg_color 326CE5 -tide_kubectl_color 000000 -tide_kubectl_icon ⎈ -tide_left_prompt_frame_enabled true -tide_left_prompt_items pwd git newline -tide_left_prompt_prefix '' -tide_left_prompt_separator_diff_color  -tide_left_prompt_separator_same_color  -tide_left_prompt_suffix  -tide_nix_shell_bg_color 7EBAE4 -tide_nix_shell_color 000000 -tide_nix_shell_icon  -tide_node_bg_color 44883E -tide_node_color 000000 -tide_node_icon ⬢ -tide_os_bg_color $os_branding_bg_color -tide_os_color $os_branding_color -tide_os_icon $os_branding_icon -tide_php_bg_color 617CBE -tide_php_color 000000 -tide_php_icon  -tide_private_mode_bg_color F1F3F4 -tide_private_mode_color 000000 -tide_private_mode_icon 﫸 -tide_prompt_add_newline_before true -tide_prompt_color_frame_and_connection 6C6C6C -tide_prompt_color_separator_same_color 949494 -tide_prompt_icon_connection ' ' -tide_prompt_min_cols 34 -tide_prompt_pad_items true -tide_pulumi_bg_color F7BF2A -tide_pulumi_color 000000 -tide_pulumi_icon '' -tide_pwd_bg_color 3465A4 -tide_pwd_color_anchors E4E4E4 -tide_pwd_color_dirs E4E4E4 -tide_pwd_color_truncated_dirs BCBCBC -tide_pwd_icon -tide_pwd_icon_home -tide_pwd_icon_unwritable  -tide_pwd_markers .bzr .citc .git .hg .node-version .python-version .ruby-version .shorten_folder_marker .svn .terraform Cargo.toml composer.json CVS go.mod package.json -tide_right_prompt_frame_enabled true -tide_right_prompt_items status cmd_duration context jobs direnv node virtual_env rustc java php pulumi chruby go gcloud kubectl distrobox toolbox terraform aws nix_shell crystal elixir -tide_right_prompt_prefix  -tide_right_prompt_separator_diff_color  -tide_right_prompt_separator_same_color  -tide_right_prompt_suffix '' -tide_rustc_bg_color F74C00 -tide_rustc_color 000000 -tide_rustc_icon  -tide_shlvl_bg_color 808000 -tide_shlvl_color 000000 -tide_shlvl_icon  -tide_shlvl_threshold 1 -tide_status_bg_color 2E3436 -tide_status_bg_color_failure CC0000 -tide_status_color 4E9A06 -tide_status_color_failure FFFF00 -tide_status_icon ✔ -tide_status_icon_failure ✘ -tide_terraform_bg_color 800080 -tide_terraform_color 000000 -tide_terraform_icon -tide_time_bg_color D3D7CF -tide_time_color 000000 -tide_time_format %T -tide_toolbox_bg_color 613583 -tide_toolbox_color 000000 -tide_toolbox_icon ⬢ -tide_vi_mode_bg_color_default 949494 -tide_vi_mode_bg_color_insert 87AFAF -tide_vi_mode_bg_color_replace 87AF87 -tide_vi_mode_bg_color_visual FF8700 -tide_vi_mode_color_default 000000 -tide_vi_mode_color_insert 000000 -tide_vi_mode_color_replace 000000 -tide_vi_mode_color_visual 000000 -tide_vi_mode_icon_default D -tide_vi_mode_icon_insert I -tide_vi_mode_icon_replace R -tide_vi_mode_icon_visual V -tide_virtual_env_bg_color 444444 -tide_virtual_env_color 00AFAF -tide_virtual_env_icon  diff --git a/fish/functions/tide/configure/configs/rainbow_16color.fish b/fish/functions/tide/configure/configs/rainbow_16color.fish deleted file mode 100644 index 7803596..0000000 --- a/fish/functions/tide/configure/configs/rainbow_16color.fish +++ /dev/null @@ -1,91 +0,0 @@ -tide_aws_bg_color yellow -tide_aws_color brblack -tide_character_color brgreen -tide_character_color_failure brred -tide_chruby_bg_color red -tide_chruby_color black -tide_cmd_duration_bg_color yellow -tide_cmd_duration_color black -tide_context_bg_color brblack -tide_context_color_default yellow -tide_context_color_root yellow -tide_context_color_ssh yellow -tide_crystal_bg_color brwhite -tide_crystal_color black -tide_direnv_bg_color bryellow -tide_direnv_bg_color_denied brred -tide_direnv_color black -tide_direnv_color_denied black -tide_distrobox_bg_color brmagenta -tide_distrobox_color black -tide_docker_bg_color blue -tide_docker_color black -tide_elixir_bg_color magenta -tide_elixir_color black -tide_gcloud_bg_color blue -tide_gcloud_color black -tide_git_bg_color green -tide_git_bg_color_unstable yellow -tide_git_bg_color_urgent red -tide_git_color_branch black -tide_git_color_conflicted black -tide_git_color_dirty black -tide_git_color_operation black -tide_git_color_staged black -tide_git_color_stash black -tide_git_color_untracked black -tide_git_color_upstream black -tide_go_bg_color brcyan -tide_go_color black -tide_java_bg_color yellow -tide_java_color black -tide_jobs_bg_color brblack -tide_jobs_color green -tide_kubectl_bg_color blue -tide_kubectl_color black -tide_nix_shell_bg_color brblue -tide_nix_shell_color black -tide_node_bg_color green -tide_node_color black -tide_os_bg_color white -tide_os_color black -tide_php_bg_color blue -tide_php_color black -tide_private_mode_bg_color brwhite -tide_private_mode_color black -tide_prompt_color_frame_and_connection brblack -tide_prompt_color_separator_same_color brblack -tide_pulumi_bg_color yellow -tide_pulumi_color black -tide_pwd_bg_color blue -tide_pwd_color_anchors brwhite -tide_pwd_color_dirs brwhite -tide_pwd_color_truncated_dirs white -tide_rustc_bg_color red -tide_rustc_color black -tide_shlvl_bg_color yellow -tide_shlvl_color black -tide_status_bg_color black -tide_status_bg_color_failure red -tide_status_color green -tide_status_color_failure bryellow -tide_terraform_bg_color magenta -tide_terraform_color black -tide_time_bg_color white -tide_time_color black -tide_toolbox_bg_color magenta -tide_toolbox_color black -tide_vi_mode_bg_color_default white -tide_vi_mode_bg_color_insert cyan -tide_vi_mode_bg_color_replace green -tide_vi_mode_bg_color_visual yellow -tide_vi_mode_color_default black -tide_vi_mode_color_insert black -tide_vi_mode_color_replace black -tide_vi_mode_color_visual black -tide_vi_mode_icon_default D -tide_vi_mode_icon_insert I -tide_vi_mode_icon_replace R -tide_vi_mode_icon_visual V -tide_virtual_env_bg_color brblack -tide_virtual_env_color cyan diff --git a/fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish b/fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish deleted file mode 100644 index 4661ab1..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_cache_variables.fish +++ /dev/null @@ -1,41 +0,0 @@ -function _fake_tide_cache_variables - # pwd - set_color -o $fake_tide_pwd_color_anchors | read -gx _fake_tide_color_anchors - set -gx _fake_tide_color_truncated_dirs "$(set_color $fake_tide_pwd_color_truncated_dirs)" - set -gx _fake_tide_reset_to_color_dirs (set_color normal -b $fake_tide_pwd_bg_color; set_color $fake_tide_pwd_color_dirs) - - # git - contains git $fake_tide_left_prompt_items $fake_tide_right_prompt_items && - set -gx _fake_tide_location_color "$(set_color $fake_tide_git_color_branch)" - - # private_mode - if contains private_mode $fake_tide_left_prompt_items $fake_tide_right_prompt_items && test -n "$fish_private_mode" - set -gx _fake_tide_private_mode - else - set -e _fake_tide_private_mode - end - - # Same-color-separator color - set -gx _fake_tide_color_separator_same_color "$(set_color $fake_tide_prompt_color_separator_same_color)" - - # two line prompt - if contains newline $fake_tide_left_prompt_items - set_color $fake_tide_prompt_color_frame_and_connection -b normal | read -gx _fake_tide_prompt_and_frame_color - else - set -e _fake_tide_prompt_and_frame_color - end - - # newline before - if test "$fake_tide_prompt_add_newline_before" = true - set -g _fake_tide_add_newline '' - else - set -e _fake_tide_add_newline - end - - # item padding - if test "$fake_tide_prompt_pad_items" = true - set -gx _fake_tide_pad ' ' - else - set -e _fake_tide_pad - end -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_item_character.fish b/fish/functions/tide/configure/functions/_fake_tide_item_character.fish deleted file mode 100644 index 73ae055..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_item_character.fish +++ /dev/null @@ -1,5 +0,0 @@ -function _fake_tide_item_character - set_color $fake_tide_character_color - contains newline $fake_tide_left_prompt_items || echo -ns ' ' - echo -ns $fake_tide_character_icon -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish b/fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish deleted file mode 100644 index 5aa13b2..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_item_cmd_duration.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _fake_tide_item_cmd_duration - _fake_tide_print_item cmd_duration $fake_tide_cmd_duration_icon' ' 5s -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_item_git.fish b/fish/functions/tide/configure/functions/_fake_tide_item_git.fish deleted file mode 100644 index fb5b957..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_item_git.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _fake_tide_item_git - _fake_tide_print_item git (set_color $fake_tide_git_color_branch) $fake_tide_git_icon' ' main -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_item_newline.fish b/fish/functions/tide/configure/functions/_fake_tide_item_newline.fish deleted file mode 100644 index c614bab..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_item_newline.fish +++ /dev/null @@ -1,5 +0,0 @@ -function _fake_tide_item_newline - set_color $prev_bg_color -b normal - var=fake_tide_"$_fake_tide_side"_prompt_suffix echo $$var - set -g add_prefix -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_item_os.fish b/fish/functions/tide/configure/functions/_fake_tide_item_os.fish deleted file mode 100644 index 5255721..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_item_os.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _fake_tide_item_os - _fake_tide_print_item os $fake_tide_os_icon -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_item_time.fish b/fish/functions/tide/configure/functions/_fake_tide_item_time.fish deleted file mode 100644 index bbce0b5..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_item_time.fish +++ /dev/null @@ -1,3 +0,0 @@ -function _fake_tide_item_time - _fake_tide_print_item time (date +$fake_tide_time_format) -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_print_item.fish b/fish/functions/tide/configure/functions/_fake_tide_print_item.fish deleted file mode 100644 index 30cd024..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_print_item.fish +++ /dev/null @@ -1,22 +0,0 @@ -function _fake_tide_print_item -a item - var=fake_tide_"$item"_bg_color set -f item_bg_color $$var - - if set -e add_prefix - set_color $item_bg_color -b normal - var=fake_tide_"$_fake_tide_side"_prompt_prefix echo -ns $$var - else if test "$item_bg_color" = "$prev_bg_color" - var=fake_tide_"$_fake_tide_side"_prompt_separator_same_color echo -ns $_fake_tide_color_separator_same_color$$var - else if test "$_fake_tide_side" = left - set_color $prev_bg_color -b $item_bg_color - echo -ns $fake_tide_left_prompt_separator_diff_color - else - set_color $item_bg_color -b $prev_bg_color - echo -ns $fake_tide_right_prompt_separator_diff_color - end - - var=fake_tide_"$item"_color set_color $$var -b $item_bg_color - - echo -ns $_fake_tide_pad $argv[2..] $_fake_tide_pad - - set -g prev_bg_color $item_bg_color -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_prompt.fish b/fish/functions/tide/configure/functions/_fake_tide_prompt.fish deleted file mode 100644 index 11f20ca..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_prompt.fish +++ /dev/null @@ -1,42 +0,0 @@ -function _fake_tide_prompt - set -g add_prefix - _fake_tide_side=left set -f left (for item in $fake_tide_left_prompt_items - _fake_tide_item_$item - end - if not set -e add_prefix - set_color $prev_bg_color -b normal - echo -ns $fake_tide_left_prompt_suffix - end) - - set -g add_prefix - _fake_tide_side=right set -f right (for item in $fake_tide_right_prompt_items - _fake_tide_item_$item - end - if not set -e add_prefix - set_color $prev_bg_color -b normal - echo -ns $fake_tide_right_prompt_suffix - end) - - if set -q _fake_tide_prompt_and_frame_color # If prompt is two lines - test "$fake_tide_left_prompt_frame_enabled" = true && - set left[1] "$_fake_tide_prompt_and_frame_color╭─$left[1]" && - set left[2] "$_fake_tide_prompt_and_frame_color╰─$left[2]" - test "$fake_tide_right_prompt_frame_enabled" = true && - set right[1] "$right[1]$_fake_tide_prompt_and_frame_color─╮" && - set right[2] "$right[2]$_fake_tide_prompt_and_frame_color─╯" - - # 5 = @PWD@ length which will be replaced - math $fake_columns+5-(string length --visible "$left[1]$right[1]") | read -lx dist_btwn_sides - echo -ns "$right[2]"\n(string replace @PWD@ (_fake_tide_pwd) "$left[1]")$_fake_tide_prompt_and_frame_color - - string repeat --no-newline --max (math max 0, $dist_btwn_sides-$_tide_pwd_len) $fake_tide_prompt_icon_connection - echo -ns "$right[1]"\n"$left[2] " - else - math $fake_columns+5-(string length --visible "$left[1]$right[1]") -$fake_tide_prompt_min_cols | read -lx dist_btwn_sides - string replace @PWD@ (_fake_tide_pwd) "$right[1]" "$left[1] " - end -end - -function _fake_tide_item_pwd - _fake_tide_print_item pwd @PWD@ -end diff --git a/fish/functions/tide/configure/functions/_fake_tide_pwd.fish b/fish/functions/tide/configure/functions/_fake_tide_pwd.fish deleted file mode 100644 index 433eafa..0000000 --- a/fish/functions/tide/configure/functions/_fake_tide_pwd.fish +++ /dev/null @@ -1,11 +0,0 @@ -function _fake_tide_pwd - set -l out ( - set_color $fake_tide_pwd_color_dirs - echo -ns $fake_tide_pwd_icon' ' '~/' - set_color -o $fake_tide_pwd_color_anchors - echo -ns src - set_color normal -b $fake_tide_pwd_bg_color - ) - set -g _tide_pwd_len (string length --visible $out) - echo -ns $out -end diff --git a/fish/themes/tokyonight_night.theme b/fish/themes/tokyonight_night.theme deleted file mode 100644 index 2c33869..0000000 --- a/fish/themes/tokyonight_night.theme +++ /dev/null @@ -1,25 +0,0 @@ - - # TokyoNight - - # Syntax Highlighting Colors - fish_color_normal c0caf5 - fish_color_command 7dcfff - fish_color_keyword bb9af7 - fish_color_quote e0af68 - fish_color_redirection c0caf5 - fish_color_end ff9e64 - fish_color_error f7768e - fish_color_param 9d7cd8 - fish_color_comment 565f89 - fish_color_selection --background=33467c - fish_color_search_match --background=33467c - fish_color_operator 9ece6a - fish_color_escape bb9af7 - fish_color_autosuggestion 565f89 - - # Completion Pager Colors - fish_pager_color_progress 565f89 - fish_pager_color_prefix 7dcfff - fish_pager_color_completion c0caf5 - fish_pager_color_description 565f89 - fish_pager_color_selected_background --background=33467c diff --git a/fish/tokyonight_night.fish b/fish/tokyonight_night.fish deleted file mode 100644 index f79979f..0000000 --- a/fish/tokyonight_night.fish +++ /dev/null @@ -1,34 +0,0 @@ - # TokyoNight Color Palette - set -l foreground c0caf5 - set -l selection 33467c - set -l comment 565f89 - set -l red f7768e - set -l orange ff9e64 - set -l yellow e0af68 - set -l green 9ece6a - set -l purple 9d7cd8 - set -l cyan 7dcfff - set -l pink bb9af7 - - # Syntax Highlighting Colors - set -g fish_color_normal $foreground - set -g fish_color_command $cyan - set -g fish_color_keyword $pink - set -g fish_color_quote $yellow - set -g fish_color_redirection $foreground - set -g fish_color_end $orange - set -g fish_color_error $red - set -g fish_color_param $purple - set -g fish_color_comment $comment - set -g fish_color_selection --background=$selection - set -g fish_color_search_match --background=$selection - set -g fish_color_operator $green - set -g fish_color_escape $pink - set -g fish_color_autosuggestion $comment - - # Completion Pager Colors - set -g fish_pager_color_progress $comment - set -g fish_pager_color_prefix $cyan - set -g fish_pager_color_completion $foreground - set -g fish_pager_color_description $comment - set -g fish_pager_color_selected_background --background=$selection diff --git a/fontconfig/fonts.conf b/fontconfig/fonts.conf deleted file mode 100644 index b22732e..0000000 --- a/fontconfig/fonts.conf +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - true - - - true - - - hintnone - - - none - - - true - - - lcdnone - - - 102 - - - diff --git a/gamemode.ini b/gamemode.ini deleted file mode 100644 index f2afea8..0000000 --- a/gamemode.ini +++ /dev/null @@ -1,17 +0,0 @@ -[general] -renice=15 -reaper_freq=5 -desiredgov=performance -defaultgov=powersave -ioprio=0 - -[filter] -blacklist=steam steamwebhelper - -[gpu] -apply_gpu_optimisations=accept-responsibility -gpu_device=0 -amd_performance_level=high - - - diff --git a/gtk-3.0/settings.ini b/gtk-3.0/settings.ini deleted file mode 100644 index 29322c1..0000000 --- a/gtk-3.0/settings.ini +++ /dev/null @@ -1,2 +0,0 @@ -[Settings] -gtk-application-prefer-dark-theme=1 diff --git a/hypr/conf/autostart.conf b/hypr/conf/autostart.conf deleted file mode 100644 index 3a31a5e..0000000 --- a/hypr/conf/autostart.conf +++ /dev/null @@ -1,9 +0,0 @@ -#autostart programs -exec-once=hyprpaper -exec-once=ironbar -exec-once=firefox -exec-once=streamdeck -n -exec-once=oxipaste_daemon -exec-once=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 -exec-once=nextcloud --background -exec-once=oxinoti diff --git a/hypr/conf/env.conf b/hypr/conf/env.conf deleted file mode 100644 index 3faee28..0000000 --- a/hypr/conf/env.conf +++ /dev/null @@ -1,26 +0,0 @@ -#fix the fucking portal -exec-once=systemctl --user import-environment -exec-once=dbus-update-activation-environment --systemd --all -exec-once=hyprctl setcursor Bibata-Modern-Classic 24 - -env = GTK_CSD,0 -env = TERM,"kitty /bin/fish" -env = XDG_CURRENT_DESKTOP=Hyprland -env = XDG_SESSION_TYPE=wayland -env = XDG_SESSION_DESKTOP=Hyprland -env = HYPRCURSOR_THEME,Bibata-Modern-Classic -env = HYPRCURSOR_SIZE,24 -env = XCURSOR_THEME,Bibata-Modern-Classic -env = XCURSOR_SIZE,24 -env = QT_QPA_PLATFORM,wayland -env = QT_WAYLAND_FORCE_DPI,96 -env = QT_AUTO_SCREEN_SCALE_FACTOR,0 -env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1 -env = QT_SCALE_FACTOR,1 -env = PKG_CONFIG_PATH,/usr/local/lib/pkgconfig -env = LD_LIBRARY_PATH,/usr/local/lib -env = EDITOR,"neovide --novsync --nofork" -env = WLR_DRM_NO_ATOMIC,1 -env = GTK_USE_PORTAL, 1 -env = PATH,/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:~/.local/bin:~/.cargo/bin:$PATH - diff --git a/hypr/conf/general.conf b/hypr/conf/general.conf deleted file mode 100644 index afa4a90..0000000 --- a/hypr/conf/general.conf +++ /dev/null @@ -1,58 +0,0 @@ -input { - repeat_delay=200 - natural_scroll=false - follow_mouse=1 - force_no_accel=true - touchpad { - natural_scroll=yes - tap-to-click=yes - } -} - -general { - sensitivity=1.0 - gaps_in=5 - gaps_out=3,5,5,5 - border_size=3 - col.active_border=0xFFFF0000 0xFF00FF00 0xFF0000FF 45deg - col.inactive_border=0x66333333 - apply_sens_to_raw=0 - allow_tearing=true -} - -decoration { - rounding=4 -} - -animations { - bezier=penguin,0.05,0.9,0.1,1.0 - enabled=1 - animation=windowsMove,1,4,default - animation=windows,1,7,default,popin 70% - animation=windowsOut,1,7,default,popin 70% - animation=border,1,10,default - animation=fade,1,7,default - animation=workspaces,1,6,default - animation=layers,1,3,default,popin -} - -dwindle { - preserve_split=true - pseudotile=0 - permanent_direction_override=false -} - -gestures { - workspace_swipe=yes -} - -misc { - vfr=true - vrr = 1 - animate_manual_resizes=1 - enable_swallow=true - disable_splash_rendering = true - disable_hyprland_logo = true - swallow_regex=^(.*)(kitty)(.*)$ - layers_hog_keyboard_focus=true - } diff --git a/hypr/conf/keybinds.conf b/hypr/conf/keybinds.conf deleted file mode 100644 index 4b26cbc..0000000 --- a/hypr/conf/keybinds.conf +++ /dev/null @@ -1,108 +0,0 @@ -#Screenshots -bind=SUPER,S,exec,grim -g "$(slurp)" - | wl-copy -bind=SUPERSHIFTALT,S,exec, grim -g "$(slurp)" $HOME/gits/ost-5semester/Screenshots/$(date +'%Y_%m_%d_%I_%M_%S.png') && (date +'%Y_%m_%d_%I_%M_%S.png') | wl-copy -bind=SUPERSHIFT,S,exec,grim -g "$(slurp)" - | satty -f - -bind=SUPERCONTROLSHIFT,S,exec,grim -c -g "2560,0 3440x1440" - | wl-copy - -#Programs -bind=SUPER,F,exec,firefox -bind=SUPER,T,exec,kitty -1 -bind=SUPER,E,exec,nautilus -w -bind=SUPER,N,exec,neovide -bind=SUPER,M,exec,oxidash -bind=SUPER,R,exec,anyrun -bind=SUPER,G,exec,oxicalc -bind=SUPER,D,exec,oxishut -bind=SUPER,A,exec,oxipaste -bind=SUPERSHIFT,L,exec, playerctl -a pause & swaylock -c 000000 & systemctl suspend - -#Media Keys -bind=,XF86AudioMute,exec, $HOME/.config/scripts/audio_control.sh mute -bind=,XF86AudioLowerVolume,exec, $HOME/.config/scripts/audio_control.sh sink -5% -bind=,XF86AudioRaiseVolume,exec, $HOME/.config/scripts/audio_control.sh sink +5% -bind=,XF86AudioPlay,exec, playerctl play-pause -bind=,XF86AudioNext,exec, playerctl next -bind=,XF86AudioPrev,exec, playerctl previous -bind=,XF86MonBrightnessDown,exec, $HOME/.config/scripts/change-brightness brightness 10%- -bind=,XF86MonBrightnessUp,exec, $HOME/.config/scripts/change-brightness brightness +10% - -#Hyprland Binds -##Misc -bind=SUPER,V,togglefloating, -bind=SUPER,B,fullscreen, -bind=SUPER,C,togglesplit -bind=SUPER,Q,killactive, -bind=SUPERSHIFTALT,M,exit, -bind=SUPERSHIFT,W,togglespecialworkspace -bindm=SUPER,mouse:272,movewindow -bindm=SUPER,mouse:273,resizewindow - -##Fokus -binde=SUPER,J,movefocus,l -binde=SUPER,semicolon,movefocus,r -binde=SUPER,L,movefocus,u -binde=SUPER,K,movefocus,d - -##Resize -binde=SUPER,U,resizeactive,-20 0 -binde=SUPER,P,resizeactive,20 0 -binde=SUPER,O,resizeactive,0 -20 -binde=SUPER,I,resizeactive,0 20 - -##Move -bind=SUPER,left,movewindow,l -bind=SUPER,right,movewindow,r -bind=SUPER,up,movewindow,u -bind=SUPER,down,movewindow,d - -##Workspaces -bind=SUPER,1,workspace,1 -bind=SUPER,2,workspace,2 -bind=SUPER,3,workspace,3 -bind=SUPER,4,workspace,4 -bind=SUPER,5,workspace,5 -bind=SUPER,6,workspace,6 -bind=SUPER,7,workspace,7 -bind=SUPER,8,workspace,8 -bind=SUPER,9,workspace,9 -bind=SUPER,0,workspace,10 - -##MoveToWorkspace -bind=SUPERSHIFT,1,movetoworkspace,1 -bind=SUPERSHIFT,2,movetoworkspace,2 -bind=SUPERSHIFT,3,movetoworkspace,3 -bind=SUPERSHIFT,4,movetoworkspace,4 -bind=SUPERSHIFT,5,movetoworkspace,5 -bind=SUPERSHIFT,6,movetoworkspace,6 -bind=SUPERSHIFT,7,movetoworkspace,7 -bind=SUPERSHIFT,8,movetoworkspace,8 -bind=SUPERSHIFT,9,movetoworkspace,9 -bind=SUPERSHIFT,0,movetoworkspace,10 - -##MoveToWorkspaceSilent -bind=SUPERSHIFTALT,1,movetoworkspacesilent,1 -bind=SUPERSHIFTALT,2,movetoworkspacesilent,2 -bind=SUPERSHIFTALT,3,movetoworkspacesilent,3 -bind=SUPERSHIFTALT,4,movetoworkspacesilent,4 -bind=SUPERSHIFTALT,5,movetoworkspacesilent,5 -bind=SUPERSHIFTALT,6,movetoworkspacesilent,6 -bind=SUPERSHIFTALT,7,movetoworkspacesilent,7 -bind=SUPERSHIFTALT,8,movetoworkspacesilent,8 -bind=SUPERSHIFTALT,9,movetoworkspacesilent,9 -bind=SUPERSHIFTALT,0,movetoworkspacesilent,10 - -##Preselection -bind=SUPERALT,j,layoutmsg,preselect l -bind=SUPERALT,k,layoutmsg,preselect d -bind=SUPERALT,l,layoutmsg,preselect u -bind=SUPERALT,semicolon,layoutmsg,preselect r -bind=SUPERALT,h,layoutmsg,preselect n - -#binds for debug testing -# bind=SUPERALT,J,pass,^(wlroots)$ -# bind=SUPERALT,left,pass,^(wlroots)$ -# bind=SUPERALT,right,pass,^(wlroots)$ -# bind=SUPERALT,up,pass,^(wlroots)$ -# bind=SUPERALT,down,pass,^(wlroots)$ -# bind=CTRLALT,P,pass,^(parcellite)$ - diff --git a/hypr/conf/monitor.conf b/hypr/conf/monitor.conf deleted file mode 100644 index b35ce49..0000000 --- a/hypr/conf/monitor.conf +++ /dev/null @@ -1,24 +0,0 @@ -# monitors -monitor=DP-2,2560x1440@165,0x0,1 -monitor=DP-1,3440x1440@180,2560x0,1 -monitor=HDMI-A-1,1920x1200@60,6000x0,1 -#monitor=DP-2,2560x1440@165,-2560x0,1 -#monitor=DP-1,3440x1440@180,0x0,1 -#monitor=HDMI-A-1,1920x1200@60,3440x0,1 -monitor=HDMI-A-1,transform,1 - -monitor=,highrr,auto,1 - -#workspaces -workspace = 2,monitor:DP-1, default:true -workspace = 4,monitor:DP-1 -workspace = 6,monitor:DP-1 -workspace = 8,monitor:DP-1 -workspace = 9,monitor:DP-1 -workspace = 10,monitor:DP-1 - -workspace = 1,monitor:DP-2, default:true -workspace = 5,monitor:DP-2 -workspace = 7,monitor:DP-2 - -workspace = 3,monitor:HDMI-A-1, default:true diff --git a/hypr/conf/plugins.conf b/hypr/conf/plugins.conf deleted file mode 100644 index dd7be71..0000000 --- a/hypr/conf/plugins.conf +++ /dev/null @@ -1,16 +0,0 @@ -exec-once= hyprpm reload -n && hyprctl reload - -plugin { - hyprspace { - columns = 3 - gap_size = 5 - bg_col = rgb(111111) - workspace_method = center current # [center/first] [workspace] e.g. first 1 or center m+1 - - enable_gesture = true # laptop touchpad, 4 fingers - gesture_distance = 300 # how far is the "max" - gesture_positive = true # positive = swipe down. Negative = swipe up. - bind = SUPER, W, overview:toggle, toggle # can be: toggle, off/disable or on/enable - } -} - diff --git a/hypr/conf/rules.conf b/hypr/conf/rules.conf deleted file mode 100644 index 9605ac1..0000000 --- a/hypr/conf/rules.conf +++ /dev/null @@ -1,23 +0,0 @@ -# layer rules -# mainly to disable animations within slurp and grim -layerrule = noanim, selection - -# window rules -windowrule=tile,^(.*)(Spotify)(.*)$ -windowrule=float,^(.*)(OxiCalc)(.*)$ -windowrule=float,^(.*)(winecfg.exe)(.*)$ -windowrule=float,^(.*)(speed.exe)(.*)$ -windowrule=float,^(.*)(copyq)(.*)$ -windowrule=center,^(.*)(swappy)(.*)$ -windowrule=float,title:^(.*)(Spirit)(.*)$ -windowrule=float,title:^(.*)(reset)(.*)$ -windowrule=workspace 10 silent,^(.*)(steam)(.*)$ -windowrule=workspace 9 silent,^(.*)(dota)(.*)$ -windowrule=workspace 9 silent,^(.*)(battlebits)(.*)$ -windowrule=workspace 9 silent,^(.*)(aoe)(.*)$ -windowrule=suppressevent fullscreen maximize,^(.*)(neovide)(.*)$ -windowrulev2=immediate,class:^(.*)(Pal)$ -windowrulev2=immediate,class:^(.*)(dota2)$ -windowrulev2=immediate,class:^(.*)(needforspeedheat.exe)$ -windowrulev2=forceinput,class:^(.*)(Pal)$ -windowrulev2=forceinput,class:^(.*)(Battlefield 4)$ diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf deleted file mode 100644 index 5bd8db9..0000000 --- a/hypr/hyprland.conf +++ /dev/null @@ -1,8 +0,0 @@ -source=/home/dashie/.config/hypr/conf/env.conf -source=/home/dashie/.config/hypr/conf/monitor.conf -source=/home/dashie/.config/hypr/conf/general.conf -source=/home/dashie/.config/hypr/conf/rules.conf -source=/home/dashie/.config/hypr/conf/keybinds.conf -source=/home/dashie/.config/hypr/conf/autostart.conf -source=/home/dashie/.config/hypr/conf/plugins.conf - diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf new file mode 120000 index 0000000..df9f981 --- /dev/null +++ b/hypr/hyprland.conf @@ -0,0 +1 @@ +/nix/store/3l33jmknaxv3ri2f9qxcp3kb7vsszk6k-home-manager-files/.config/hypr/hyprland.conf \ No newline at end of file diff --git a/hypr/hyprlandd.conf b/hypr/hyprlandd.conf deleted file mode 100644 index c2655ac..0000000 --- a/hypr/hyprlandd.conf +++ /dev/null @@ -1,24 +0,0 @@ -bind=SUPERALT,T,exec,kitty - -bind=SUPERALT,left,movewindow,l -bind=SUPERALT,right,movewindow,r -bind=SUPERALT,up,movewindow,u -bind=SUPERALT,down,movewindow,d -bind=SUPERALT,J,fullscreen - -bindm=SUPER,mouse:272,movewindow -bindm=SUPER,mouse:273,resizewindow -binde=SUPER,O,resizeactive,-20 0 -binde=SUPER,P,resizeactive,20 0 -binde=SUPER,K,resizeactive,0 -20 -binde=SUPER,L,resizeactive,0 20 - -general { - gaps_in = 5,20,4,10 - gaps_out = 5,5,10,30 - #col.active_border=0xFFFF0000 0xFF00FF00 0xFF0000FF 0xFF0000FF 0xFF0000FF 0xFF0000FF 0xFF0000FF 0xFF0000FF 0xFF0000FF 0xFF0000FF 0xFF0000FF 0xFF0000FF 0xFF0000FF 0xFF0000FF 0xFF0000FF 45deg -} - -workspace=0,bordersize: 2,monitor: asdlkfj,gapsout:5 10 10 - - diff --git a/hypr/regreet.toml b/hypr/regreet.toml index 8e9428e..3c10a04 100644 --- a/hypr/regreet.toml +++ b/hypr/regreet.toml @@ -4,6 +4,7 @@ fit = "Contain" [env] QT_QPA_PLATFORMTHEME = "qt5ct" +PATH = "/home/dashie/.cargo/bin:PATH" [GTK] application_prefer_dark_theme = true diff --git a/kanata.kbd b/kanata.kbd deleted file mode 100644 index 51dcbe6..0000000 --- a/kanata.kbd +++ /dev/null @@ -1,37 +0,0 @@ -(deflocalkeys-linux - ü 186 - ö 192 - ´ 221 - ä 226 -) - -(defalias - umalt (layer-while-held umlaut) -) - -(defsrc - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 ins del - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab q w e r t y u i o p [ ] \ - caps a s d f g h j k l ; ' ret - lsft z x c v b n m , . / rsft up - lctl lmet lalt spc ralt rmet rctl left down rght -) - -(deflayer default - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 ins del - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab q w e r t y u i o p [ ] \ - caps a s d f g h j k l ; ' ret - lsft z x c v b n m , . / rsft up - lctl lmet lalt spc @umalt rmet rctl left down rght -) - -(deflayer umlaut - esc f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12 ins del - grv 1 2 3 4 5 6 7 8 9 0 - = bspc - tab ä ö ü ` t y u i o p [ ] \ - caps a s d f g h j k l ; ' ret - lsft z x c v b n m , . / rsft up - lctl lmet lalt spc ralt rmet rctl left down rght -) diff --git a/keymap.xkb b/keymap.xkb deleted file mode 100644 index d772778..0000000 --- a/keymap.xkb +++ /dev/null @@ -1,1581 +0,0 @@ -xkb_keymap { -xkb_keycodes "(unnamed)" { - minimum = 8; - maximum = 255; - = 9; - = 10; - = 11; - = 12; - = 13; - = 14; - = 15; - = 16; - = 17; - = 18; - = 19; - = 20; - = 21; - = 22; - = 23; - = 24; - = 25; - = 26; - = 27; - = 28; - = 29; - = 30; - = 31; - = 32; - = 33; - = 34; - = 35; - = 36; - = 37; - = 38; - = 39; - = 40; - = 41; - = 42; - = 43; - = 44; - = 45; - = 46; - = 47; - = 48; - = 49; - = 50; - = 51; - = 52; - = 53; - = 54; - = 55; - = 56; - = 57; - = 58; - = 59; - = 60; - = 61; - = 62; - = 63; - = 64; - = 65; - = 66; - = 67; - = 68; - = 69; - = 70; - = 71; - = 72; - = 73; - = 74; - = 75; - = 76; - = 77; - = 78; - = 79; - = 80; - = 81; - = 82; - = 83; - = 84; - = 85; - = 86; - = 87; - = 88; - = 89; - = 90; - = 91; - = 92; - = 94; - = 95; - = 96; - = 97; - = 98; - = 99; - = 100; - = 101; - = 102; - = 103; - = 104; - = 105; - = 106; - = 107; - = 108; - = 109; - = 110; - = 111; - = 112; - = 113; - = 114; - = 115; - = 116; - = 117; - = 118; - = 119; - = 120; - = 121; - = 122; - = 123; - = 124; - = 125; - = 126; - = 127; - = 128; - = 129; - = 130; - = 131; - = 132; - = 133; - = 134; - = 135; - = 136; - = 137; - = 138; - = 139; - = 140; - = 141; - = 142; - = 143; - = 144; - = 145; - = 146; - = 147; - = 148; - = 149; - = 150; - = 151; - = 152; - = 153; - = 154; - = 155; - = 156; - = 157; - = 158; - = 159; - = 160; - = 161; - = 162; - = 163; - = 164; - = 165; - = 166; - = 167; - = 168; - = 169; - = 170; - = 171; - = 172; - = 173; - = 174; - = 175; - = 176; - = 177; - = 178; - = 179; - = 180; - = 181; - = 182; - = 183; - = 184; - = 185; - = 186; - = 187; - = 188; - = 189; - = 190; - = 191; - = 192; - = 193; - = 194; - = 195; - = 196; - = 197; - = 198; - = 199; - = 200; - = 201; - = 202; - = 203; - = 204; - = 205; - = 206; - = 207; - = 208; - = 209; - = 210; - = 211; - = 212; - = 213; - = 214; - = 215; - = 216; - = 217; - = 218; - = 219; - = 220; - = 221; - = 222; - = 223; - = 224; - = 225; - = 226; - = 227; - = 228; - = 229; - = 230; - = 231; - = 232; - = 233; - = 234; - = 235; - = 236; - = 237; - = 238; - = 239; - = 240; - = 241; - = 242; - = 243; - = 244; - = 245; - = 246; - = 247; - = 248; - = 249; - = 250; - = 251; - = 252; - = 253; - = 254; - = 255; - indicator 1 = "Caps Lock"; - indicator 2 = "Num Lock"; - indicator 3 = "Scroll Lock"; - indicator 4 = "Compose"; - indicator 5 = "Kana"; - indicator 6 = "Sleep"; - indicator 7 = "Suspend"; - indicator 8 = "Mute"; - indicator 9 = "Misc"; - indicator 10 = "Mail"; - indicator 11 = "Charging"; - indicator 12 = "Shift Lock"; - indicator 13 = "Group 2"; - indicator 14 = "Mouse Keys"; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; - alias = ; -}; - -xkb_types "(unnamed)" { - - virtual_modifiers NumLock,Alt,LevelThree,ScrollLock,LevelFive,AltGr,Meta,Super,Hyper; - - type "ONE_LEVEL" { - modifiers= none; - level_name[Level1]= "Any"; - }; - type "TWO_LEVEL" { - modifiers= Shift; - map[Shift]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - }; - type "ALPHABETIC" { - modifiers= Shift+Lock; - map[Shift]= Level2; - map[Lock]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "Caps"; - }; - type "KEYPAD" { - modifiers= Shift+NumLock; - map[NumLock]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "Number"; - }; - type "SHIFT+ALT" { - modifiers= Shift+Alt; - map[Shift+Alt]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift+Alt"; - }; - type "PC_SUPER_LEVEL2" { - modifiers= Mod4; - map[Mod4]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "Super"; - }; - type "PC_CONTROL_LEVEL2" { - modifiers= Control; - map[Control]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "Control"; - }; - type "PC_ALT_LEVEL2" { - modifiers= Alt; - map[Alt]= Level2; - level_name[Level1]= "Base"; - level_name[Level2]= "Alt"; - }; - type "CTRL+ALT" { - modifiers= Shift+Control+Alt+LevelThree; - map[Shift]= Level2; - preserve[Shift]= Shift; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - preserve[Shift+LevelThree]= Shift; - map[Control+Alt]= Level5; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - level_name[Level5]= "Ctrl+Alt"; - }; - type "LOCAL_EIGHT_LEVEL" { - modifiers= Shift+Lock+Control+LevelThree; - map[Shift]= Level2; - map[Lock]= Level2; - map[LevelThree]= Level3; - map[Shift+Lock+LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Lock+LevelThree]= Level4; - map[Control]= Level5; - map[Shift+Lock+Control]= Level5; - map[Shift+Control]= Level6; - map[Lock+Control]= Level6; - map[Control+LevelThree]= Level7; - map[Shift+Lock+Control+LevelThree]= Level7; - map[Shift+Control+LevelThree]= Level8; - map[Lock+Control+LevelThree]= Level8; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Level3"; - level_name[Level4]= "Shift Level3"; - level_name[Level5]= "Ctrl"; - level_name[Level6]= "Shift Ctrl"; - level_name[Level7]= "Level3 Ctrl"; - level_name[Level8]= "Shift Level3 Ctrl"; - }; - type "THREE_LEVEL" { - modifiers= Shift+LevelThree; - map[Shift]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level3; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Level3"; - }; - type "SHIFT_SHIFTALT" { - modifiers= Shift+Alt; - map[Shift]= Level2; - map[Shift+Alt]= Level3; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Shift+Alt"; - }; - type "EIGHT_LEVEL" { - modifiers= Shift+LevelThree+LevelFive; - map[Shift]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[LevelFive]= Level5; - map[Shift+LevelFive]= Level6; - map[LevelThree+LevelFive]= Level7; - map[Shift+LevelThree+LevelFive]= Level8; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - level_name[Level5]= "X"; - level_name[Level6]= "X Shift"; - level_name[Level7]= "X Alt Base"; - level_name[Level8]= "X Shift Alt"; - }; - type "EIGHT_LEVEL_ALPHABETIC" { - modifiers= Shift+Lock+LevelThree+LevelFive; - map[Shift]= Level2; - map[Lock]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Lock+LevelThree]= Level4; - map[Shift+Lock+LevelThree]= Level3; - map[LevelFive]= Level5; - map[Shift+LevelFive]= Level6; - map[Lock+LevelFive]= Level6; - map[LevelThree+LevelFive]= Level7; - map[Shift+LevelThree+LevelFive]= Level8; - map[Lock+LevelThree+LevelFive]= Level8; - map[Shift+Lock+LevelThree+LevelFive]= Level7; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - level_name[Level5]= "X"; - level_name[Level6]= "X Shift"; - level_name[Level7]= "X Alt Base"; - level_name[Level8]= "X Shift Alt"; - }; - type "EIGHT_LEVEL_LEVEL_FIVE_LOCK" { - modifiers= Shift+Lock+NumLock+LevelThree+LevelFive; - map[Shift]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[LevelFive]= Level5; - map[Shift+LevelFive]= Level6; - preserve[Shift+LevelFive]= Shift; - map[LevelThree+LevelFive]= Level7; - map[Shift+LevelThree+LevelFive]= Level8; - map[NumLock]= Level5; - map[Shift+NumLock]= Level6; - preserve[Shift+NumLock]= Shift; - map[NumLock+LevelThree]= Level7; - map[Shift+NumLock+LevelThree]= Level8; - map[Shift+NumLock+LevelFive]= Level2; - map[NumLock+LevelThree+LevelFive]= Level3; - map[Shift+NumLock+LevelThree+LevelFive]= Level4; - map[Shift+Lock]= Level2; - map[Lock+LevelThree]= Level3; - map[Shift+Lock+LevelThree]= Level4; - map[Lock+LevelFive]= Level5; - map[Shift+Lock+LevelFive]= Level6; - preserve[Shift+Lock+LevelFive]= Shift; - map[Lock+LevelThree+LevelFive]= Level7; - map[Shift+Lock+LevelThree+LevelFive]= Level8; - map[Lock+NumLock]= Level5; - map[Shift+Lock+NumLock]= Level6; - preserve[Shift+Lock+NumLock]= Shift; - map[Lock+NumLock+LevelThree]= Level7; - map[Shift+Lock+NumLock+LevelThree]= Level8; - map[Shift+Lock+NumLock+LevelFive]= Level2; - map[Lock+NumLock+LevelThree+LevelFive]= Level3; - map[Shift+Lock+NumLock+LevelThree+LevelFive]= Level4; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - level_name[Level5]= "X"; - level_name[Level6]= "X Shift"; - level_name[Level7]= "X Alt Base"; - level_name[Level8]= "X Shift Alt"; - }; - type "EIGHT_LEVEL_ALPHABETIC_LEVEL_FIVE_LOCK" { - modifiers= Shift+Lock+NumLock+LevelThree+LevelFive; - map[Shift]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[LevelFive]= Level5; - map[Shift+LevelFive]= Level6; - preserve[Shift+LevelFive]= Shift; - map[LevelThree+LevelFive]= Level7; - map[Shift+LevelThree+LevelFive]= Level8; - map[NumLock]= Level5; - map[Shift+NumLock]= Level6; - preserve[Shift+NumLock]= Shift; - map[NumLock+LevelThree]= Level7; - map[Shift+NumLock+LevelThree]= Level8; - map[Shift+NumLock+LevelFive]= Level2; - map[NumLock+LevelThree+LevelFive]= Level3; - map[Shift+NumLock+LevelThree+LevelFive]= Level4; - map[Lock]= Level2; - map[Lock+LevelThree]= Level3; - map[Shift+Lock+LevelThree]= Level4; - map[Lock+LevelFive]= Level5; - map[Shift+Lock+LevelFive]= Level6; - map[Lock+LevelThree+LevelFive]= Level7; - map[Shift+Lock+LevelThree+LevelFive]= Level8; - map[Lock+NumLock]= Level5; - map[Shift+Lock+NumLock]= Level6; - map[Lock+NumLock+LevelThree]= Level7; - map[Shift+Lock+NumLock+LevelThree]= Level8; - map[Lock+NumLock+LevelFive]= Level2; - map[Lock+NumLock+LevelThree+LevelFive]= Level4; - map[Shift+Lock+NumLock+LevelThree+LevelFive]= Level3; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - level_name[Level5]= "X"; - level_name[Level6]= "X Shift"; - level_name[Level7]= "X Alt Base"; - level_name[Level8]= "X Shift Alt"; - }; - type "EIGHT_LEVEL_SEMIALPHABETIC" { - modifiers= Shift+Lock+LevelThree+LevelFive; - map[Shift]= Level2; - map[Lock]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Lock+LevelThree]= Level3; - preserve[Lock+LevelThree]= Lock; - map[Shift+Lock+LevelThree]= Level4; - preserve[Shift+Lock+LevelThree]= Lock; - map[LevelFive]= Level5; - map[Shift+LevelFive]= Level6; - map[Lock+LevelFive]= Level6; - preserve[Lock+LevelFive]= Lock; - map[Shift+Lock+LevelFive]= Level6; - preserve[Shift+Lock+LevelFive]= Lock; - map[LevelThree+LevelFive]= Level7; - map[Shift+LevelThree+LevelFive]= Level8; - map[Lock+LevelThree+LevelFive]= Level7; - preserve[Lock+LevelThree+LevelFive]= Lock; - map[Shift+Lock+LevelThree+LevelFive]= Level8; - preserve[Shift+Lock+LevelThree+LevelFive]= Lock; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - level_name[Level5]= "X"; - level_name[Level6]= "X Shift"; - level_name[Level7]= "X Alt Base"; - level_name[Level8]= "X Shift Alt"; - }; - type "FOUR_LEVEL" { - modifiers= Shift+LevelThree; - map[Shift]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - }; - type "FOUR_LEVEL_ALPHABETIC" { - modifiers= Shift+Lock+LevelThree; - map[Shift]= Level2; - map[Lock]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Lock+LevelThree]= Level4; - map[Shift+Lock+LevelThree]= Level3; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - }; - type "FOUR_LEVEL_SEMIALPHABETIC" { - modifiers= Shift+Lock+LevelThree; - map[Shift]= Level2; - map[Lock]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Lock+LevelThree]= Level3; - preserve[Lock+LevelThree]= Lock; - map[Shift+Lock+LevelThree]= Level4; - preserve[Shift+Lock+LevelThree]= Lock; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - }; - type "FOUR_LEVEL_MIXED_KEYPAD" { - modifiers= Shift+NumLock+LevelThree; - map[NumLock]= Level2; - map[Shift]= Level2; - map[LevelThree]= Level3; - map[NumLock+LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Shift+NumLock+LevelThree]= Level4; - level_name[Level1]= "Base"; - level_name[Level2]= "Number"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - }; - type "FOUR_LEVEL_X" { - modifiers= Shift+Control+Alt+LevelThree; - map[LevelThree]= Level2; - map[Shift+LevelThree]= Level3; - map[Control+Alt]= Level4; - level_name[Level1]= "Base"; - level_name[Level2]= "Alt Base"; - level_name[Level3]= "Shift Alt"; - level_name[Level4]= "Ctrl+Alt"; - }; - type "SEPARATE_CAPS_AND_SHIFT_ALPHABETIC" { - modifiers= Shift+Lock+LevelThree; - map[Shift]= Level2; - map[Lock]= Level4; - preserve[Lock]= Lock; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Lock+LevelThree]= Level3; - preserve[Lock+LevelThree]= Lock; - map[Shift+Lock+LevelThree]= Level3; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "AltGr Base"; - level_name[Level4]= "Shift AltGr"; - }; - type "FOUR_LEVEL_PLUS_LOCK" { - modifiers= Shift+Lock+LevelThree; - map[Shift]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[Lock]= Level5; - map[Shift+Lock]= Level2; - map[Lock+LevelThree]= Level3; - map[Shift+Lock+LevelThree]= Level4; - level_name[Level1]= "Base"; - level_name[Level2]= "Shift"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Shift Alt"; - level_name[Level5]= "Lock"; - }; - type "FOUR_LEVEL_KEYPAD" { - modifiers= Shift+NumLock+LevelThree; - map[Shift]= Level2; - map[NumLock]= Level2; - map[LevelThree]= Level3; - map[Shift+LevelThree]= Level4; - map[NumLock+LevelThree]= Level4; - map[Shift+NumLock+LevelThree]= Level3; - level_name[Level1]= "Base"; - level_name[Level2]= "Number"; - level_name[Level3]= "Alt Base"; - level_name[Level4]= "Alt Number"; - }; -}; - -xkb_compatibility "(unnamed)" { - - virtual_modifiers NumLock,Alt,LevelThree,ScrollLock,LevelFive,AltGr,Meta,Super,Hyper; - - interpret.useModMapMods= AnyLevel; - interpret.repeat= False; - interpret.locking= False; - interpret ISO_Level2_Latch+Exactly(Shift) { - useModMapMods=level1; - action= LatchMods(modifiers=Shift,clearLocks,latchToLock); - }; - interpret Shift_Lock+AnyOf(Shift+Lock) { - action= LockMods(modifiers=Shift); - }; - interpret Num_Lock+AnyOf(all) { - virtualModifier= NumLock; - action= LockMods(modifiers=NumLock); - }; - interpret ISO_Level3_Shift+AnyOf(all) { - virtualModifier= LevelThree; - useModMapMods=level1; - action= SetMods(modifiers=LevelThree,clearLocks); - }; - interpret ISO_Level3_Latch+AnyOf(all) { - virtualModifier= LevelThree; - useModMapMods=level1; - action= LatchMods(modifiers=LevelThree,clearLocks,latchToLock); - }; - interpret ISO_Level3_Lock+AnyOf(all) { - virtualModifier= LevelThree; - useModMapMods=level1; - action= LockMods(modifiers=LevelThree); - }; - interpret Alt_L+AnyOf(all) { - virtualModifier= Alt; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Alt_R+AnyOf(all) { - virtualModifier= Alt; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Meta_L+AnyOf(all) { - virtualModifier= Meta; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Meta_R+AnyOf(all) { - virtualModifier= Meta; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Super_L+AnyOf(all) { - virtualModifier= Super; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Super_R+AnyOf(all) { - virtualModifier= Super; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Hyper_L+AnyOf(all) { - virtualModifier= Hyper; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Hyper_R+AnyOf(all) { - virtualModifier= Hyper; - action= SetMods(modifiers=modMapMods,clearLocks); - }; - interpret Scroll_Lock+AnyOf(all) { - virtualModifier= ScrollLock; - action= LockMods(modifiers=modMapMods); - }; - interpret ISO_Level5_Shift+AnyOf(all) { - virtualModifier= LevelFive; - useModMapMods=level1; - action= SetMods(modifiers=LevelFive,clearLocks); - }; - interpret ISO_Level5_Latch+AnyOf(all) { - virtualModifier= LevelFive; - useModMapMods=level1; - action= LatchMods(modifiers=LevelFive,clearLocks,latchToLock); - }; - interpret ISO_Level5_Lock+AnyOf(all) { - virtualModifier= LevelFive; - useModMapMods=level1; - action= LockMods(modifiers=LevelFive); - }; - interpret Mode_switch+AnyOfOrNone(all) { - virtualModifier= AltGr; - useModMapMods=level1; - action= SetGroup(group=+1); - }; - interpret ISO_Level3_Shift+AnyOfOrNone(all) { - action= SetMods(modifiers=LevelThree,clearLocks); - }; - interpret ISO_Level3_Latch+AnyOfOrNone(all) { - action= LatchMods(modifiers=LevelThree,clearLocks,latchToLock); - }; - interpret ISO_Level3_Lock+AnyOfOrNone(all) { - action= LockMods(modifiers=LevelThree); - }; - interpret ISO_Group_Latch+AnyOfOrNone(all) { - virtualModifier= AltGr; - useModMapMods=level1; - action= LatchGroup(group=2); - }; - interpret ISO_Next_Group+AnyOfOrNone(all) { - virtualModifier= AltGr; - useModMapMods=level1; - action= LockGroup(group=+1); - }; - interpret ISO_Prev_Group+AnyOfOrNone(all) { - virtualModifier= AltGr; - useModMapMods=level1; - action= LockGroup(group=-1); - }; - interpret ISO_First_Group+AnyOfOrNone(all) { - action= LockGroup(group=1); - }; - interpret ISO_Last_Group+AnyOfOrNone(all) { - action= LockGroup(group=2); - }; - interpret KP_1+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=+1); - }; - interpret KP_End+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=+1); - }; - interpret KP_2+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+0,y=+1); - }; - interpret KP_Down+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+0,y=+1); - }; - interpret KP_3+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=+1); - }; - interpret KP_Next+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=+1); - }; - interpret KP_4+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=+0); - }; - interpret KP_Left+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=+0); - }; - interpret KP_6+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=+0); - }; - interpret KP_Right+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=+0); - }; - interpret KP_7+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=-1); - }; - interpret KP_Home+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=-1); - }; - interpret KP_8+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+0,y=-1); - }; - interpret KP_Up+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+0,y=-1); - }; - interpret KP_9+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=-1); - }; - interpret KP_Prior+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=-1); - }; - interpret KP_5+AnyOfOrNone(all) { - repeat= True; - action= PtrBtn(button=default); - }; - interpret KP_Begin+AnyOfOrNone(all) { - repeat= True; - action= PtrBtn(button=default); - }; - interpret KP_F2+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=1); - }; - interpret KP_Divide+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=1); - }; - interpret KP_F3+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=2); - }; - interpret KP_Multiply+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=2); - }; - interpret KP_F4+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=3); - }; - interpret KP_Subtract+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=3); - }; - interpret KP_Separator+AnyOfOrNone(all) { - repeat= True; - action= PtrBtn(button=default,count=2); - }; - interpret KP_Add+AnyOfOrNone(all) { - repeat= True; - action= PtrBtn(button=default,count=2); - }; - interpret KP_0+AnyOfOrNone(all) { - repeat= True; - action= LockPtrBtn(button=default,affect=lock); - }; - interpret KP_Insert+AnyOfOrNone(all) { - repeat= True; - action= LockPtrBtn(button=default,affect=lock); - }; - interpret KP_Decimal+AnyOfOrNone(all) { - repeat= True; - action= LockPtrBtn(button=default,affect=unlock); - }; - interpret KP_Delete+AnyOfOrNone(all) { - repeat= True; - action= LockPtrBtn(button=default,affect=unlock); - }; - interpret F25+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=1); - }; - interpret F26+AnyOfOrNone(all) { - repeat= True; - action= SetPtrDflt(affect=button,button=2); - }; - interpret F27+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=-1); - }; - interpret F29+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=-1); - }; - interpret F31+AnyOfOrNone(all) { - repeat= True; - action= PtrBtn(button=default); - }; - interpret F33+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=-1,y=+1); - }; - interpret F35+AnyOfOrNone(all) { - repeat= True; - action= MovePtr(x=+1,y=+1); - }; - interpret Pointer_Button_Dflt+AnyOfOrNone(all) { - action= PtrBtn(button=default); - }; - interpret Pointer_Button1+AnyOfOrNone(all) { - action= PtrBtn(button=1); - }; - interpret Pointer_Button2+AnyOfOrNone(all) { - action= PtrBtn(button=2); - }; - interpret Pointer_Button3+AnyOfOrNone(all) { - action= PtrBtn(button=3); - }; - interpret Pointer_DblClick_Dflt+AnyOfOrNone(all) { - action= PtrBtn(button=default,count=2); - }; - interpret Pointer_DblClick1+AnyOfOrNone(all) { - action= PtrBtn(button=1,count=2); - }; - interpret Pointer_DblClick2+AnyOfOrNone(all) { - action= PtrBtn(button=2,count=2); - }; - interpret Pointer_DblClick3+AnyOfOrNone(all) { - action= PtrBtn(button=3,count=2); - }; - interpret Pointer_Drag_Dflt+AnyOfOrNone(all) { - action= LockPtrBtn(button=default,affect=both); - }; - interpret Pointer_Drag1+AnyOfOrNone(all) { - action= LockPtrBtn(button=1,affect=both); - }; - interpret Pointer_Drag2+AnyOfOrNone(all) { - action= LockPtrBtn(button=2,affect=both); - }; - interpret Pointer_Drag3+AnyOfOrNone(all) { - action= LockPtrBtn(button=3,affect=both); - }; - interpret Pointer_EnableKeys+AnyOfOrNone(all) { - action= LockControls(controls=MouseKeys); - }; - interpret Pointer_Accelerate+AnyOfOrNone(all) { - action= LockControls(controls=MouseKeysAccel); - }; - interpret Pointer_DfltBtnNext+AnyOfOrNone(all) { - action= SetPtrDflt(affect=button,button=+1); - }; - interpret Pointer_DfltBtnPrev+AnyOfOrNone(all) { - action= SetPtrDflt(affect=button,button=-1); - }; - interpret AccessX_Enable+AnyOfOrNone(all) { - action= LockControls(controls=AccessXKeys); - }; - interpret AccessX_Feedback_Enable+AnyOfOrNone(all) { - action= LockControls(controls=AccessXFeedback); - }; - interpret RepeatKeys_Enable+AnyOfOrNone(all) { - action= LockControls(controls=RepeatKeys); - }; - interpret SlowKeys_Enable+AnyOfOrNone(all) { - action= LockControls(controls=SlowKeys); - }; - interpret BounceKeys_Enable+AnyOfOrNone(all) { - action= LockControls(controls=BounceKeys); - }; - interpret StickyKeys_Enable+AnyOfOrNone(all) { - action= LockControls(controls=StickyKeys); - }; - interpret MouseKeys_Enable+AnyOfOrNone(all) { - action= LockControls(controls=MouseKeys); - }; - interpret MouseKeys_Accel_Enable+AnyOfOrNone(all) { - action= LockControls(controls=MouseKeysAccel); - }; - interpret Overlay1_Enable+AnyOfOrNone(all) { - action= LockControls(controls=none); - }; - interpret Overlay2_Enable+AnyOfOrNone(all) { - action= LockControls(controls=none); - }; - interpret AudibleBell_Enable+AnyOfOrNone(all) { - action= LockControls(controls=AudibleBell); - }; - interpret Terminate_Server+AnyOfOrNone(all) { - action= Terminate(); - }; - interpret Alt_L+AnyOfOrNone(all) { - action= SetMods(modifiers=Alt,clearLocks); - }; - interpret Alt_R+AnyOfOrNone(all) { - action= SetMods(modifiers=Alt,clearLocks); - }; - interpret Meta_L+AnyOfOrNone(all) { - action= SetMods(modifiers=Meta,clearLocks); - }; - interpret Meta_R+AnyOfOrNone(all) { - action= SetMods(modifiers=Meta,clearLocks); - }; - interpret Super_L+AnyOfOrNone(all) { - action= SetMods(modifiers=Super,clearLocks); - }; - interpret Super_R+AnyOfOrNone(all) { - action= SetMods(modifiers=Super,clearLocks); - }; - interpret Hyper_L+AnyOfOrNone(all) { - action= SetMods(modifiers=Hyper,clearLocks); - }; - interpret Hyper_R+AnyOfOrNone(all) { - action= SetMods(modifiers=Hyper,clearLocks); - }; - interpret Shift_L+AnyOfOrNone(all) { - action= SetMods(modifiers=Shift,clearLocks); - }; - interpret XF86Switch_VT_1+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=1,!same); - }; - interpret XF86Switch_VT_2+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=2,!same); - }; - interpret XF86Switch_VT_3+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=3,!same); - }; - interpret XF86Switch_VT_4+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=4,!same); - }; - interpret XF86Switch_VT_5+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=5,!same); - }; - interpret XF86Switch_VT_6+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=6,!same); - }; - interpret XF86Switch_VT_7+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=7,!same); - }; - interpret XF86Switch_VT_8+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=8,!same); - }; - interpret XF86Switch_VT_9+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=9,!same); - }; - interpret XF86Switch_VT_10+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=10,!same); - }; - interpret XF86Switch_VT_11+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=11,!same); - }; - interpret XF86Switch_VT_12+AnyOfOrNone(all) { - repeat= True; - action= SwitchScreen(screen=12,!same); - }; - interpret XF86LogGrabInfo+AnyOfOrNone(all) { - repeat= True; - action= Private(type=0x86,data[0]=0x50,data[1]=0x72,data[2]=0x47,data[3]=0x72,data[4]=0x62,data[5]=0x73,data[6]=0x00); - }; - interpret XF86LogWindowTree+AnyOfOrNone(all) { - repeat= True; - action= Private(type=0x86,data[0]=0x50,data[1]=0x72,data[2]=0x57,data[3]=0x69,data[4]=0x6e,data[5]=0x73,data[6]=0x00); - }; - interpret XF86Next_VMode+AnyOfOrNone(all) { - repeat= True; - action= Private(type=0x86,data[0]=0x2b,data[1]=0x56,data[2]=0x4d,data[3]=0x6f,data[4]=0x64,data[5]=0x65,data[6]=0x00); - }; - interpret XF86Prev_VMode+AnyOfOrNone(all) { - repeat= True; - action= Private(type=0x86,data[0]=0x2d,data[1]=0x56,data[2]=0x4d,data[3]=0x6f,data[4]=0x64,data[5]=0x65,data[6]=0x00); - }; - interpret ISO_Level5_Shift+AnyOfOrNone(all) { - action= SetMods(modifiers=LevelFive,clearLocks); - }; - interpret ISO_Level5_Latch+AnyOfOrNone(all) { - action= LatchMods(modifiers=LevelFive,clearLocks,latchToLock); - }; - interpret ISO_Level5_Lock+AnyOfOrNone(all) { - action= LockMods(modifiers=LevelFive); - }; - interpret Caps_Lock+AnyOfOrNone(all) { - action= LockMods(modifiers=Lock); - }; - interpret Any+Exactly(Lock) { - action= LockMods(modifiers=Lock); - }; - interpret Any+AnyOf(all) { - action= SetMods(modifiers=modMapMods,clearLocks); - }; - indicator "Caps Lock" { - whichModState= locked; - modifiers= Lock; - }; - indicator "Num Lock" { - whichModState= locked; - modifiers= NumLock; - }; - indicator "Scroll Lock" { - whichModState= locked; - modifiers= ScrollLock; - }; - indicator "Shift Lock" { - whichModState= locked; - modifiers= Shift; - }; - indicator "Group 2" { - groups= 0xfe; - }; - indicator "Mouse Keys" { - controls= mouseKeys; - }; -}; - -xkb_symbols "(unnamed)" { - - name[group1]="English (US)"; - - key { [ Escape ] }; - key { [ 1, exclam ] }; - key { [ 2, at ] }; - key { [ 3, numbersign ] }; - key { [ 4, dollar ] }; - key { [ 5, percent ] }; - key { [ 6, asciicircum ] }; - key { [ 7, ampersand ] }; - key { [ 8, asterisk ] }; - key { [ 9, parenleft ] }; - key { [ 0, parenright ] }; - key { [ minus, underscore ] }; - key { [ equal, plus ] }; - key { [ BackSpace, BackSpace ] }; - key { [ Tab, ISO_Left_Tab ] }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ q, Q ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ w, W ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ e, E ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ r, R ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ t, T ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ y, Y ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ u, U ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ i, I ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ o, O ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ p, P ] - }; - key { [ bracketleft, braceleft ] }; - key { [ bracketright, braceright ] }; - key { [ Return ] }; - key { [ Control_L ] }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ a, A ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ s, S ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ d, D ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ f, F ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ g, G ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ h, H ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ j, J ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ k, K ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ l, L ] - }; - key { [ semicolon, colon ] }; - key { [ apostrophe, dead_diaeresis, apostrophe, quotedouble ] }; - key { [ grave, asciitilde ] }; - key { [ Shift_L ] }; - key { [ backslash, bar ] }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ z, Z ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ x, X ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ c, C ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ v, V ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ b, B ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ n, N ] - }; - key { - type= "ALPHABETIC", - symbols[Group1]= [ m, M ] - }; - key { [ comma, less ] }; - key { [ period, greater ] }; - key { [ slash, question ] }; - key { [ Shift_R ] }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ KP_Multiply, KP_Multiply, KP_Multiply, KP_Multiply, XF86ClearGrab ] - }; - key { [ Alt_L, Meta_L ] }; - key { [ space ] }; - key { [ Caps_Lock ] }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F1, F1, F1, F1, XF86Switch_VT_1 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F2, F2, F2, F2, XF86Switch_VT_2 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F3, F3, F3, F3, XF86Switch_VT_3 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F4, F4, F4, F4, XF86Switch_VT_4 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F5, F5, F5, F5, XF86Switch_VT_5 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F6, F6, F6, F6, XF86Switch_VT_6 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F7, F7, F7, F7, XF86Switch_VT_7 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F8, F8, F8, F8, XF86Switch_VT_8 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F9, F9, F9, F9, XF86Switch_VT_9 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F10, F10, F10, F10, XF86Switch_VT_10 ] - }; - key { [ Num_Lock ] }; - key { [ Scroll_Lock ] }; - key { [ KP_Home, KP_7 ] }; - key { [ KP_Up, KP_8 ] }; - key { [ KP_Prior, KP_9 ] }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ KP_Subtract, KP_Subtract, KP_Subtract, KP_Subtract, XF86Prev_VMode ] - }; - key { [ KP_Left, KP_4 ] }; - key { [ KP_Begin, KP_5 ] }; - key { [ KP_Right, KP_6 ] }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ KP_Add, KP_Add, KP_Add, KP_Add, XF86Next_VMode ] - }; - key { [ KP_End, KP_1 ] }; - key { [ KP_Down, KP_2 ] }; - key { [ KP_Next, KP_3 ] }; - key { [ KP_Insert, KP_0 ] }; - key { [ KP_Delete, KP_Decimal ] }; - key { [ ISO_Level3_Shift ] }; - key { - type= "FOUR_LEVEL", - symbols[Group1]= [ less, greater, bar, brokenbar ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F11, F11, F11, F11, XF86Switch_VT_11 ] - }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ F12, F12, F12, F12, XF86Switch_VT_12 ] - }; - key { [ Katakana ] }; - key { [ Hiragana ] }; - key { [ Henkan_Mode ] }; - key { [ Hiragana_Katakana ] }; - key { [ Muhenkan ] }; - key { [ KP_Enter ] }; - key { [ Control_R ] }; - key { - type= "CTRL+ALT", - symbols[Group1]= [ KP_Divide, KP_Divide, KP_Divide, KP_Divide, XF86Ungrab ] - }; - key { - type= "PC_ALT_LEVEL2", - symbols[Group1]= [ Print, Sys_Req ] - }; - key { - type= "TWO_LEVEL", - symbols[Group1]= [ Alt_R, Meta_R ] - }; - key { [ Linefeed ] }; - key { [ Home ] }; - key { [ Up ] }; - key { [ Prior ] }; - key { [ Left ] }; - key { [ Right ] }; - key { [ End ] }; - key { [ Down ] }; - key { [ Next ] }; - key { [ Insert ] }; - key { [ Delete ] }; - key { [ XF86AudioMute ] }; - key { [ XF86AudioLowerVolume ] }; - key { [ XF86AudioRaiseVolume ] }; - key { [ XF86PowerOff ] }; - key { [ KP_Equal ] }; - key { [ plusminus ] }; - key { - type= "PC_CONTROL_LEVEL2", - symbols[Group1]= [ Pause, Break ] - }; - key { [ XF86LaunchA ] }; - key { [ KP_Decimal, KP_Decimal ] }; - key { [ Hangul ] }; - key { [ Hangul_Hanja ] }; - key { [ Super_L ] }; - key { [ Super_R ] }; - key { [ Menu ] }; - key { [ Cancel ] }; - key { [ Redo ] }; - key { [ SunProps ] }; - key { [ Undo ] }; - key { [ SunFront ] }; - key { [ XF86Copy ] }; - key { [ XF86Open ] }; - key { [ XF86Paste ] }; - key { [ Find ] }; - key { [ XF86Cut ] }; - key { [ Help ] }; - key { [ XF86MenuKB ] }; - key { [ XF86Calculator ] }; - key { [ XF86Sleep ] }; - key { [ XF86WakeUp ] }; - key { [ XF86Explorer ] }; - key { [ XF86Send ] }; - key { [ XF86Xfer ] }; - key { [ XF86Launch1 ] }; - key { [ XF86Launch2 ] }; - key { [ XF86WWW ] }; - key { [ XF86DOS ] }; - key { [ XF86ScreenSaver ] }; - key { [ XF86RotateWindows ] }; - key { [ XF86TaskPane ] }; - key { [ XF86Mail ] }; - key { [ XF86Favorites ] }; - key { [ XF86MyComputer ] }; - key { [ XF86Back ] }; - key { [ XF86Forward ] }; - key { [ XF86Eject ] }; - key { [ XF86Eject ] }; - key { [ XF86AudioNext ] }; - key { [ XF86AudioPlay, XF86AudioPause ] }; - key { [ XF86AudioPrev ] }; - key { [ XF86AudioStop, XF86Eject ] }; - key { [ XF86AudioRecord ] }; - key { [ XF86AudioRewind ] }; - key { [ XF86Phone ] }; - key { [ XF86Tools ] }; - key { [ XF86HomePage ] }; - key { [ XF86Reload ] }; - key { [ XF86Close ] }; - key { [ XF86ScrollUp ] }; - key { [ XF86ScrollDown ] }; - key { [ parenleft ] }; - key { [ parenright ] }; - key { [ XF86New ] }; - key { [ Redo ] }; - key { [ XF86Tools ] }; - key { [ XF86Launch5 ] }; - key { [ XF86Launch6 ] }; - key { [ XF86Launch7 ] }; - key { [ XF86Launch8 ] }; - key { [ XF86Launch9 ] }; - key { [ XF86AudioMicMute ] }; - key { [ XF86TouchpadToggle ] }; - key { [ XF86TouchpadOn ] }; - key { [ XF86TouchpadOff ] }; - key { [ Mode_switch ] }; - key { [ NoSymbol, Alt_L ] }; - key { [ NoSymbol, Meta_L ] }; - key { [ NoSymbol, Super_L ] }; - key { [ NoSymbol, Hyper_L ] }; - key { [ XF86AudioPlay ] }; - key { [ XF86AudioPause ] }; - key { [ XF86Launch3 ] }; - key { [ XF86Launch4 ] }; - key { [ XF86LaunchB ] }; - key { [ XF86Suspend ] }; - key { [ XF86Close ] }; - key { [ XF86AudioPlay ] }; - key { [ XF86AudioForward ] }; - key { [ Print ] }; - key { [ XF86WebCam ] }; - key { [ XF86AudioPreset ] }; - key { [ XF86Mail ] }; - key { [ XF86Messenger ] }; - key { [ XF86Search ] }; - key { [ XF86Go ] }; - key { [ XF86Finance ] }; - key { [ XF86Game ] }; - key { [ XF86Shop ] }; - key { [ Cancel ] }; - key { [ XF86MonBrightnessDown ] }; - key { [ XF86MonBrightnessUp ] }; - key { [ XF86AudioMedia ] }; - key { [ XF86Display ] }; - key { [ XF86KbdLightOnOff ] }; - key { [ XF86KbdBrightnessDown ] }; - key { [ XF86KbdBrightnessUp ] }; - key { [ XF86Send ] }; - key { [ XF86Reply ] }; - key { [ XF86MailForward ] }; - key { [ XF86Save ] }; - key { [ XF86Documents ] }; - key { [ XF86Battery ] }; - key { [ XF86Bluetooth ] }; - key { [ XF86WLAN ] }; - key { [ XF86UWB ] }; - key { [ XF86Next_VMode ] }; - key { [ XF86Prev_VMode ] }; - key { [ XF86MonBrightnessCycle ] }; - key { [ XF86BrightnessAuto ] }; - key { [ XF86DisplayOff ] }; - key { [ XF86WWAN ] }; - key { [ XF86RFKill ] }; - modifier_map Control { }; - modifier_map Shift { }; - modifier_map Shift { }; - modifier_map Mod1 { }; - modifier_map Lock { }; - modifier_map Mod2 { }; - modifier_map Mod5 { }; - modifier_map Control { }; - modifier_map Mod1 { }; - modifier_map Mod4 { }; - modifier_map Mod4 { }; - modifier_map Mod5 { }; - modifier_map Mod1 { }; - modifier_map Mod4 { }; - modifier_map Mod4 { }; -}; - -}; diff --git a/kitty/kitty.conf b/kitty/kitty.conf deleted file mode 100644 index e73265e..0000000 --- a/kitty/kitty.conf +++ /dev/null @@ -1,61 +0,0 @@ -enable_audio_bell no -window_alert_on_bell no -background_opacity 0.8 -cursor_blink_interval 0 -window_padding_width 1 -shell_integration yes -sync_with_monitor no - -font_family JetBrainsMono Nerd Font Mono -bold_font JetBrainsMono Nerd Font Mono Extra Bold -italic_font JetBrainsMono Nerd Font Mono Extra Italic -bold_italic_font JetBrainsMono Nerd Font Mono Extra Bold Italic - -background #1a1b25 -foreground #c5c8c6 - -selection_background #b2ceee -selection_foreground #080808 - -# selection_background #33467c -# selection_foreground #c0caf5 -url_color #73daca -cursor #c0caf5 -cursor_text_color #1a1b25 - -# Tabs -active_tab_background #7aa2f7 -active_tab_foreground #16161e -inactive_tab_background #292e42 -inactive_tab_foreground #545c7e -#tab_bar_background #15161e - -# Windows -active_border_color #7aa2f7 -inactive_border_color #292e42 - -# normal -color0 #15161e -color1 #c94448 -color2 #9ece6a -color3 #e0af68 -color4 #7aa2f7 -color5 #bb9af7 -color6 #7dcfff -color7 #a9b1d6 - -# bright -color8 #414868 -color9 #f2201f -color10 #9ece6a -color11 #e0af68 -color12 #7aa2f7 -color13 #bb9af7 -color14 #7dcfff -color15 #c0caf5 - -# extended colors -color16 #ff9e64 -color17 #db4b4b - -shell fish diff --git a/mimeapps.list b/mimeapps.list deleted file mode 100644 index d7eed17..0000000 --- a/mimeapps.list +++ /dev/null @@ -1,64 +0,0 @@ -[Default Applications] -x-scheme-handler/http=firefox.desktop -x-scheme-handler/https=firefox.desktop -x-scheme-handler/chrome=firefox.desktop -text/html=firefox.desktop -application/x-extension-htm=firefox.desktop -application/x-extension-html=firefox.desktop -application/x-extension-shtml=firefox.desktop -application/xhtml+xml=firefox.desktop -application/x-extension-xhtml=firefox.desktop -application/x-extension-xht=firefox.desktop -x-scheme-handler/mailto=userapp-Thunderbird-UUM0S1.desktop -message/rfc822=userapp-Thunderbird-UUM0S1.desktop -x-scheme-handler/mid=userapp-Thunderbird-UUM0S1.desktop -x-scheme-handler/webcal=userapp-Thunderbird-5EC1S1.desktop -text/calendar=userapp-Thunderbird-5EC1S1.desktop -application/x-extension-ics=userapp-Thunderbird-5EC1S1.desktop -x-scheme-handler/webcals=userapp-Thunderbird-5EC1S1.desktop -image/jpeg=swappy.desktop -image/png=swappy.desktop -text/markdown=neovide.desktop -text/x-tex=neovide.desktop -text/x-csrc=neovide.desktop -text/x-chdr=neovide.desktop -text/x-c++src=neovide.desktop -text/x-cmake=neovide.desktop -application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop -text/x-python=nvim.desktop -image/svg+xml=org.inkscape.Inkscape.desktop -application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop -application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop -text/csv=libreoffice-calc.desktop -application/pdf=org.pwmt.zathura.desktop - -[Added Associations] -x-scheme-handler/http=firefox.desktop; -x-scheme-handler/https=firefox.desktop; -x-scheme-handler/chrome=firefox.desktop; -text/html=firefox.desktop; -application/x-extension-htm=firefox.desktop; -application/x-extension-html=firefox.desktop; -application/x-extension-shtml=firefox.desktop; -application/xhtml+xml=firefox.desktop; -application/x-extension-xhtml=firefox.desktop; -application/x-extension-xht=firefox.desktop; -application/pdf=org.gnome.Evince.desktop;org.pwmt.zathura.desktop; -x-scheme-handler/mailto=userapp-Thunderbird-UUM0S1.desktop; -x-scheme-handler/mid=userapp-Thunderbird-UUM0S1.desktop; -x-scheme-handler/webcal=userapp-Thunderbird-5EC1S1.desktop; -x-scheme-handler/webcals=userapp-Thunderbird-5EC1S1.desktop; -application/gzip=com.github.xournalpp.xournalpp.desktop; -image/png=com.github.maoschanz.drawing.desktop;swappy.desktop; -text/markdown=firefox.desktop;neovide.desktop; -text/x-tex=neovide.desktop; -text/x-csrc=neovide.desktop; -text/x-chdr=neovide.desktop; -text/x-c++src=neovide.desktop; -text/x-cmake=neovide.desktop; -application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop; -text/x-python=nvim.desktop; -image/svg+xml=krita_svg.desktop;org.inkscape.Inkscape.desktop; -application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop; -application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop; -text/csv=libreoffice-calc.desktop; diff --git a/nix/base/big_g.nix b/nix/base/big_g.nix new file mode 100644 index 0000000..f5cc767 --- /dev/null +++ b/nix/base/big_g.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: { + services = { + # needed for GNOME services outside of GNOME Desktop + dbus.packages = with pkgs; [ + gcr + gnome.gnome-settings-daemon + ]; + + gnome.gnome-keyring.enable = true; + + gvfs.enable = true; + }; +} diff --git a/nix/base/default.nix b/nix/base/default.nix new file mode 100644 index 0000000..642d4fd --- /dev/null +++ b/nix/base/default.nix @@ -0,0 +1,12 @@ +{ lib +, pkgs +, ... +}: { + imports = [ + ./login_manager.nix + ./big_g.nix + ./env.nix + ./xkb_layout.nix + ../hardware/streamdeck.nix + ]; +} diff --git a/nix/base/env.nix b/nix/base/env.nix new file mode 100644 index 0000000..8e82116 --- /dev/null +++ b/nix/base/env.nix @@ -0,0 +1,14 @@ +{ lib +, pkgs +, ... +}: { + environment.variables = { + GSETTINGS_SCHEMA_DIR = "${pkgs.glib.getSchemaPath pkgs.gsettings-desktop-schemas}"; + NEOVIDE_MAXIMIZED = "0"; + GPG_TTY = "$(tty)"; + EDITOR = "neovide --no-fork"; + SUDO_EDITOR = "neovide --no-fork"; + SCRIPTS = "$HOME/.config/scripts"; + }; + environment.sessionVariables.NIXOS_OZONE_WL = "1"; +} diff --git a/nix/base/login_manager.nix b/nix/base/login_manager.nix new file mode 100644 index 0000000..f11c31b --- /dev/null +++ b/nix/base/login_manager.nix @@ -0,0 +1,24 @@ +{pkgs, + config, + lib, + ... +}: { + # greetd display manager + services.greetd = let + session = { + command = "${pkgs.hyprland}/bin/Hyprland --config /home/dashie/.config/hypr/hyprgreet.conf"; + user = "dashie"; + }; + in { + enable = true; + settings = { + terminal.vt = 1; + default_session = session; + initial_session = session; + }; + }; + programs.regreet.enable = true; + + # unlock GPG keyring on login + security.pam.services.greetd.enableGnomeKeyring = true; +} diff --git a/nix/base/xkb_layout.nix b/nix/base/xkb_layout.nix new file mode 100644 index 0000000..9422663 --- /dev/null +++ b/nix/base/xkb_layout.nix @@ -0,0 +1,27 @@ +{ pkgs +, ... +}: +let + customKeyboardLayout = pkgs.writeText "us_int" '' + xkb_symbols "us_int" + { + include "us(basic)" + key {[ apostrophe, dead_diaeresis, apostrophe, quotedouble ] }; + key {[ grave, asciitilde ] }; + }; + ''; + compiledLayout = pkgs.runCommand "keyboard-layout" { } '' + ${pkgs.xorg.xkbcomp}/bin/xkbcomp ${customKeyboardLayout} $out + ''; +in +{ + environment.systemPackages = [ pkgs.xorg.xkbcomp ]; + services.xserver.xkb.extraLayouts.us_int = { + description = "US layout with 'umlaut'"; + languages = [ "eng" ]; + #symbolsFile = ${customKeyboardLayout}; + symbolsFile = /home/dashie/.config/symbols/us_int; + }; + #services.xserver.displayManager.sessionCommands = "${pkgs.xorg.xkbcomp}/bin/xkbcomp ${compiledLayout} $DISPLAY"; +} + diff --git a/nix/base_packages.nix b/nix/base_packages.nix new file mode 100644 index 0000000..60ca233 --- /dev/null +++ b/nix/base_packages.nix @@ -0,0 +1,46 @@ +{ config, pkgs, ... }: + +{ + environment.systemPackages = with pkgs; [ + openssl + dbus + glib + gtk4 + gtk3 + gtk-layer-shell + gtk4-layer-shell + direnv + dconf + gsettings-desktop-schemas + gnome.nixos-gsettings-overrides + gnome.adwaita-icon-theme + bibata-cursors + xorg.xkbutils + ]; + + fonts.packages = with pkgs; [ + cantarell-fonts + ]; + + environment.variables = { + NIX_LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath (config.systemd.packages ++ config.environment.systemPackages); + PKG_CONFIG_PATH = pkgs.lib.makeLibraryPath (config.systemd.packages ++ config.environment.systemPackages); + }; + nix.settings.experimental-features = "nix-command flakes"; + programs.fish.enable = true; + programs.fish.promptInit = '' + ${pkgs.any-nix-shell}/bin/any-nix-shell fish --info-right | source + ''; + + programs.dconf.enable = true; + services.printing.enable = true; + services.dbus.enable = true; + services.dbus.packages = with pkgs; [ + gnome2.GConf + ]; + services.avahi = { + enable = true; + nssmdns4 = true; + openFirewall = true; + }; +} diff --git a/nix/configuration.nix b/nix/configuration.nix index 5ab413e..077e53b 100644 --- a/nix/configuration.nix +++ b/nix/configuration.nix @@ -6,21 +6,23 @@ { imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix + [ + # Include the results of the hardware scan. + #./hardware-configuration.nix + ./base_packages.nix + ./direnv.nix ]; # Bootloader. - boot.loader.grub.enable = true; - boot.loader.grub.device = "/dev/sda"; - boot.loader.grub.useOSProber = true; + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.kernelPackages = pkgs.linuxPackages_zen; + boot.kernelParams = [ + "amdgpu.ppfeaturemask=0xffffffff" + ]; - networking.hostName = "nixos"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + # WARNING: Simply change this for each config + networking.hostName = "spaceship"; # Enable networking networking.networkmanager.enable = true; @@ -35,14 +37,10 @@ # Enable the X11 windowing system. services.xserver.enable = true; - # Enable the GNOME Desktop Environment. - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; - # Configure keymap in X11 services.xserver = { - layout = "us"; - xkbVariant = ""; + xkb.layout = "us"; + xkb.variant = ""; }; # Enable CUPS to print documents. @@ -59,13 +57,32 @@ pulse.enable = true; }; + environment.variables = rec { + XDG_CACHE_HOME = "$HOME/.cache"; + DIRENV_LOG_FORMAT = ""; + }; + # Define a user account. Don't forget to set a password with ‘passwd’. users.users.dashie = { isNormalUser = true; description = "dashie"; - extraGroups = [ "networkmanager" "wheel" "gamemode"]; + extraGroups = [ "networkmanager" "wheel" "gamemode" ]; packages = with pkgs; [ - home-manager + home-manager + xdg-desktop-portal-gtk + xdg-desktop-portal-hyprland + ]; + }; + + nix.settings = { + builders-use-substitutes = true; + # substituters to use + substituters = [ + "https://anyrun.cachix.org" + ]; + + trusted-public-keys = [ + "anyrun.cachix.org-1:pqBobmOjI7nKlsUMV25u9QHa9btJK65/C8vnO3p346s=" ]; }; diff --git a/nix/direnv.nix b/nix/direnv.nix new file mode 100644 index 0000000..244e198 --- /dev/null +++ b/nix/direnv.nix @@ -0,0 +1,13 @@ +{ pkgs, ... }: { + #set to default values + programs.direnv = { + package = pkgs.direnv; + silent = false; + loadInNixShell = true; + direnvrcExtra = ""; + nix-direnv = { + enable = true; + package = pkgs.nix-direnv; + }; + }; +} diff --git a/nix/flake.lock b/nix/flake.lock index 86e4766..f59c870 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -1,22 +1,70 @@ { "nodes": { - "flatpaks": { + "Hyprspace": { "inputs": { - "nixpkgs": "nixpkgs", - "utils": "utils" + "hyprland": [ + "hyprland" + ], + "hyprlandPlugins": "hyprlandPlugins", + "nixpkgs": [ + "Hyprspace", + "hyprland", + "nixpkgs" + ] }, "locked": { - "lastModified": 1707326266, - "narHash": "sha256-vRVih6iltuyLdj305Pj236BfhzFaOkAbHg3r5VsFdxs=", - "owner": "GermanBread", - "repo": "declarative-flatpak", - "rev": "efe7897ddcfbca085fba0690b3094e7f8e8911dd", + "lastModified": 1713113295, + "narHash": "sha256-3oivuUgU2B3zQIuop1lc+VXBOhqCnZMl81pFYdZu1oc=", + "owner": "KZDKM", + "repo": "Hyprspace", + "rev": "046533d6fb0244874273254d4008cbdc48621829", "type": "github" }, "original": { - "owner": "GermanBread", - "ref": "stable", - "repo": "declarative-flatpak", + "owner": "KZDKM", + "repo": "Hyprspace", + "type": "github" + } + }, + "anyrun": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712136515, + "narHash": "sha256-LpjQJYC24S5P5XhJsZX6HqsQT1pohcFzM6N42I6qo/U=", + "owner": "Kirottu", + "repo": "anyrun", + "rev": "be6728884d543665e7bd137bbef62dc1d04a210b", + "type": "github" + }, + "original": { + "owner": "Kirottu", + "repo": "anyrun", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "anyrun", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", "type": "github" } }, @@ -27,16 +75,15 @@ ] }, "locked": { - "lastModified": 1709578214, - "narHash": "sha256-jSCHB1+9eA0S2h7G8Aju8XARK0vbDuOR7uFFvCEsKhk=", + "lastModified": 1713077896, + "narHash": "sha256-Noot8H0EZEAFRQWyGxh9ryvhK96xpIqKbh78X447JWs=", "owner": "nix-community", "repo": "home-manager", - "rev": "219f4bef6d22bc67cddefbba69aadb748d79c49d", + "rev": "630a0992b3627c64e34f179fab68e3d48c6991c0", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.05", "repo": "home-manager", "type": "github" } @@ -75,22 +122,25 @@ "hyprcursor": "hyprcursor", "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", - "nixpkgs": "nixpkgs_2", - "systems": "systems_2", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1713050186, - "narHash": "sha256-AKdzVa0Zz5PQ1ptQgD0jj8J+UZUW9OeKGZ0mNVnkyI4=", + "lastModified": 1713126795, + "narHash": "sha256-IX9N+WMMcdBsxjQFLHjBCwXByMt+0S8sL18dQ2QTzvI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "0634aaeac6cca12e4f72174c431c2db9da9c0072", + "rev": "67f47fbdccd639502a76ccb3552a23df37f19ef8", "type": "github" }, "original": { "owner": "hyprwm", "repo": "Hyprland", + "rev": "67f47fbdccd639502a76ccb3552a23df37f19ef8", "type": "github" } }, @@ -119,6 +169,33 @@ "type": "github" } }, + "hyprlandPlugins": { + "inputs": { + "hyprland": [ + "Hyprspace", + "hyprland" + ], + "systems": [ + "Hyprspace", + "hyprlandPlugins", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1712836056, + "narHash": "sha256-qf6yev9OlJuQv557ApLQ/5V8pQj0YOO9tyh5j3It1mY=", + "owner": "hyprwm", + "repo": "hyprland-plugins", + "rev": "e9457e08ca3ff16dc5a815be62baf9e18b539197", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-plugins", + "type": "github" + } + }, "hyprlang": { "inputs": { "nixpkgs": [ @@ -144,39 +221,22 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1711997375, + "narHash": "sha256-KvU4gOtuFMS9Il67glRGtdNfguAINT9pCaXtvCL8uI8=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "45bf66f7068db79b552da864c0e87452be624d6c", + "type": "github" + }, + "original": { + "owner": "gmodena", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixpkgs": { - "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1713088362, "narHash": "sha256-ttDSOqkEBinjA1dlMWkBjaXzTqjiAPt5lNkoONbz25Y=", @@ -193,28 +253,15 @@ }, "root": { "inputs": { - "flatpaks": "flatpaks", + "Hyprspace": "Hyprspace", + "anyrun": "anyrun", "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_3" + "nix-flatpak": "nix-flatpak", + "nixpkgs": "nixpkgs" } }, "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -229,38 +276,20 @@ "type": "github" } }, - "utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "wlroots": { "flake": false, "locked": { - "lastModified": 1712935342, - "narHash": "sha256-zzIbTFNFd/as42jyGx23fil2uBDYYv+8GA5JmRq5y9c=", + "lastModified": 1713124002, + "narHash": "sha256-vPeZCY+sdiGsz4fl3AVVujfyZyQBz6+vZdkUE4hQ+HI=", "owner": "hyprwm", "repo": "wlroots-hyprland", - "rev": "62eeffbe233d199f520a5755c344e85f8eab7940", + "rev": "611a4f24cd2384378f6e500253983107c6656c64", "type": "github" }, "original": { "owner": "hyprwm", "repo": "wlroots-hyprland", - "rev": "62eeffbe233d199f520a5755c344e85f8eab7940", + "rev": "611a4f24cd2384378f6e500253983107c6656c64", "type": "github" } }, diff --git a/nix/flake.nix b/nix/flake.nix index 018dd50..a8895d2 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -3,16 +3,26 @@ inputs = { - flatpaks.url = "github:GermanBread/declarative-flatpak/stable"; + nix-flatpak.url = "github:gmodena/nix-flatpak"; nixpkgs.url = "github:nixos/nixpkgs"; - home-manager = { - url = "github:nix-community/home-manager/release-23.05"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - hyprland.url = "github:hyprwm/Hyprland"; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hyprland = { + url = "github:hyprwm/Hyprland/67f47fbdccd639502a76ccb3552a23df37f19ef8"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + Hyprspace = { + url = "github:KZDKM/Hyprspace"; + inputs.hyprland.follows = "hyprland"; + }; + + anyrun.url = "github:Kirottu/anyrun"; + anyrun.inputs.nixpkgs.follows = "nixpkgs"; }; - outputs = { self, nixpkgs, home-manager, flatpaks, hyprland }: + outputs = inputs @ { self, nixpkgs, home-manager, nix-flatpak, hyprland, anyrun, ... }: let pkgs = import nixpkgs { system = "x86_64-linux"; @@ -30,26 +40,41 @@ inherit pkgs; modules = [ ./hardware/overheating.nix ]; }; - homeConfigurations."dashie" = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = [ - flatpaks.homeManagerModules.default - hyprland.homeManagerModules.default - ./programs/hyprland/config.nix - ]; - }; - - nixosConfigurations."nixos" = nixpkgs.lib.nixosSystem { + nixosConfigurations."spaceship" = nixpkgs.lib.nixosSystem { inherit pkgs; modules = [ - ./configuration.nix - flatpaks.nixosModules.default - hyprland.nixosModules.default - home-manager.nixosModules.home-manager { - home-manager.users.dashie = import ./programs/default.nix {inherit pkgs; }; - home-manager.useGlobalPkgs = true; - } - ./programs/flatpak.nix + + # TODO put this into not gaming + ./hardware/spaceship.nix + ./configuration.nix + ./programs/gaming/default.nix + ./base/default.nix + hyprland.nixosModules.default + home-manager.nixosModules.home-manager + { + xdg.portal.config.common.default = "*"; + xdg.portal = { + enable = true; + extraPortals = [ + pkgs.xdg-desktop-portal-hyprland + pkgs.xdg-desktop-portal-gtk + ]; + }; + home-manager.useGlobalPkgs = true; + home-manager.users.dashie.imports = [ + { + _module = { args = { inherit self inputs; }; }; + } + ./programs/default.nix + hyprland.homeManagerModules.default + anyrun.homeManagerModules.default + ./programs/hyprland/default.nix #{inherit Hyprspace; } + nix-flatpak.homeManagerModules.nix-flatpak + ./programs/flatpak.nix + ]; + + home-manager.users.dashie.home.stateVersion = "24.05"; + } ]; }; }; diff --git a/nix/gg.txt b/nix/gg.txt deleted file mode 100644 index 4518424..0000000 --- a/nix/gg.txt +++ /dev/null @@ -1,49 +0,0 @@ -building the system configuration... -trace: warning: The option `services.xserver.xkbVariant' defined in `/nix/store/53sb5ixrwba793scv24rb8zl15z22jq1-source/configuration.nix' has been renamed to `services.xserver.xkb.variant'. -trace: warning: The option `services.xserver.layout' defined in `/nix/store/53sb5ixrwba793scv24rb8zl15z22jq1-source/configuration.nix' has been renamed to `services.xserver.xkb.layout'. -these 9 derivations will be built: - /nix/store/np0n7b6f05mzgln8isi0vjz3qv29wf1k-home-manager-path.drv - /nix/store/8c5l2gjr9jbilklrzvvjxa0m6y057lw0-hm_fontconfigconf.d10hmfonts.conf.drv - /nix/store/mnf21n8sfzxvqykzyriiabsq5kmv6glm-home-manager-files.drv - /nix/store/x0wjqz7aay3vaqzsqkxy45mpwbhmrdsn-activation-script.drv - /nix/store/dx1bjiby48rbq7qg1dwz6a6wdbxpsxvc-home-manager-generation.drv - /nix/store/bqjbbqzqgcy6ygz3qlh1y868j2h99xj8-unit-home-manager-dashie.service.drv - /nix/store/dm875ly78yc9lbwbw0061bpwz5ani7mc-system-units.drv - /nix/store/2s8xk8yl7l316x2k8qrlf3pwj2wy3h9c-etc.drv - /nix/store/jngp4gggy2qhwvhclcmlqylbnfv5c2ik-nixos-system-nixos-24.05.20240414.f32598c.drv -building '/nix/store/np0n7b6f05mzgln8isi0vjz3qv29wf1k-home-manager-path.drv'... -building '/nix/store/x0wjqz7aay3vaqzsqkxy45mpwbhmrdsn-activation-script.drv'... -building '/nix/store/8c5l2gjr9jbilklrzvvjxa0m6y057lw0-hm_fontconfigconf.d10hmfonts.conf.drv'... -building '/nix/store/mnf21n8sfzxvqykzyriiabsq5kmv6glm-home-manager-files.drv'... -building '/nix/store/dx1bjiby48rbq7qg1dwz6a6wdbxpsxvc-home-manager-generation.drv'... -building '/nix/store/bqjbbqzqgcy6ygz3qlh1y868j2h99xj8-unit-home-manager-dashie.service.drv'... -building '/nix/store/dm875ly78yc9lbwbw0061bpwz5ani7mc-system-units.drv'... -building '/nix/store/2s8xk8yl7l316x2k8qrlf3pwj2wy3h9c-etc.drv'... -building '/nix/store/jngp4gggy2qhwvhclcmlqylbnfv5c2ik-nixos-system-nixos-24.05.20240414.f32598c.drv'... -updating GRUB 2 menu... -Warning: os-prober will be executed to detect other bootable partitions. -Its output will be used to detect bootable binaries on them and create new boot entries. -lsblk: /dev/mapper/no*[0-9]: not a block device -lsblk: /dev/mapper/raid*[0-9]: not a block device -lsblk: /dev/mapper/disks*[0-9]: not a block device -installing the GRUB 2 boot loader on /dev/sda... -Installing for i386-pc platform. -Installation finished. No error reported. -stopping swap device: /dev/disk/by-uuid/2cb00912-21ef-46e4-9a8c-14819a1335ae -stopping the following units: audit.service, boot.mount, dhcpcd.service, kmod-static-nodes.service, logrotate-checkconf.service, mount-pstore.service, network-interfaces.target, network-local-commands.service, network-setup.service, nscd.service, resolvconf.service, systemd-modules-load.service, systemd-oomd.service, systemd-oomd.socket, systemd-sysctl.service, systemd-timesyncd.service, systemd-vconsole-setup.service, virtualbox.service -NOT restarting the following changed units: -.mount, getty@tty1.service, systemd-fsck@dev-disk-by\x2duuid-719F\x2d1D58.service, systemd-journal-flush.service, systemd-logind.service, systemd-random-seed.service, systemd-remount-fs.service, systemd-update-utmp.service, systemd-user-sessions.service, user-runtime-dir@1000.service, user@1000.service -activating the configuration... -removing group ‘systemd-journal-gateway’ -removing group ‘dhcpcd’ -removing user ‘systemd-journal-gateway’ -removing user ‘dhcpcd’ -setting up /etc... -removing obsolete symlink ‘/etc/dhcpcd.exit-hook’... -removing obsolete symlink ‘/etc/pulse/client.conf’... -restarting systemd... -reloading user units for dashie... -restarting sysinit-reactivation.target -reloading the following units: dbus.service, firewall.service, reload-systemd-vconsole-setup.service -restarting the following units: systemd-journald.service -starting the following units: audit.service, kmod-static-nodes.service, logrotate-checkconf.service, mount-pstore.service, network-local-commands.service, network-setup.service, nscd.service, resolvconf.service, systemd-modules-load.service, systemd-oomd.socket, systemd-sysctl.service, systemd-timesyncd.service, systemd-vconsole-setup.service, virtualbox.service -the following new units were started: NetworkManager-dispatcher.service, NetworkManager-wait-online.service, NetworkManager.service, alsa-store.service, avahi-daemon.service, avahi-daemon.socket, cups-browsed.service, cups.service, cups.socket, dbus-broker.service, home-manager-dashie.service, manage-system-flatpaks.service, nix-daemon.service, sysinit-reactivation.target, systemd-hostnamed.service, systemd-tmpfiles-resetup.service diff --git a/nix/hardware-configuration.nix b/nix/hardware-configuration.nix index 8aaadc2..e921b94 100644 --- a/nix/hardware-configuration.nix +++ b/nix/hardware-configuration.nix @@ -4,27 +4,53 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = [ ]; + imports = + [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; - boot.initrd.availableKernelModules = [ "ata_piix" "ohci_pci" "ehci_pci" "ahci" "sd_mod" "sr_mod" ]; + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/299e37e5-6a68-4cbe-97ad-0c59e5ed0bf4"; + { + device = "/dev/disk/by-label/ROOT"; + fsType = "btrfs"; + }; + + fileSystems."/boot" = + { + device = "/dev/disk/by-label/BOOT"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + }; + + fileSystems."/home" = + { + device = "/dev/disk/by-label/HOME"; + fsType = "btrfs"; + }; + + fileSystems."/drive2" = + { + device = "/dev/disk/by-label/DRIVE2"; fsType = "ext4"; }; - swapDevices = [ ]; + + swapDevices = + [{ device = "/dev/disk/by-label/SWAP"; }]; # Enables DHCP on each ethernet and wireless interface. In case of scripted networking # (the default) this is the recommended approach. When using systemd-networkd it's # still possible to use this option, but it's recommended to use it in conjunction # with explicit per-interface declarations with `networking.interfaces..useDHCP`. networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s3.useDHCP = lib.mkDefault true; + # networking.interfaces.enp15s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp16s0.useDHCP = lib.mkDefault true; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - virtualisation.virtualbox.guest.enable = true; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/nix/hardware/marmo.nix b/nix/hardware/marmo.nix index 928794f..f3bcc32 100644 --- a/nix/hardware/marmo.nix +++ b/nix/hardware/marmo.nix @@ -1 +1 @@ -{ config, lib, pkgs, modulesPath, ... }: {} +{ config, lib, pkgs, modulesPath, ... }: { } diff --git a/nix/hardware/overheating.nix b/nix/hardware/overheating.nix index 928794f..f3bcc32 100644 --- a/nix/hardware/overheating.nix +++ b/nix/hardware/overheating.nix @@ -1 +1 @@ -{ config, lib, pkgs, modulesPath, ... }: {} +{ config, lib, pkgs, modulesPath, ... }: { } diff --git a/nix/hardware/spaceship.nix b/nix/hardware/spaceship.nix index 928794f..6c12638 100644 --- a/nix/hardware/spaceship.nix +++ b/nix/hardware/spaceship.nix @@ -1 +1,69 @@ -{ config, lib, pkgs, modulesPath, ... }: {} +{ config, lib, pkgs, modulesPath, ... }: +{ + imports = + [ + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-amd" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { + device = "/dev/disk/by-label/ROOT"; + fsType = "btrfs"; + options = [ + "noatime" + "nodiratime" + "discard" + ]; + }; + + fileSystems."/boot" = + { + device = "/dev/disk/by-label/BOOT"; + fsType = "vfat"; + options = [ "rw" "fmask=0022" "dmask=0022" "noatime" ]; + }; + + fileSystems."/home" = + { + device = "/dev/disk/by-label/HOME"; + fsType = "btrfs"; + options = [ + "noatime" + "nodiratime" + "discard" + ]; + }; + + fileSystems."/drive2" = + { + device = "/dev/disk/by-label/DRIVE2"; + fsType = "ext4"; + options = [ + "noatime" + "nodiratime" + "discard" + ]; + }; + + + swapDevices = + [{ device = "/dev/disk/by-label/SWAP"; }]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.enp15s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp16s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; + services.fstrim.enable = lib.mkDefault true; + nix.settings.auto-optimise-store = true; +} diff --git a/nix/hardware/streamdeck.nix b/nix/hardware/streamdeck.nix new file mode 100644 index 0000000..3bca650 --- /dev/null +++ b/nix/hardware/streamdeck.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: { + programs.streamdeck-ui = { + enable = true; + autoStart = true; # optional + }; +} diff --git a/nix/kek.nix b/nix/kek.nix new file mode 100644 index 0000000..5731c9f --- /dev/null +++ b/nix/kek.nix @@ -0,0 +1,117 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page, on +# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). + +{ config, lib, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # networking.hostName = "nixos"; # Define your hostname. + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + # networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # Set your time zone. + # time.timeZone = "Europe/Amsterdam"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkb.options in tty. + # }; + + # Enable the X11 windowing system. + # services.xserver.enable = true; + + + + + # Configure keymap in X11 + # services.xserver.xkb.layout = "us"; + # services.xserver.xkb.options = "eurosign:e,caps:escape"; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + # sound.enable = true; + # hardware.pulseaudio.enable = true; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.dashie = { + isNormalUser = true; + extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + packages = with pkgs; [ + git + neovim + ]; + }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + # environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + # ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + # programs.mtr.enable = true; + # programs.gnupg.agent = { + # enable = true; + # enableSSHSupport = true; + # }; + + # List services that you want to enable: + + # Enable the OpenSSH daemon. + # services.openssh.enable = true; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # This option defines the first version of NixOS you have installed on this particular machine, + # and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions. + # + # Most users should NEVER change this value after the initial install, for any reason, + # even if you've upgraded your system to a new NixOS release. + # + # This value does NOT affect the Nixpkgs version your packages and OS are pulled from, + # so changing it will NOT upgrade your system. + # + # This value being lower than the current NixOS release does NOT mean your system is + # out of date, out of support, or vulnerable. + # + # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, + # and migrated your data accordingly. + # + # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . + system.stateVersion = "23.11"; # Did you read the comment? + +} + diff --git a/nix/programs/cargo.nix b/nix/programs/cargo.nix index 87f42f6..6951ec6 100644 --- a/nix/programs/cargo.nix +++ b/nix/programs/cargo.nix @@ -1,40 +1,36 @@ -{ inputs -, lib -, pkgs +{ lib +, fetchCrate , rustPlatform , ... }: { - imports = [ - ./config.nix - ./anyrun.nix - ./ironbar.nix - ]; - - home.packages = with pkgs; [ - (rustPackage { - name = "oxinoti"; + home.packages = [ + rustPlatform.buildRustPackage + rec { + pname = "oxinoti"; version = "0.1.1"; src = fetchCrate { - inherit name version; - sha256 = lib.fakesha256; + inherit pname version; + hash = lib.fakehash; }; - }) - (rustPackage { - name = "oxidash"; - version = "0.1.0"; - src = fetchCrate { - inherit name version; - sha256 = lib.fakesha256; - }; - }) - (rustPackage { - name = "oxishut"; - version = "0.1.0"; - src = fetchCrate { - inherit name version; - sha256 = lib.fakesha256; - }; - }) + } + #rustPlatform.buildRustPackage + #{ + # pname = "oxidash"; + # version = "0.1.0"; + # #src = fetchCrate { + # # inherit name version; + # # sha256 = lib.fakesha256; + # #}; + #} + #rustPlatform.buildRustPackage + #{ + # pname = "oxishut"; + # version = "0.1.0"; + # #src = fetchCrate { + # # inherit name version; + # # sha256 = lib.fakesha256; + # #}; + #} ]; } diff --git a/nix/programs/coding.nix b/nix/programs/coding.nix index 0db28a8..6344581 100644 --- a/nix/programs/coding.nix +++ b/nix/programs/coding.nix @@ -1,5 +1,4 @@ -{ lib -, pkgs +{ pkgs , ... }: { @@ -12,9 +11,18 @@ go nodejs_20 deno - # rustpython + python3 neovim typst neovide + tree-sitter + dotnet-runtime_8 + unzip + pkg-config + lua-language-server + nil + nixpkgs-fmt + crate2nix + sqlite ]; } diff --git a/nix/programs/common.nix b/nix/programs/common.nix index 270141f..824ec14 100644 --- a/nix/programs/common.nix +++ b/nix/programs/common.nix @@ -1,6 +1,4 @@ -{ lib -, pkgs -, fonts +{ pkgs , ... }: { @@ -12,6 +10,7 @@ fonts.fontconfig.enable = true; home.packages = with pkgs; [ + vesktop kitty firefox fish @@ -22,7 +21,40 @@ lsd (pkgs.nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) flatpak - gnome.gnome-software networkmanager + zoxide + pkgs.greetd.greetd + pkgs.greetd.regreet + fastfetch + pkgs.gnome.gnome-keyring + dbus + killall + adw-gtk3 + gradience + qt5ct + qt6ct + libadwaita + yazi + gnutar + fishPlugins.tide + nix-index + libnotify + zenith ]; + + home.sessionPath = [ + "$HOME/.cargo/bin" + ]; + + home.sessionVariables = { + GOROOT = "$HOME/.go"; + }; + + home.keyboard = null; + + programs.nix-index = + { + enable = true; + enableFishIntegration = true; + }; } diff --git a/nix/programs/default.nix b/nix/programs/default.nix index ee29d8b..84cf235 100644 --- a/nix/programs/default.nix +++ b/nix/programs/default.nix @@ -1,15 +1,17 @@ -{pkgs, ... }: +{ pkgs, ... }: { imports = [ - ./hyprland/default.nix ./common.nix ./kitty.nix ./coding.nix ./xdg.nix ./media.nix + ./utils.nix + #./gtk.nix + #./cargo.nix ]; - home.username = "dashie"; - home.homeDirectory = "/home/dashie"; - home.stateVersion = "23.05"; - } + home.username = "dashie"; + home.homeDirectory = "/home/dashie"; + home.stateVersion = "24.05"; +} diff --git a/nix/programs/flatpak.nix b/nix/programs/flatpak.nix index 3d39d7b..594dfb8 100644 --- a/nix/programs/flatpak.nix +++ b/nix/programs/flatpak.nix @@ -1,17 +1,17 @@ -{...}: { - services.flatpak.remotes = { - "flathub" = "https://dl.flathub.org/repo/flathub.flatpakrepo"; - }; - services.flatpak.packages = [ - "flathub:app/com.github.tchx84.Flatseal//stable" - "flathub:app/dev.vencord.Vesktop//stable" - "flathub:app/com.rustdesk.RustDesk//stable" - "flathub:app/io.github.Foldex.AdwSteamGtk//stable" - "flathub:app/io.github.Foldex.AdwSteamGtk//stable" - "flathub:app/org.gnome.dspy//stable" - "flathub:app/org.onlyoffice.desktopeditors//stable" - "flathub:app/org.gtk.Gtk3theme.adw-gtk3//stable" - "flathub:app/com.brave.Browser//stable" +{ lib, pkgs, ... }: { + + services.flatpak.remotes = lib.mkOptionDefault [{ + name = "flathub-stable"; + location = "https://dl.flathub.org/repo/flathub.flatpakrepo"; + }]; + services.flatpak.uninstallUnmanaged = true; + services.flatpak.packages = [ + "com.github.tchx84.Flatseal" + "io.github.Foldex.AdwSteamGtk" + "org.gnome.dspy" + "org.onlyoffice.desktopeditors" + "org.gtk.Gtk3theme.adw-gtk3" + "com.brave.Browser" ]; } diff --git a/nix/programs/gaming/default.nix b/nix/programs/gaming/default.nix new file mode 100644 index 0000000..1504f9b --- /dev/null +++ b/nix/programs/gaming/default.nix @@ -0,0 +1,36 @@ +{ lib +, pkgs +, ... +}: { + imports = [ + # ./anyrun.nix + # ./config.nix + ]; + + environment.systemPackages = with pkgs; [ + gamemode + steam + lutris + wine + ]; + + programs.steam.enable = true; + programs.gamemode.enable = true; + programs.gamemode = { + enableRenice = true; + settings = { + general = { + governor = "performance"; + }; + gpu = { + apply_gpu_optimisations = "accept-responsibility"; + gpu_device = 0; + amd_performance_level = "high"; + }; + custom = { + start = "notify-send -a 'Gamemode' 'Optimizations activated'"; + end = "notify-send -a 'Gamemode' 'Optimizations deactivated'"; + }; + }; + }; +} diff --git a/nix/programs/gtk.nix b/nix/programs/gtk.nix new file mode 100644 index 0000000..6ad4300 --- /dev/null +++ b/nix/programs/gtk.nix @@ -0,0 +1,23 @@ +{ pkgs, ... }: +{ + gtk = { + enable = true; + + iconTheme = { + name = "Adwaita"; + package = pkgs.gnome.adwaita-icon-theme; + }; + + theme = { + name = "adw-gtk3"; + package = pkgs.adw-gtk3; + }; + + cursorTheme = { + name = "Bibata-Modern-Classic"; + package = pkgs.bibata-cursors; + }; + }; + + home.sessionVariables.GTK_THEME = "adw-gtk3"; +} diff --git a/nix/programs/homemanager.nix b/nix/programs/homemanager.nix index 10996b8..486d3b3 100644 --- a/nix/programs/homemanager.nix +++ b/nix/programs/homemanager.nix @@ -1,3 +1,3 @@ { pkgs, ... }: { programs.home-manager.enable = true; - } +} diff --git a/nix/programs/hyprland/anyrun.nix b/nix/programs/hyprland/anyrun.nix index 1fe2788..08d78dc 100644 --- a/nix/programs/hyprland/anyrun.nix +++ b/nix/programs/hyprland/anyrun.nix @@ -1,20 +1,17 @@ -{ pkgs -, osConfig -, ... -}: { +{ inputs, pkgs, ... }: { programs.anyrun = { + enable = true; config = { - #plugins = with inputs.anyrun.packages.${pkgs.system}; [ - # applications - # rink - # shell - # websearch - # inputs.anyrun-nixos-options.packages.${pkgs.system}.default - #]; - - position = "center"; + plugins = [ + inputs.anyrun.packages.${pkgs.system}.applications + inputs.anyrun.packages.${pkgs.system}.rink + inputs.anyrun.packages.${pkgs.system}.translate + inputs.anyrun.packages.${pkgs.system}.websearch + ]; + #position = "center"; hideIcons = false; width = { fraction = 0.3; }; + y = { fraction = 0.5; }; layer = "overlay"; hidePluginInfo = true; closeOnClick = true; diff --git a/nix/programs/hyprland/config.nix b/nix/programs/hyprland/config.nix index 4bc4409..0a97dcf 100644 --- a/nix/programs/hyprland/config.nix +++ b/nix/programs/hyprland/config.nix @@ -1,21 +1,7 @@ -{ config -, pkgs +{ pkgs +, inputs , ... }: -let - # scripts = "${config.home.homeDirectory}/.config/scripts"; - inputs = { - hyprland ={ - # Update for releavant commit, this is just bleeding edge as of 2024/04/11 - url = github:hyprwm/Hyprland/ac0f3411c18497a39498b756b711e092512de9e0; - inputs.nixpkgs.follows = "nixpkgs"; - }; - Hyprspace = { - url = github:KZDKM/Hyprspace; - inputs.hyprland.follows = "hyprland"; - }; - }; -in { wayland.windowManager.hyprland.enable = true; wayland.windowManager.hyprland.settings = { @@ -24,7 +10,7 @@ in bindm = [ "$mod, mouse:272, movewindow" "$mod, mouse:273, resizewindow" - ]; + ]; bind = [ # screenshots @@ -38,11 +24,11 @@ in "$mod SUPER,T,exec,kitty -1" "$mod SUPER,E,exec,nautilus -w" "$mod SUPER,N,exec,neovide" - "$mod SUPER,M,exec,oxidash" + "$mod SUPER,M,exec,$HOME/.cargo/bin/oxidash" "$mod SUPER,R,exec,anyrun" - "$mod SUPER,G,exec,oxicalc" - "$mod SUPER,D,exec,oxishut" - "$mod SUPER,A,exec,oxipaste" + "$mod SUPER,G,exec,$HOME/.cargo/bin/oxicalc" + "$mod SUPER,D,exec,$HOME/.cargo/bin/oxishut" + "$mod SUPER,A,exec,$HOME/.cargo/bin/oxipaste" "$mod SUPERSHIFT,L,exec, playerctl -a pause & swaylock -c 000000 & systemctl suspend" # media keys @@ -131,31 +117,38 @@ in ]; general = { - gaps_out = "3,5,5,5"; - border_size = 3; - col.active_border = "0xFFFF0000 0xFF00FF00 0xFF0000FF 45deg"; - col.inactive_border = "0x66333333"; - allow_tearing = true; + gaps_out = "3,5,5,5"; + border_size = 3; + "col.active_border" = "0xFFFF0000 0xFF00FF00 0xFF0000FF 45deg"; + "col.inactive_border" = "0x66333333"; + allow_tearing = true; }; decoration = { - rounding = 4; + rounding = 4; }; - animations = { - bezier = "penguin,0.05,0.9,0.1,1.0"; - animation = [ - "windowsMove,1,4,default" - "windows,1,7,default,popin 70%" - "windowsOut,1,7,default,popin 70%" - "border,1,10,default" - "fade,1,7,default" - "workspaces,1,6,default" - "layers,1,3,default,popin" - ]; + animations = { + bezier = "penguin,0.05,0.9,0.1,1.0"; + animation = [ + "windowsMove,1,4,default" + "windows,1,7,default,popin 70%" + "windowsOut,1,7,default,popin 70%" + "border,1,10,default" + "fade,1,7,default" + "workspaces,1,6,default" + "layers,1,3,default,popin" + ]; + }; + + dwindle = { + preserve_split = true; + pseudotile = 0; + permanent_direction_override = false; }; input = { + kb_layout = "us_int"; repeat_delay = 200; force_no_accel = true; touchpad = { @@ -166,12 +159,14 @@ in }; misc = { - vrr = 1; - animate_manual_resizes = 1; - enable_swallow = true; - disable_splash_rendering = true; - disable_hyprland_logo = true; - swallow_regex = "^(.*)(kitty)(.*)$"; + vrr = 1; + animate_manual_resizes = 1; + enable_swallow = true; + disable_splash_rendering = true; + disable_hyprland_logo = true; + swallow_regex = "^(.*)(kitty)(.*)$"; + # conversion seems to be borked right now, i want a smooth bibata :( + enable_hyprcursor = false; }; env = [ @@ -185,16 +180,14 @@ in "XCURSOR_THEME,Bibata-Modern-Classic" "XCURSOR_SIZE,24" "QT_QPA_PLATFORM,wayland" + "QT_QPA_PLATFORMTHEME = \"qt5ct\"" "QT_WAYLAND_FORCE_DPI,96" "QT_AUTO_SCREEN_SCALE_FACTOR,0" "QT_WAYLAND_DISABLE_WINDOWDECORATION,1" "QT_SCALE_FACTOR,1" - "PKG_CONFIG_PATH,/usr/local/lib/pkgconfig" - "LD_LIBRARY_PATH,/usr/local/lib" "EDITOR,\"neovide --novsync --nofork\"" "WLR_DRM_NO_ATOMIC,1" "GTK_USE_PORTAL, 1" - "PATH,/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:~/.local/bin:~/.cargo/bin:$PATH" ]; monitor = [ @@ -228,7 +221,7 @@ in ]; - layerrule = [ + layerrule = [ # layer rules # mainly to disable animations within slurp and grim "noanim, selection" @@ -261,19 +254,18 @@ in exec-once = [ # environment - "systemctl --user import-environment" + "systemctl --user import-environment" "dbus-update-activation-environment --systemd --all" - "hyprctl setcursor Bibata-Modern-Classic 24" + "hyprctl setcursor Bibata-Modern-Classic 24" # other programs - "hyprpaper" - "ironbar" - "firefox" - "streamdeck -n" - "oxipaste_daemon" - "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1" - "nextcloud --background" - "oxinoti" + "hyprpaper" + "ironbar" + "firefox" + #"oxipaste_daemon" + #"/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1" + "nextcloud --background" + "$HOME/.cargo/bin/oxinoti" ]; plugin = { diff --git a/nix/programs/hyprland/default.nix b/nix/programs/hyprland/default.nix index 54c7f41..fd923e1 100644 --- a/nix/programs/hyprland/default.nix +++ b/nix/programs/hyprland/default.nix @@ -1,14 +1,13 @@ -{ - lib +{ lib , pkgs , ... }: { - imports = [ - #./anyrun.nix + imports = [ + ./anyrun.nix + ./config.nix ]; home.packages = with pkgs; [ - hyprland xorg.xprop grim slurp @@ -20,6 +19,9 @@ copyq gnome.nautilus gnome.sushi + wl-clipboard + kooha + hyprcursor + hyprpaper ]; - } diff --git a/nix/programs/kitty.nix b/nix/programs/kitty.nix index d26f777..8dff7e3 100644 --- a/nix/programs/kitty.nix +++ b/nix/programs/kitty.nix @@ -58,6 +58,5 @@ shell = "fish"; }; - theme = "Catppuccin-Mocha"; }; } diff --git a/nix/programs/media.nix b/nix/programs/media.nix index 30e2220..717beae 100644 --- a/nix/programs/media.nix +++ b/nix/programs/media.nix @@ -15,6 +15,9 @@ mpv # pdf zathura + evince + libreoffice-fresh + pdftk # spotify ncspot # video editing diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 6f8dc3d..7af7db0 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,12 +1,12 @@ { "LazyVim": { "branch": "main", "commit": "c901640167ec5b123ff8524b01518c9a370a0d31" }, "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" }, - "SchemaStore.nvim": { "branch": "main", "commit": "4ce271f0db8b5224b4d69a43a75c13f5b4dcba43" }, + "SchemaStore.nvim": { "branch": "main", "commit": "c5d5abc86910fb31b9f734cae2547322e81d3a26" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" }, - "catppuccin": { "branch": "main", "commit": "f66654d5d5190865333e8e46474c1593302c558e" }, + "catppuccin": { "branch": "main", "commit": "fc98570d85ae772e56dc42cf8d7d6a497a909bdb" }, "clangd_extensions.nvim": { "branch": "main", "commit": "2992ba8c13c2de41f91a7c7488bf1c48bcec31fe" }, - "cmake-tools.nvim": { "branch": "master", "commit": "a4cd0b3a2c8a166a54b36bc00579954426748959" }, + "cmake-tools.nvim": { "branch": "master", "commit": "8506c426d5b361dbaa7c61c0490a2589a9c555ce" }, "cmp-async-path": { "branch": "main", "commit": "9d581eec5acf812316913565c135b0d1ee2c9a71" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, @@ -17,70 +17,70 @@ "dressing.nvim": { "branch": "master", "commit": "18e5beb3845f085b6a33c24112b37988f3f93c06" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, - "git-blame.nvim": { "branch": "master", "commit": "a0282d05adbee80aaf4e2ff35b81b52940b67bed" }, - "gitsigns.nvim": { "branch": "main", "commit": "078041e9d060a386b0c9d3a8c7a7b019a35d3fb0" }, + "git-blame.nvim": { "branch": "master", "commit": "ad1d1365c9189d89797fe8d559677d5f55dc2830" }, + "gitsigns.nvim": { "branch": "main", "commit": "d96ef3bbff0bdbc3916a220f5c74a04c4db033f2" }, "headlines.nvim": { "branch": "master", "commit": "618ef1b2502c565c82254ef7d5b04402194d9ce3" }, - "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" }, + "inc-rename.nvim": { "branch": "main", "commit": "5e03e986625961d1fac296d1bf332a6510c3add6" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "instant.nvim": { "branch": "master", "commit": "294b6d08143b3db8f9db7f606829270149e1a786" }, - "lazy.nvim": { "branch": "main", "commit": "65887ea871d44822bff47504202b3643f29d614e" }, - "ltex_extra.nvim": { "branch": "master", "commit": "42dd3572cb09b52a137e91e515f2dff5eb631b1e" }, - "lualine.nvim": { "branch": "master", "commit": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67" }, + "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, + "ltex_extra.nvim": { "branch": "master", "commit": "4296c2c7aefbca721d02a011366a1de30598046c" }, + "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "9dfcf2036c223920826140f0151d929a43f9eceb" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, "mini.ai": { "branch": "main", "commit": "ee9446a17c160aba6a04ff22097389c41872c878" }, "mini.bufremove": { "branch": "main", "commit": "931a3bb514147d9e812767275c4beba6b779b1d3" }, - "mini.comment": { "branch": "main", "commit": "a4b7e46deb9ad2feb8902cc5dbf087eced112ee5" }, - "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" }, + "mini.comment": { "branch": "main", "commit": "f9f1a646fd3d9df7397aa1b9550a875fe8189eb0" }, + "mini.indentscope": { "branch": "main", "commit": "a8274b6ea2d868198d27bd91a31ed5ea3a6a5744" }, "mini.pairs": { "branch": "main", "commit": "04f58f2545ed80ac3b52dd4826e93f33e15b2af6" }, - "mini.surround": { "branch": "main", "commit": "49e0364b8c9a3258b485c5ece40bb0f3a5e94b1c" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "16d1b194376bf1fc2acd89ccb3c29ba8315bfcea" }, - "neoconf.nvim": { "branch": "main", "commit": "ef304c29977b85c99382fcba821b3f710e144a74" }, - "neodev.nvim": { "branch": "main", "commit": "6a533ed9d3435dcaa456380d833ea04da37ea2ed" }, + "mini.surround": { "branch": "main", "commit": "d035934958e2605048ee1378ce47cf799f7071d4" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "7aad1bf3f6b849cbf108e02c55ad4d701cb4d33a" }, + "neoconf.nvim": { "branch": "main", "commit": "9d61ff423ae5f179ace1823300c4873f38a7c418" }, + "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, "neoscroll.nvim": { "branch": "master", "commit": "21d52973bde32db998fc8b6590f87eb3c3c6d8e4" }, - "neotest": { "branch": "master", "commit": "e07fe8241112274aae9947b98d255763738a1d52" }, + "neotest": { "branch": "master", "commit": "f03a78cef74db5638e4312e18b767294a90de8da" }, "neotest-go": { "branch": "main", "commit": "6a2f996d89fe4631942e035b1c114544ee045043" }, "neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" }, "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, "nvim-cmp": { "branch": "main", "commit": "97dc716fc914c46577a4f254035ebef1aa72558a" }, "nvim-dap": { "branch": "master", "commit": "405df1dcc2e395ab5173a9c3d00e03942c023074" }, "nvim-dap-go": { "branch": "main", "commit": "36abe1d320cb61bfdf094d4e0fe815ef58f2302a" }, - "nvim-dap-python": { "branch": "master", "commit": "66560f0ebddf96604f7037e1efad3ba6942761e6" }, + "nvim-dap-python": { "branch": "master", "commit": "3dffa58541d1f52c121fe58ced046268c838d802" }, "nvim-dap-ui": { "branch": "master", "commit": "edfa93f60b189e5952c016eee262d0685d838450" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "baa5b0dc6663284cce32e0d00ac1f2511b13496f" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "3e8e207513e6ef520894950acd76b79902714103" }, "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" }, - "nvim-lint": { "branch": "master", "commit": "2669aabb8362fdc36aced5ba864b7135636ea863" }, + "nvim-lint": { "branch": "master", "commit": "4055dc856d5ac8f6b85748006fd8fa6457e086e8" }, "nvim-lspconfig": { "branch": "master", "commit": "6e5c78ebc9936ca74add66bda22c566f951b6ee5" }, - "nvim-nio": { "branch": "master", "commit": "33c62b3eadd8154169e42144de16ba4db6784bec" }, + "nvim-nio": { "branch": "master", "commit": "5800f585def265d52f1d8848133217c800bcb25d" }, "nvim-spectre": { "branch": "master", "commit": "2b012554a2536465243c0dff3605b5927c49ed23" }, - "nvim-treesitter": { "branch": "master", "commit": "23ba63028c6acca29be6462c0a291fc4a1b9eae8" }, - "nvim-treesitter-context": { "branch": "master", "commit": "f19766163c18515fb4d3c12d572bf9cba6cdb990" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" }, + "nvim-treesitter": { "branch": "master", "commit": "d2f4c7830377d6d036e9621ae696dbd28f089897" }, + "nvim-treesitter-context": { "branch": "master", "commit": "ba05c6b753130d96b284d3e8ba8f54c28c0fb6d1" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "6e9bb569a510bdfab6095c217a2f714af7a3d116" }, "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "734ebad31c81c6198dfe102aa23280937c937c42" }, - "nvim-web-devicons": { "branch": "master", "commit": "3ee60deaa539360518eaab93a6c701fe9f4d82ef" }, - "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "d55fba19777f7c437215253cad99f18a8f06edd2" }, + "nvim-web-devicons": { "branch": "master", "commit": "6e355632387a085f15a66ad68cf681c1d7374a04" }, + "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "6e0aa6465f8fa8ac6c833f6ac4713adfee0202a0" }, "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" }, "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, - "rustaceanvim": { "branch": "master", "commit": "b1433cb70569b888d26a26232da93fdbc76cb4a8" }, + "rustaceanvim": { "branch": "master", "commit": "701fd234b5f80b56ff827b6394d8773d931cc324" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "5ee5002373655fd684a4ad0d47a3de876ceacf9a" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "b22e6f6896cd64b109bd0807a24098d225d5fb49" }, + "telescope.nvim": { "branch": "master", "commit": "4d4ade7f2b8f403e8816ca50c05ed16e259b21fb" }, "test_plugin": { "branch": "main", "commit": "c6100b07b2f7925e5bb639c6b42427f9aa362add" }, "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, - "tokyonight.nvim": { "branch": "main", "commit": "71597b108aea89362fc99d7a5e78bba2f9870bf6" }, - "trouble.nvim": { "branch": "main", "commit": "2ac8b847a6d918b30b90095d89a53500d9e2cd5e" }, - "typst.vim": { "branch": "main", "commit": "86e4fa8dcddd032f9fdbf04602417a8baac8fed3" }, + "tokyonight.nvim": { "branch": "main", "commit": "9bf9ec53d5e87b025e2404069b71e7ebdc3a13e5" }, + "trouble.nvim": { "branch": "main", "commit": "b9cf677f20bb2faa2dacfa870b084e568dca9572" }, + "typst.vim": { "branch": "main", "commit": "7f64019341defe894ea3ec2f5d3b4279a245a450" }, "venv-selector.nvim": { "branch": "main", "commit": "3c57922256e7e26205a25f5a42ecf7104d9f2c78" }, "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" }, - "vim-visual-multi": { "branch": "master", "commit": "fe1ec7e430013b83c8c2dee85ae496251b71e253" }, - "vimtex": { "branch": "master", "commit": "3275a1778ae93cc88318a849759d689fe7143eb8" }, + "vim-visual-multi": { "branch": "master", "commit": "e2ff111f123da6cf97f95b96b10eb95854f953c9" }, + "vimtex": { "branch": "master", "commit": "ac0a41b297a70c101df89bc9c8d43341ba00fd4f" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }, "yazi.nvim": { "branch": "master", "commit": "b5c9390c733244b10859b940413ef9741955301a" } } \ No newline at end of file diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua index 7fadc1a..136ed63 100644 --- a/nvim/lua/config/options.lua +++ b/nvim/lua/config/options.lua @@ -7,7 +7,7 @@ local options = { showmode = true, termguicolors = true, spelllang = "en_us", - shell = "/usr/bin/fish", + shell = "fish", relativenumber = false, scrolloff = 5, scrolljump = 5, diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua index c81b769..225c62e 100644 --- a/nvim/lua/plugins/lsp.lua +++ b/nvim/lua/plugins/lsp.lua @@ -30,13 +30,23 @@ return { }, bashls = {}, ansiblels = {}, - asm_lsp = {}, + -- asm_lsp = {}, typst_lsp = { settings = { experimentalFormatterMode = "on", exportPdf = "onSave", }, }, + nil_ls = { + settings ={ + ['nil'] = { + formatting = { + command = {"nixpkgs-fmt"} + }, + }, + }, + mason = false, + }, ltex = { settings = { ltex = { @@ -62,16 +72,17 @@ return { opencl_ls = {}, yamlls = {}, lua_ls = { - settings = { - Lua = { - workspace = { - checkThirdParty = false, - }, - completion = { - callSnippet = "Replace", - }, - }, - }, + mason = false + -- { + -- Lua = { + -- workspace = { + -- checkThirdParty = false, + -- }, + -- completion = { + -- callSnippet = "Replace", + -- }, + -- }, + -- }, }, }, }, @@ -101,6 +112,7 @@ return { }, formatters_by_ft = { typst = { "typstfmt" }, + nix = { "nixpkgs-fmt" }, }, }, }, diff --git a/oxipaste/style.css b/oxipaste/style.css new file mode 100644 index 0000000..d079a05 --- /dev/null +++ b/oxipaste/style.css @@ -0,0 +1,24 @@ +.main-window { + padding: 10px; + border-radius: 10px; + border: 2px solid #2AC3DE; +} + +.item-window { + padding: 10px; + border-radius: 10px; + border: 2px solid #C0CAF5; +} + +.item-button { + background-color: #1A1B26; + border-radius: 5px; + border: 1px solid #6D728D; +} + +.delete-button { + margin: 5px 25px 5px 5px; +} + +.item-box { +} diff --git a/qt5ct/qt5ct.conf b/qt5ct/qt5ct.conf index a6f5cf9..13b7cf9 100644 --- a/qt5ct/qt5ct.conf +++ b/qt5ct/qt5ct.conf @@ -31,7 +31,7 @@ geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\n\0\0\0\0\0\0\0\fv\0\0\x2\x10\0 geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\xf2\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\xf2\0\0\0\x2\x2\0\0\0\n\0\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\xf2) [SettingsWindow] -geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3U\0\0\x5y\0\0\0\0\0\0\0\0\0\0\x3K\0\0\x5\x61\0\0\0\0\x2\0\0\0\rp\0\0\0\0\0\0\0\0\0\0\x3U\0\0\x5y) +geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\n\0\0\0\0\0\0\0\rK\0\0\x2\xaf\0\0\n\0\0\0\0\0\0\0\r[\0\0\x2\xbf\0\0\0\0\x2\0\0\0\rp\0\0\n\0\0\0\0\0\0\0\rK\0\0\x2\xaf) [Troubleshooting] force_raster_widgets=1 diff --git a/setup.sh b/setup.sh index 34fdb12..0be4adc 100755 --- a/setup.sh +++ b/setup.sh @@ -9,38 +9,6 @@ gsettings set org.gnome.desktop.interface cursor-theme 'Bibata-Modern-Classic' gsettings set org.gnome.desktop.interface cursor-size 24 cargo install oxinoti -sudo cp ~/.carbo/bin/oxinoti /usr/bin/. cargo install oxidash -sudo cp ~/.carbo/bin/oxidash /usr/bin/. cargo install oxishut -sudo cp ~/.carbo/bin/oxishut /usr/bin/. cargo install hyprdock -sudo cp ~/.carbo/bin/hyprdock /usr/bin/. -cargo install ironbar -sudo cp ~/.carbo/bin/ironbar /usr/bin/. -cargo install reset -sudo cp ~/.carbo/bin/reset /usr/bin/. -cargo install rm-improved -sudo cp ~/.carbo/bin/rip /usr/bin/. -cargo install typstfmt -sudo cp ~/.carbo/bin/typstfmt /usr/bin/. -cargo install satty -sudo cp ~/.carbo/bin/satty /usr/bin/. - -flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo - -git clone https://github.com/Kirottu/anyrun.git -cd anyrun -cargo build --release -cargo install --path anyrun/ -mkdir -p ~/.config/anyrun/plugins -cp target/release/*.so ~/.config/anyrun/plugins -cp examples/config.ron ~/.config/anyrun/config.ron -sudo cp ~/.carbo/bin/anyrun /usr/bin/. - -curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher -fisher install IlanCosman/tide@v5 - -sudo systemctl enable greetd - -reboot diff --git a/tokyonight-vimium b/tokyonight-vimium deleted file mode 100644 index 71f092e..0000000 --- a/tokyonight-vimium +++ /dev/null @@ -1,164 +0,0 @@ -/* -Dracula theme for Vimium -by Trollwut (trollwut@trollwut.org). This code is in the public domain. -changed to tokyonight -To use: - 1. Copy the code. - 2. Go to the Vimium options. - 3. Click Show Advanced Options. - 4. Under Advanced Options, scroll down to CSS for link hints. - 5. Paste the code in the text field. - 6. Click Save Changes. - 7. Go to the website of your choice (or, if you have it open already, reload it) and check out the results. -*/ - -/* Link hint boxes */ -div > .vimiumHintMarker { - background: #1A1B26; - font-size: 12px; - border: 0.25em solid #ffb86c; - border-radius: 0.34em; - box-shadow: 0em 0.1em 0.6em 0.1em rgba(0, 0, 0, 0.4); -} - -/* Link hint text */ -div > .vimiumHintMarker span { - color: #f8f8f2; - font-size: inherit; - text-shadow: none; -} - -/* Link hint matching characters */ -div > .vimiumHintMarker > .matchingCharacter { - color: #2F3240; -} - -/* HUD ("heads-up display") bar */ -div.vimiumHUD { - background: #1A1B26; - border: 1px solid #2F3240; -} - -div.vimiumHUD .vimiumHUDSearchArea { - background: #1A1B26; -} - -div.vimiumHUD .hud-find { - background: #1A1B26; - border: none; - color: #f8f8f2; -} - -div.vimiumHUD span#hud-find-input{ - color: #f8f8f2; /* 'Foreground' color */ -} - -div.vimiumHUD span#hud-match-count { - color: #2F3240; /* 'Comment' color */ -} - -div.vimiumHUD .vimiumHUDSearchAreaInner { - color: #2F3240; /* 'Comment' color */ -} - -#vomnibar{ - background-color: #1A1B26; -} - -#vomnibar input { - color: #f8f8f2; - font: -moz-window; - /*font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;*/ - font-size: 20px; - height: 34px; - margin-bottom: 0; - padding: 4px; - background-color: #1A1B26; - border-radius: 3px; - border: 1px solid #1A1B26; - /* box-shadow: #bd93f9 0px 0px 1px; */ - width: 100%; - outline: none; - box-sizing: border-box; -} - -#vomnibar .vomnibarSearchArea { - display: block; - padding: 10px; - background-color: #2F3240; - border-radius: 4px 4px 0 0; - border-bottom: 0px solid #bd93f9; -} - -#vomnibar ul { - background-color: #1A1B26; - border-radius: 0 0 4px 4px; - list-style: none; - padding-top: 0; - padding-bottom: 0; - margin-block-start: 2px; - margin-block-end: 0px; -} - -#vomnibar li { - border-bottom: 1px solid #2F3240; - line-height: 1.1em; - padding: 7px 10px; - font-size: 16px; - color: #f8f8f2; - position: relative; - display: list-item; - margin: auto; -} - -#vomnibar li .vomnibarBottomHalf { - font-size: 15px; - margin-top: 3px; - padding: 2px 0; -} - -#vomnibar li .vomnibarSource { - color: #bd93f9; - margin-right: 4px; -} -#vomnibar li .vomnibarRelevancy { - position: absolute; - right: 0; - top: 0; - padding: 5px; - background-color: #1A1B26; - color: #f8f8f2; - font-family: monospace; - width: 100px; - overflow: hidden; -} - -#vomnibar li .vomnibarUrl { - white-space: nowrap; - color: #50fa7b; -} - -#vomnibar li .vomnibarMatch { - font-weight: bold; - color: #ffb86c; -} - -#vomnibar li em, #vomnibar li .vomnibarTitle { - color: #f8f8f2; - margin-left: 4px; - font-weight: normal; -} -#vomnibar li em { font-style: italic; } -#vomnibar li em .vomnibarMatch, #vomnibar li .vomnibarTitle .vomnibarMatch { - color: #ffb86c; -} - -#vomnibar li.vomnibarSelected { - background-color: #2F3240; - font-weight: normal; -} - -#vomnibarInput::selection { - background-color: #8be9fd; -} - diff --git a/xdg-desktop-portal/portals.conf b/xdg-desktop-portal/portals.conf deleted file mode 100644 index b0ce21b..0000000 --- a/xdg-desktop-portal/portals.conf +++ /dev/null @@ -1,2 +0,0 @@ -[preferred] -default=hyprland;gtk