From 7af2a5e1315481d663300bd87220833649be06d3 Mon Sep 17 00:00:00 2001 From: Mira Kristipati Date: Sun, 14 Apr 2024 20:34:40 -0400 Subject: [PATCH] updates --- .gitmodules | 5 +- executable_dot_aliasrc | 7 +- executable_dot_profile | 95 -- executable_dot_zshrc | 14 +- private_dot_config/alacritty/alacritty.toml | 5 +- private_dot_config/dunst/dunstrc | 4 +- private_dot_config/external_i3blocks | 1 + private_dot_config/external_nvim | 2 +- private_dot_config/git/executable_config.tmpl | 4 + private_dot_config/i3/config | 1 - private_dot_config/i3/theme | 4 +- private_dot_config/nushell/config.nu | 845 ++++++++++++++++++ private_dot_config/nushell/env.nu | 56 ++ private_dot_config/nushell/history.txt | 261 ++++++ private_dot_config/nushell/scripts/direnv.nu | 17 + .../nushell/scripts/starship.nu | 38 + private_dot_config/nushell/scripts/yazi.nu | 9 + private_dot_config/nushell/scripts/zoxide.nu | 60 ++ private_dot_config/sheldon/plugins.toml | 5 - private_dot_config/starship.toml | 56 +- private_dot_config/sway/i3blocks.conf | 2 +- private_dot_config/swhkd/swhkdrc | 14 +- 22 files changed, 1363 insertions(+), 142 deletions(-) delete mode 100644 executable_dot_profile create mode 160000 private_dot_config/external_i3blocks create mode 100644 private_dot_config/nushell/config.nu create mode 100644 private_dot_config/nushell/env.nu create mode 100644 private_dot_config/nushell/history.txt create mode 100644 private_dot_config/nushell/scripts/direnv.nu create mode 100644 private_dot_config/nushell/scripts/starship.nu create mode 100644 private_dot_config/nushell/scripts/yazi.nu create mode 100644 private_dot_config/nushell/scripts/zoxide.nu diff --git a/.gitmodules b/.gitmodules index 04ac861..d43b906 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,10 @@ url = https://gitea.argentumcation.com/mira/nvim-config [submodule "private_dot_config/external_nvim"] path = private_dot_config/external_nvim - url = https://gitea.argentumcation.com/mira/nvim-config + url = ssh://git@ssh.argentumcation.com:2552/mira/nvim-config.git [submodule "private_dot_config/sway/external_blocks"] path = private_dot_config/sway/external_blocks url = https://github.com/vivien/i3blocks-contrib +[submodule "private_dot_config/external_i3blocks"] + path = private_dot_config/external_i3blocks + url = https://github.com/vivien/i3blocks-contrib diff --git a/executable_dot_aliasrc b/executable_dot_aliasrc index 585febb..2d2ec84 100644 --- a/executable_dot_aliasrc +++ b/executable_dot_aliasrc @@ -18,7 +18,7 @@ load_aliases() { fi checkCommand() { - $CHECK "$1" >/dev/null 2>&1 + "$CHECK" "$1" >/dev/null 2>&1 } # make a directory and cd to it @@ -105,6 +105,7 @@ load_aliases() { if checkCommand nvim; then alias vim="nvim" fi + # Replace ls with lsd, and other useful aliases if checkCommand lsd; then alias l="lsd -l" @@ -131,7 +132,11 @@ load_aliases() { # fi # } fi + if checkCommand swhkd; then + alias reload-swhkd="sudo pkill -HUP swhkd" + fi + alias icat="kitty +kitten icat" } load_aliases unset -f load_aliases diff --git a/executable_dot_profile b/executable_dot_profile deleted file mode 100644 index bb5013d..0000000 --- a/executable_dot_profile +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env sh -# ~/.profile: executed by the command interpreter for login shells. -# This file is not read by bash(1), if ~/.bash_profile or ~/.bash_login -# exists. -# see /usr/share/doc/bash/examples/startup-files for examples. -# the files are located in the bash-doc package. - -# the default umask is set in /etc/profile; for setting the umask -# for ssh logins, install and configure the libpam-umask package. -#umask 022 - -################# -# XDG Base Dirs # -################# - -export XDG_DATA_HOME="$HOME/.local/share" -export XDG_CONFIG_HOME="$HOME/.config" -export XDG_STATE_HOME="$HOME/.local/state" -export XDG_CACHE_HOME="$HOME/.cache" - -################# -# XDG User Dirs # -################# -source "$XDG_CONFIG_HOME/user-dirs.dirs" - -######################## -# Default file viewers # -######################## - -export EDITOR=nvim -export PAGER=less -export OPENER=xdg-open - -####### -# IME # -####### - -GTK_IM_MODULE=fcitx -QT_IM_MODULE=fcitx -XMODIFIERS=@im=fcitx - - -################################ -# pls use the goddamn xdg dirs # -################################ -export GOPATH="$XDG_DATA_HOME"/go -export GNUPGHOME="$XDG_DATA_HOME/gnupg" -# If you use non-default GnuPG Home directory, you will need to edit all -# socket files to use the values of gpgconf --list-dirs. -# If you set your SSH_AUTH_SOCK manually, keep in mind that your socket -# location may be different if you are using a custom GNUPGHOME - -export PNPM_HOME="$XDG_DATA_HOME/pnpm" -export NPM_CONFIG_PREFIX="$XDG_DATA_HOME/npm-global" -alias wget=wget --hsts-file="$XDG_DATA_HOME/wget-hsts" -export CARGO_HOME="$XDG_DATA_HOME/cargo" -export CARGO_INSTALL_ROOT="$HOME/.local" -export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc -export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc" -export LESSHISTFILE="$XDG_STATE_HOME/less/history" -export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc -export PARALLEL_HOME="$XDG_CONFIG_HOME"/parallel -export RUSTUP_HOME="$XDG_DATA_HOME"/rustup -export WINEPREFIX="$XDG_DATA_HOME"/wine -export XCURSOR_PATH=/usr/share/icons:$XDG_DATA_HOME/icons - -############### -# SET UP PATH # -############### -# nix -if [ -e "$HOME"/.nix-profile/etc/profile.d/nix.sh ]; then - . "$HOME"/.nix-profile/etc/profile.d/nix.sh -fi - -# User bin folder -[ "${PATH#*"$HOME"/.local/bin:}" = "$PATH" ] && export PATH="$HOME/.local/bin:$PATH" - -# go -[ "${PATH#*"$HOME"/go/bin:}" = "$PATH" ] && export PATH="$HOME/go/bin:$PATH" - -# homebrew -[ -e /home/linuxbrew/.linuxbrew/bin/brew ] && eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv) - -# pnpm -[ "${PATH#*$PNPM_HOME:}" = "$PATH" ] && export PATH="$PNPM_HOME:$PATH" - -# npm -[ "${PATH#*$NPM_CONFIG_PREFIX/bin:}" = "$PATH" ] && export PATH="$NPM_CONFIG_PREFIX/bin:$PATH" - -# cargo -if [[ -f "$CARGO_HOME/env" ]]; then - . "$CARGO_HOME/env" -elif [[ -f ~/.local/share/cargo/env ]]; then - . ~/.local/share/cargo/env -fi diff --git a/executable_dot_zshrc b/executable_dot_zshrc index ef1ad82..52a2d51 100644 --- a/executable_dot_zshrc +++ b/executable_dot_zshrc @@ -178,7 +178,9 @@ fi if checkCommand zoxide; then eval "$(zoxide init zsh)" fi - +if checkCommand direnv; then + eval "$(direnv hook zsh)" +fi #if "$(checkCommand notify-send)"; then # notify-send() { wsl-notify-send.exe --category $WSL_DISTRO_NAME "${@}"; } #fi @@ -202,3 +204,13 @@ unset START unset END + +[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm +[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion + +# bun completions +[ -s "/home/akristip/.bun/_bun" ] && source "/home/akristip/.bun/_bun" +# bun +export BUN_INSTALL="$HOME/.bun" +export PATH="$BUN_INSTALL/bin:$PATH" + diff --git a/private_dot_config/alacritty/alacritty.toml b/private_dot_config/alacritty/alacritty.toml index 040f0ec..4500d2d 100644 --- a/private_dot_config/alacritty/alacritty.toml +++ b/private_dot_config/alacritty/alacritty.toml @@ -33,10 +33,11 @@ dim_foreground = "#BFBFC0" foreground = "#EBF6FF" [font] -size = 9.0 +size = 10.0 [font.normal] -family = "MonaspiceNe NF" +# family = "MonaspiceNe NF" +family = "Berkeley Mono" style = "Regular" [window] diff --git a/private_dot_config/dunst/dunstrc b/private_dot_config/dunst/dunstrc index cd53a63..e2fd11a 100644 --- a/private_dot_config/dunst/dunstrc +++ b/private_dot_config/dunst/dunstrc @@ -27,7 +27,7 @@ width = 300 # The maximum height of a single notification, excluding the frame. - height = 100 + height = 300 # Position the notification in the top right corner origin = top-right @@ -123,7 +123,7 @@ ### Text ### - font = Atkinson Hyperlegible 10, Noto Color Emoji 8, FontAwesome 8 + font = Atkinson Hyperlegible, FontAwesome 10 # The spacing between lines. If the height is smaller than the # font height, it will get raised to the font height. diff --git a/private_dot_config/external_i3blocks b/private_dot_config/external_i3blocks new file mode 160000 index 0000000..9d66d81 --- /dev/null +++ b/private_dot_config/external_i3blocks @@ -0,0 +1 @@ +Subproject commit 9d66d81da8d521941a349da26457f4965fd6fcbd diff --git a/private_dot_config/external_nvim b/private_dot_config/external_nvim index 7e08168..12ba675 160000 --- a/private_dot_config/external_nvim +++ b/private_dot_config/external_nvim @@ -1 +1 @@ -Subproject commit 7e08168f9ad47243794582d309db7bd9c8f96341 +Subproject commit 12ba675a2c1565339bda1422a76fd4c0ad1b3ef4 diff --git a/private_dot_config/git/executable_config.tmpl b/private_dot_config/git/executable_config.tmpl index d14b058..5b53c08 100644 --- a/private_dot_config/git/executable_config.tmpl +++ b/private_dot_config/git/executable_config.tmpl @@ -61,3 +61,7 @@ enabled = true [push] autoSetupRemote = true + +[alias] +lg = log --graph --branches --oneline +st = status diff --git a/private_dot_config/i3/config b/private_dot_config/i3/config index 68d401f..c04e249 100644 --- a/private_dot_config/i3/config +++ b/private_dot_config/i3/config @@ -61,6 +61,5 @@ default_border normal 1 tiling_drag titlebar gaps inner 5 -exec ~/.screenlayout/work-monitors.sh; xrandr --auto exec nm-applet include "theme" diff --git a/private_dot_config/i3/theme b/private_dot_config/i3/theme index bdac7a4..d2bfe62 100644 --- a/private_dot_config/i3/theme +++ b/private_dot_config/i3/theme @@ -11,11 +11,11 @@ client.urgent $urgent $urgent $fg $bg $bg client.placeholder $bg $bg $fg $bg $bg client.background $bg -font pango:Atkinson Hyperlegible bold 9 +font pango:Monocraft Nerd Font, Atkinson Hyperlegible bold 9 bar { status_command i3blocks -c ~/.config/sway/i3blocks.conf - font pango:MonaspiceNe NF, CommitMono Nerd Font, FontAwesome 9 + font pango:Monocraft Nerd Font, Symbols Nerd Font, FontAwesome 10 #mode hide colors { background $inactive diff --git a/private_dot_config/nushell/config.nu b/private_dot_config/nushell/config.nu new file mode 100644 index 0000000..ad3a3dd --- /dev/null +++ b/private_dot_config/nushell/config.nu @@ -0,0 +1,845 @@ +# Nushell Config File +# +# version = "0.91.0" + +# For more information on defining custom themes, see +# https://www.nushell.sh/book/coloring_and_theming.html +# And here is the theme collection +# https://github.com/nushell/nu_scripts/tree/main/themes +let dark_theme = { + # color for nushell primitives + separator: white + leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off + header: green_bold + empty: blue + # Closures can be used to choose colors for specific values. + # The value (in this case, a bool) is piped into the closure. + # eg) {|| if $in { 'light_cyan' } else { 'light_gray' } } + bool: light_cyan + int: white + filesize: cyan + duration: white + date: purple + range: white + float: white + string: white + nothing: white + binary: white + cell-path: white + row_index: green_bold + record: white + list: white + block: white + hints: dark_gray + search_result: { bg: red fg: white } + shape_and: purple_bold + shape_binary: purple_bold + shape_block: blue_bold + shape_bool: light_cyan + shape_closure: green_bold + shape_custom: green + shape_datetime: cyan_bold + shape_directory: cyan + shape_external: cyan + shape_externalarg: green_bold + shape_external_resolved: light_yellow_bold + shape_filepath: cyan + shape_flag: blue_bold + shape_float: purple_bold + # shapes are used to change the cli syntax highlighting + shape_garbage: { fg: white bg: red attr: b} + shape_globpattern: cyan_bold + shape_int: purple_bold + shape_internalcall: cyan_bold + shape_keyword: cyan_bold + shape_list: cyan_bold + shape_literal: blue + shape_match_pattern: green + shape_matching_brackets: { attr: u } + shape_nothing: light_cyan + shape_operator: yellow + shape_or: purple_bold + shape_pipe: purple_bold + shape_range: yellow_bold + shape_record: cyan_bold + shape_redirection: purple_bold + shape_signature: green_bold + shape_string: green + shape_string_interpolation: cyan_bold + shape_table: blue_bold + shape_variable: purple + shape_vardecl: purple +} + +let light_theme = { + # color for nushell primitives + separator: dark_gray + leading_trailing_space_bg: { attr: n } # no fg, no bg, attr none effectively turns this off + header: green_bold + empty: blue + # Closures can be used to choose colors for specific values. + # The value (in this case, a bool) is piped into the closure. + # eg) {|| if $in { 'dark_cyan' } else { 'dark_gray' } } + bool: dark_cyan + int: dark_gray + filesize: cyan_bold + duration: dark_gray + date: purple + range: dark_gray + float: dark_gray + string: dark_gray + nothing: dark_gray + binary: dark_gray + cell-path: dark_gray + row_index: green_bold + record: dark_gray + list: dark_gray + block: dark_gray + hints: dark_gray + search_result: { fg: white bg: red } + shape_and: purple_bold + shape_binary: purple_bold + shape_block: blue_bold + shape_bool: light_cyan + shape_closure: green_bold + shape_custom: green + shape_datetime: cyan_bold + shape_directory: cyan + shape_external: cyan + shape_externalarg: green_bold + shape_external_resolved: light_purple_bold + shape_filepath: cyan + shape_flag: blue_bold + shape_float: purple_bold + # shapes are used to change the cli syntax highlighting + shape_garbage: { fg: white bg: red attr: b} + shape_globpattern: cyan_bold + shape_int: purple_bold + shape_internalcall: cyan_bold + shape_keyword: cyan_bold + shape_list: cyan_bold + shape_literal: blue + shape_match_pattern: green + shape_matching_brackets: { attr: u } + shape_nothing: light_cyan + shape_operator: yellow + shape_or: purple_bold + shape_pipe: purple_bold + shape_range: yellow_bold + shape_record: cyan_bold + shape_redirection: purple_bold + shape_signature: green_bold + shape_string: green + shape_string_interpolation: cyan_bold + shape_table: blue_bold + shape_variable: purple + shape_vardecl: purple +} + +# External completer example +# let carapace_completer = {|spans| +# carapace $spans.0 nushell ...$spans | from json +# } + +# The default config record. This is where much of your global configuration is setup. +$env.config = { + show_banner: false # true or false to enable or disable the welcome banner at startup + + ls: { + use_ls_colors: true # use the LS_COLORS environment variable to colorize output + clickable_links: true # enable or disable clickable links. Your terminal has to support links. + } + + rm: { + always_trash: false # always act as if -t was given. Can be overridden with -p + } + + table: { + mode: rounded # basic, compact, compact_double, light, thin, with_love, rounded, reinforced, heavy, none, other + index_mode: always # "always" show indexes, "never" show indexes, "auto" = show indexes when a table has "index" column + show_empty: true # show 'empty list' and 'empty record' placeholders for command output + padding: { left: 1, right: 1 } # a left right padding of each column in a table + trim: { + methodology: wrapping # wrapping or truncating + wrapping_try_keep_words: true # A strategy used by the 'wrapping' methodology + truncating_suffix: "..." # A suffix used by the 'truncating' methodology + } + header_on_separator: false # show header text on separator/border line + # abbreviated_row_count: 10 # limit data rows from top and bottom after reaching a set point + } + + error_style: "fancy" # "fancy" or "plain" for screen reader-friendly error messages + + # datetime_format determines what a datetime rendered in the shell would look like. + # Behavior without this configuration point will be to "humanize" the datetime display, + # showing something like "a day ago." + datetime_format: { + # normal: '%a, %d %b %Y %H:%M:%S %z' # shows up in displays of variables or other datetime's outside of tables + # table: '%m/%d/%y %I:%M:%S%p' # generally shows up in tabular outputs such as ls. commenting this out will change it to the default human readable datetime format + } + + explore: { + status_bar_background: { fg: "#1D1F21", bg: "#C4C9C6" }, + command_bar_text: { fg: "#C4C9C6" }, + highlight: { fg: "black", bg: "yellow" }, + status: { + error: { fg: "white", bg: "red" }, + warn: {} + info: {} + }, + table: { + split_line: { fg: "#404040" }, + selected_cell: { bg: light_blue }, + selected_row: {}, + selected_column: {}, + }, + } + + history: { + max_size: 100_000 # Session has to be reloaded for this to take effect + sync_on_enter: true # Enable to share history between multiple sessions, else you have to close the session to write history to file + file_format: "plaintext" # "sqlite" or "plaintext" + isolation: false # only available with sqlite file_format. true enables history isolation, false disables it. true will allow the history to be isolated to the current session using up/down arrows. false will allow the history to be shared across all sessions. + } + + completions: { + case_sensitive: false # set to true to enable case-sensitive completions + quick: true # set this to false to prevent auto-selecting completions when only one remains + partial: true # set this to false to prevent partial filling of the prompt + algorithm: "prefix" # prefix or fuzzy + external: { + enable: true # set to false to prevent nushell looking into $env.PATH to find more suggestions, `false` recommended for WSL users as this look up may be very slow + max_results: 100 # setting it lower can improve completion performance at the cost of omitting some options + completer: null # check 'carapace_completer' above as an example + } + use_ls_colors: true # set this to true to enable file/path/directory completions using LS_COLORS + } + + filesize: { + metric: false # true => KB, MB, GB (ISO standard), false => KiB, MiB, GiB (Windows standard) + format: "auto" # b, kb, kib, mb, mib, gb, gib, tb, tib, pb, pib, eb, eib, auto + } + + cursor_shape: { + emacs: line # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (line is the default) + vi_insert: block # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (block is the default) + vi_normal: underscore # block, underscore, line, blink_block, blink_underscore, blink_line, inherit to skip setting cursor shape (underscore is the default) + } + + color_config: $dark_theme # if you want a more interesting theme, you can replace the empty record with `$dark_theme`, `$light_theme` or another custom record + use_grid_icons: true + footer_mode: "25" # always, never, number_of_rows, auto + float_precision: 2 # the precision for displaying floats in tables + buffer_editor: "" # command that will be used to edit the current line buffer with ctrl+o, if unset fallback to $env.EDITOR and $env.VISUAL + use_ansi_coloring: true + bracketed_paste: true # enable bracketed paste, currently useless on windows + edit_mode: emacs # emacs, vi + shell_integration: false # enables terminal shell integration. Off by default, as some terminals have issues with this. + render_right_prompt_on_last_line: false # true or false to enable or disable right prompt to be rendered on last line of the prompt. + use_kitty_protocol: false # enables keyboard enhancement protocol implemented by kitty console, only if your terminal support this. + highlight_resolved_externals: false # true enables highlighting of external commands in the repl resolved by which. + + plugins: {} # Per-plugin configuration. See https://www.nushell.sh/contributor-book/plugins.html#configuration. + + hooks: { + pre_prompt: [{ null }] # run before the prompt is shown + pre_execution: [{ null }] # run before the repl input is run + env_change: { + PWD: [{|before, after| null }] # run if the PWD environment is different since the last repl input + } + display_output: "if (term size).columns >= 100 { table -e } else { table }" # run to display the output of a pipeline + command_not_found: { null } # return an error message when a command is not found + } + + menus: [ + # Configuration for default nushell menus + # Note the lack of source parameter + { + name: completion_menu + only_buffer_difference: false + marker: "| " + type: { + layout: columnar + columns: 4 + col_width: 20 # Optional value. If missing all the screen width is used to calculate column width + col_padding: 2 + } + style: { + text: green + selected_text: { attr: r } + description_text: yellow + match_text: { attr: u } + selected_match_text: { attr: ur } + } + } + { + name: ide_completion_menu + only_buffer_difference: false + marker: "| " + type: { + layout: ide + min_completion_width: 0, + max_completion_width: 50, + max_completion_height: 10, # will be limited by the available lines in the terminal + padding: 0, + border: true, + cursor_offset: 0, + description_mode: "prefer_right" + min_description_width: 0 + max_description_width: 50 + max_description_height: 10 + description_offset: 1 + # If true, the cursor pos will be corrected, so the suggestions match up with the typed text + # + # C:\> str + # str join + # str trim + # str split + correct_cursor_pos: false + } + style: { + text: green + selected_text: { attr: r } + description_text: yellow + match_text: { attr: u } + selected_match_text: { attr: ur } + } + } + { + name: history_menu + only_buffer_difference: true + marker: "? " + type: { + layout: list + page_size: 10 + } + style: { + text: green + selected_text: green_reverse + description_text: yellow + } + } + { + name: help_menu + only_buffer_difference: true + marker: "? " + type: { + layout: description + columns: 4 + col_width: 20 # Optional value. If missing all the screen width is used to calculate column width + col_padding: 2 + selection_rows: 4 + description_rows: 10 + } + style: { + text: green + selected_text: green_reverse + description_text: yellow + } + } + ] + + keybindings: [ + { + name: completion_menu + modifier: none + keycode: tab + mode: [emacs vi_normal vi_insert] + event: { + until: [ + { send: menu name: completion_menu } + { send: menunext } + { edit: complete } + ] + } + } + { + name: ide_completion_menu + modifier: control + keycode: char_n + mode: [emacs vi_normal vi_insert] + event: { + until: [ + { send: menu name: ide_completion_menu } + { send: menunext } + { edit: complete } + ] + } + } + { + name: history_menu + modifier: control + keycode: char_r + mode: [emacs, vi_insert, vi_normal] + event: { send: menu name: history_menu } + } + { + name: help_menu + modifier: none + keycode: f1 + mode: [emacs, vi_insert, vi_normal] + event: { send: menu name: help_menu } + } + { + name: completion_previous_menu + modifier: shift + keycode: backtab + mode: [emacs, vi_normal, vi_insert] + event: { send: menuprevious } + } + { + name: next_page_menu + modifier: control + keycode: char_x + mode: emacs + event: { send: menupagenext } + } + { + name: undo_or_previous_page_menu + modifier: control + keycode: char_z + mode: emacs + event: { + until: [ + { send: menupageprevious } + { edit: undo } + ] + } + } + { + name: escape + modifier: none + keycode: escape + mode: [emacs, vi_normal, vi_insert] + event: { send: esc } # NOTE: does not appear to work + } + { + name: cancel_command + modifier: control + keycode: char_c + mode: [emacs, vi_normal, vi_insert] + event: { send: ctrlc } + } + { + name: quit_shell + modifier: control + keycode: char_d + mode: [emacs, vi_normal, vi_insert] + event: { send: ctrld } + } + { + name: clear_screen + modifier: control + keycode: char_l + mode: [emacs, vi_normal, vi_insert] + event: { send: clearscreen } + } + { + name: search_history + modifier: control + keycode: char_q + mode: [emacs, vi_normal, vi_insert] + event: { send: searchhistory } + } + { + name: open_command_editor + modifier: control + keycode: char_o + mode: [emacs, vi_normal, vi_insert] + event: { send: openeditor } + } + { + name: move_up + modifier: none + keycode: up + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: menuup } + { send: up } + ] + } + } + { + name: move_down + modifier: none + keycode: down + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: menudown } + { send: down } + ] + } + } + { + name: move_left + modifier: none + keycode: left + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: menuleft } + { send: left } + ] + } + } + { + name: move_right_or_take_history_hint + modifier: none + keycode: right + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: historyhintcomplete } + { send: menuright } + { send: right } + ] + } + } + { + name: move_one_word_left + modifier: control + keycode: left + mode: [emacs, vi_normal, vi_insert] + event: { edit: movewordleft } + } + { + name: move_one_word_right_or_take_history_hint + modifier: control + keycode: right + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: historyhintwordcomplete } + { edit: movewordright } + ] + } + } + { + name: move_to_line_start + modifier: none + keycode: home + mode: [emacs, vi_normal, vi_insert] + event: { edit: movetolinestart } + } + { + name: move_to_line_start + modifier: control + keycode: char_a + mode: [emacs, vi_normal, vi_insert] + event: { edit: movetolinestart } + } + { + name: move_to_line_end_or_take_history_hint + modifier: none + keycode: end + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: historyhintcomplete } + { edit: movetolineend } + ] + } + } + { + name: move_to_line_end_or_take_history_hint + modifier: control + keycode: char_e + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: historyhintcomplete } + { edit: movetolineend } + ] + } + } + { + name: move_to_line_start + modifier: control + keycode: home + mode: [emacs, vi_normal, vi_insert] + event: { edit: movetolinestart } + } + { + name: move_to_line_end + modifier: control + keycode: end + mode: [emacs, vi_normal, vi_insert] + event: { edit: movetolineend } + } + { + name: move_up + modifier: control + keycode: char_p + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: menuup } + { send: up } + ] + } + } + { + name: move_down + modifier: control + keycode: char_t + mode: [emacs, vi_normal, vi_insert] + event: { + until: [ + { send: menudown } + { send: down } + ] + } + } + { + name: delete_one_character_backward + modifier: none + keycode: backspace + mode: [emacs, vi_insert] + event: { edit: backspace } + } + { + name: delete_one_word_backward + modifier: control + keycode: backspace + mode: [emacs, vi_insert] + event: { edit: backspaceword } + } + { + name: delete_one_character_forward + modifier: none + keycode: delete + mode: [emacs, vi_insert] + event: { edit: delete } + } + { + name: delete_one_character_forward + modifier: control + keycode: delete + mode: [emacs, vi_insert] + event: { edit: delete } + } + { + name: delete_one_character_backward + modifier: control + keycode: char_h + mode: [emacs, vi_insert] + event: { edit: backspace } + } + { + name: delete_one_word_backward + modifier: control + keycode: char_w + mode: [emacs, vi_insert] + event: { edit: backspaceword } + } + { + name: move_left + modifier: none + keycode: backspace + mode: vi_normal + event: { edit: moveleft } + } + { + name: newline_or_run_command + modifier: none + keycode: enter + mode: emacs + event: { send: enter } + } + { + name: move_left + modifier: control + keycode: char_b + mode: emacs + event: { + until: [ + { send: menuleft } + { send: left } + ] + } + } + { + name: move_right_or_take_history_hint + modifier: control + keycode: char_f + mode: emacs + event: { + until: [ + { send: historyhintcomplete } + { send: menuright } + { send: right } + ] + } + } + { + name: redo_change + modifier: control + keycode: char_g + mode: emacs + event: { edit: redo } + } + { + name: undo_change + modifier: control + keycode: char_z + mode: emacs + event: { edit: undo } + } + { + name: paste_before + modifier: control + keycode: char_y + mode: emacs + event: { edit: pastecutbufferbefore } + } + { + name: cut_word_left + modifier: control + keycode: char_w + mode: emacs + event: { edit: cutwordleft } + } + { + name: cut_line_to_end + modifier: control + keycode: char_k + mode: emacs + event: { edit: cuttoend } + } + { + name: cut_line_from_start + modifier: control + keycode: char_u + mode: emacs + event: { edit: cutfromstart } + } + { + name: swap_graphemes + modifier: control + keycode: char_t + mode: emacs + event: { edit: swapgraphemes } + } + { + name: move_one_word_left + modifier: alt + keycode: left + mode: emacs + event: { edit: movewordleft } + } + { + name: move_one_word_right_or_take_history_hint + modifier: alt + keycode: right + mode: emacs + event: { + until: [ + { send: historyhintwordcomplete } + { edit: movewordright } + ] + } + } + { + name: move_one_word_left + modifier: alt + keycode: char_b + mode: emacs + event: { edit: movewordleft } + } + { + name: move_one_word_right_or_take_history_hint + modifier: alt + keycode: char_f + mode: emacs + event: { + until: [ + { send: historyhintwordcomplete } + { edit: movewordright } + ] + } + } + { + name: delete_one_word_forward + modifier: alt + keycode: delete + mode: emacs + event: { edit: deleteword } + } + { + name: delete_one_word_backward + modifier: alt + keycode: backspace + mode: emacs + event: { edit: backspaceword } + } + { + name: delete_one_word_backward + modifier: alt + keycode: char_m + mode: emacs + event: { edit: backspaceword } + } + { + name: cut_word_to_right + modifier: alt + keycode: char_d + mode: emacs + event: { edit: cutwordright } + } + { + name: upper_case_word + modifier: alt + keycode: char_u + mode: emacs + event: { edit: uppercaseword } + } + { + name: lower_case_word + modifier: alt + keycode: char_l + mode: emacs + event: { edit: lowercaseword } + } + { + name: capitalize_char + modifier: alt + keycode: char_c + mode: emacs + event: { edit: capitalizechar } + } + { + name: copy_selection + modifier: control_shift + keycode: char_c + mode: emacs + event: { edit: copyselection } + } + { + name: cut_selection + modifier: control_shift + keycode: char_x + mode: emacs + event: { edit: cutselection } + } + { + name: select_all + modifier: control_shift + keycode: char_a + mode: emacs + event: { edit: selectall } + } + { + name: paste + modifier: control_shift + keycode: char_v + mode: emacs + event: { edit: pastecutbufferbefore } + } + ] +} +use direnv.nu +use starship.nu +source zoxide.nu +source yazi.nu diff --git a/private_dot_config/nushell/env.nu b/private_dot_config/nushell/env.nu new file mode 100644 index 0000000..15ba7d5 --- /dev/null +++ b/private_dot_config/nushell/env.nu @@ -0,0 +1,56 @@ +# Nushell Environment Config File +# +# version = "0.91.0" +# + +# Use nushell functions to define your right and left prompt +# $env.PROMPT_COMMAND = {|| create_left_prompt } +# FIXME: This default is not implemented in rust code as of 2023-09-08. +# $env.PROMPT_COMMAND_RIGHT = {|| create_right_prompt } + +# The prompt indicators are environmental variables that represent +# the state of the prompt +# $env.PROMPT_INDICATOR = {|| "> " } +$env.PROMPT_INDICATOR_VI_INSERT = {|| ": " } +$env.PROMPT_INDICATOR_VI_NORMAL = {|| "> " } +$env.PROMPT_MULTILINE_INDICATOR = {|| "::: " } + +# Specifies how environment variables are: +# - converted from a string to a value on Nushell startup (from_string) +# - converted from a value back to a string when running external commands (to_string) +# Note: The conversions happen *after* config.nu is loaded +$env.ENV_CONVERSIONS = { + "PATH": { + from_string: { |s| $s | split row (char esep) | path expand --no-symlink } + to_string: { |v| $v | path expand --no-symlink | str join (char esep) } + } + "Path": { + from_string: { |s| $s | split row (char esep) | path expand --no-symlink } + to_string: { |v| $v | path expand --no-symlink | str join (char esep) } + } +} + +# Directories to search for scripts when calling source or use +# The default for this is $nu.default-config-dir/scripts +$env.NU_LIB_DIRS = [ + ($nu.default-config-dir | path join 'scripts') # add /scripts +] +# Directories to search for plugin binaries when calling register +# The default for this is $nu.default-config-dir/plugins +$env.NU_PLUGIN_DIRS = [ + ($nu.default-config-dir | path join 'plugins') # add /plugins +] + +# To add entries to PATH (on Windows you might use Path), you can use the following pattern: +# $env.PATH = ($env.PATH | split row (char esep) | prepend '/some/path') +# An alternate way to add entries to $env.PATH is to use the custom command `path add` +# which is built into the nushell stdlib: +# use std "path add" +# $env.PATH = ($env.PATH | split row (char esep)) +# path add /some/path +# path add ($env.CARGO_HOME | path join "bin") +# path add ($env.HOME | path join ".local" "bin") +# $env.PATH = ($env.PATH | uniq) + +# To load from a custom file you can use: +# source ($nu.default-config-dir | path join 'custom.nu') diff --git a/private_dot_config/nushell/history.txt b/private_dot_config/nushell/history.txt new file mode 100644 index 0000000..6783e5a --- /dev/null +++ b/private_dot_config/nushell/history.txt @@ -0,0 +1,261 @@ +ls +docker-compose.yml +cat docker-compose.yml +view docker-compose.yml +explore docker-compose.yml +open docker-compose.yml +docker compose up localstack +$env.UID = 1000 +$env.GID = 1000 +$env.BUILD_UUID = latest +http https://liquorix.net/atom +http +http get https://liquorix.net/atom +http get https://liquorix.net/atom | from xml +lsof +lsof | from table +lsof | to table +lsof | as table +lsof | table +lsof | into table +lsof | nto table +lsof | to table +which ps +lsof | detect columns +lsof | str contains swap | detect columns +lsof | split row | str contains swap | detect columns +cat +ls +cat `4x4 Gridfinity Baseplate.gcode` +which cat +smem +smem | detect columns +smem | detect columns | sort-by swap +smem | detect columns | sort-by Swap +smem | detect columns | sort-by -n Swap +swap +swapon +free -h +vmstat +vmstat -h +vmstat -d +vmstat -a +vmstat -a -Sg +vmstat -a -SM +zramctl +sudo zramctl +free -m +free -m -h +sudo zramctl -h +sudo zramctl --output-all +echo "Current swappiness = $(cat /proc/sys/vm/swappiness) %" +cat /proc/sys/vm/swappiness +swapoff -h +sudo swapoff -av +swapon -h +sudo nvim /etc/sysctl.conf +cat /sys/module/zswap/parameters/ +cat /sys/module/zswap/parameters/enabled +zgrep CONFIG_ZSWAP_DEFAULT_ON /proc/config.gz +sudo dmesg | grep zswap +sudo sysctl -h +sudo sysctl -a | grep zswap +sudo sysctl -a +sudo sysctl -a | rg user +sudo sysctl -a | rg swap +sudo echo 1 > /sys/module/zswap/parameters/enabled +cat /sys/module/zswap/parameters/enabled +$nu.env.path +$nu.env-path +nvim $nu.env-path +z nvim +cd .conf +cd .config/nvim/lua/custom/ +nvim plugins.lua +nvim $nu.env-path +mkdir ~/.cache/starship<\n>starship init nu | save -f ~/.cache/starship/init.nu +nvim $nu.env-path +cd ../../ +cd .. +cd nushell/ +nvim env.nu +nvim ../starship.toml +nvim $nu.env +nvim $nu.config-path +cd .. +cd nushell/ +ls +dwerbb +ls +cd $env.NU_LIB_DIRS +$nu.default-config-dir +l +ls +mkdir scripts +ls +cd scripts/ +cd $env.NU_LIB_DIRS +echo $env.NU_LIB_DIRS +echo $env.NU_LIB_DIRS[0] +echo $env.NU_LIB_DIRS [0] +echo $env.NU_LIB_DIRS [[0]] +echo $env.NU_LIB_DIRS.1 +echo $env.NU_LIB_DIRS.0 +mv ~/.cache/starship/init.nu $env.NU_LIB_DIRS.0/starship.nu +mv ~/.cache/starship/init.nu $env.NU_LIB_DIRS.0 | path join starship.nu +mv ~/.cache/starship/init.nu "$env.NU_LIB_DIRS.0/starship.nu" +mv ~/.cache/starship/init.nu ./starship.nu +ls +zoxide init nushell | save -f ./zoxide.nu +zoxide init nushell --hook prompt +zoxide init nushell --hook prompt | save zoxide.nu +zoxide init nushell --hook prompt | save zoxide.nu -f +zoxide --version +which zoxide +nix-env -iA nixpkgs.zoxide +which zoxide +zoxide init nushell | save zoxide.nu -f +zoxide --version +which nu +xdg-ninja +xdg-ninja -h +xdg-ninja | grep bun +mcfly init -h +mcfly init bash +mcfly init powershell | savd mcfly.nu +mcfly init powershell | savr mcfly.nu +mcfly init powershell | save mcfly.nu +mcfly init bash | save mcfly.nu -f +http get https://raw.githubusercontent.com/nushell/nu_scripts/2d3406b5269cf2880667045c7408e06ad9bd4836/nu-hooks/nu-hooks/direnv/direnv.nu +http get https://raw.githubusercontent.com/nushell/nu_scripts/2d3406b5269cf2880667045c7408e06ad9bd4836/nu-hooks/nu-hooks/direnv/direnv.nu | save direnv.nu +direnv +nix-env -iA nixpkgs.direnv +use direnv +use direnv.nu +cd +direnv +direnv edit +direnv edit . +direnv +direnv grant +direnv grant . +echo $env.NU_LIB_DIRS.0 +echo $env.NU_LIB_DIRS +$env +$env.NU_LIB_DIRS +exec -h +nu -h +unset * +$env = "" +$env.* = "" +$env.PATH +$env.NU_LIB_DIRS +$env.NU_LIB_DIRS = [<\n> ($nu.default-config-dir | path join 'scripts') # add /scripts<\n>]<\n> +$env.NU_LIB_DIRS +use starship.nu +use +use -h +cd .config +cd nushell/ +ls +rg plugins +use direnv +use direnv.nu +use zoxide.nu +$env.NU_LIB_DIRS +use zoxide.nu +source zoxide.nu +use starship.nu +$env.NU_LIB_DIRS +$env.NU_LIB_DIRS.0 +direnv -h +direnv --help +direnv export --json +direnv export json +direnv export --help +direnv status --json +direnv status --json | as json +direnv status --json | from json +exec ash +yy +z lon +ls -l +lsd +ls +cd .venv +ls -a +lsd -a +cd .. +ls +cd .venv/ +ls +cd bin +ls +cat activate +cd .. +nvim .envrc +cd .. +cd Bifrost/ +direnv allow +cd .. +cd Bifrost/ +direnv -h +direnv --help +direnv status +direnv export json +direnv reload +cd .venv/bin/ +ls +cat activate +cd .. +nvim .envrc +direnv allow +direnv status +direnv export json +which python +python -V +python -v +uv -h +uv pip -h +uv pip list +source .venv/bin/activate.nu +use .venv/bin/activate.nu +nvim .envrc +deactivate +cd .. +exit +z bif +ls +direnv +direnv reload +ls -a +direnv --status +direnv status +direnv .envrc +nvim .envrc +direnv allow . +cd .. +cd Bifrost/ +pip list +uv pip list +which pip +ls +direnv reload +direnv -h +direnv --help +direnv allow .envrc +direnv stdlib +direnv reload +which direnv +$env.config +$env.config.hooks +nvim .envrc +direnv allow +direnv allow . +cd .. +cd Bifrost/ +which python +lunar-witch.css +open lunar-witch.css +ls +nvim discord.css diff --git a/private_dot_config/nushell/scripts/direnv.nu b/private_dot_config/nushell/scripts/direnv.nu new file mode 100644 index 0000000..2865901 --- /dev/null +++ b/private_dot_config/nushell/scripts/direnv.nu @@ -0,0 +1,17 @@ +export-env { + $env.config = ( $env.config | upsert hooks.env_change.PWD { |config| + let o = ($config | get -i hooks.env_change.PWD) + let val = { || + if (which direnv | is-empty) { + return + } + + direnv export json | from json | default {} | load-env +} + if $o == null { + $val + } else { + $o | append $val + } + }) +} diff --git a/private_dot_config/nushell/scripts/starship.nu b/private_dot_config/nushell/scripts/starship.nu new file mode 100644 index 0000000..8b0d95a --- /dev/null +++ b/private_dot_config/nushell/scripts/starship.nu @@ -0,0 +1,38 @@ +# this file is both a valid +# - overlay which can be loaded with `overlay use starship.nu` +# - module which can be used with `use starship.nu` +# - script which can be used with `source starship.nu` +export-env { $env.STARSHIP_SHELL = "nu"; load-env { + STARSHIP_SESSION_KEY: (random chars -l 16) + PROMPT_MULTILINE_INDICATOR: ( + ^/home/akristip/.nix-profile/bin/starship prompt --continuation + ) + + # Does not play well with default character module. + # TODO: Also Use starship vi mode indicators? + PROMPT_INDICATOR: "" + + PROMPT_COMMAND: {|| + # jobs are not supported + ( + ^/home/akristip/.nix-profile/bin/starship prompt + --cmd-duration $env.CMD_DURATION_MS + $"--status=($env.LAST_EXIT_CODE)" + --terminal-width (term size).columns + ) + } + + config: ($env.config? | default {} | merge { + render_right_prompt_on_last_line: true + }) + + PROMPT_COMMAND_RIGHT: {|| + ( + ^/home/akristip/.nix-profile/bin/starship prompt + --right + --cmd-duration $env.CMD_DURATION_MS + $"--status=($env.LAST_EXIT_CODE)" + --terminal-width (term size).columns + ) + } +}} diff --git a/private_dot_config/nushell/scripts/yazi.nu b/private_dot_config/nushell/scripts/yazi.nu new file mode 100644 index 0000000..08ca26c --- /dev/null +++ b/private_dot_config/nushell/scripts/yazi.nu @@ -0,0 +1,9 @@ +def --env yy [...args] { + let tmp = (mktemp -t "yazi-cwd.XXXXXX") + yazi ...$args --cwd-file $tmp + let cwd = (open $tmp) + if $cwd != "" and $cwd != $env.PWD { + cd $cwd + } + rm -fp $tmp +} diff --git a/private_dot_config/nushell/scripts/zoxide.nu b/private_dot_config/nushell/scripts/zoxide.nu new file mode 100644 index 0000000..aa338b6 --- /dev/null +++ b/private_dot_config/nushell/scripts/zoxide.nu @@ -0,0 +1,60 @@ +# Code generated by zoxide. DO NOT EDIT. + +# ============================================================================= +# +# Hook configuration for zoxide. +# + +# Initialize hook to add new entries to the database. +if (not ($env | default false __zoxide_hooked | get __zoxide_hooked)) { + $env.__zoxide_hooked = true + $env.config = ($env | default {} config).config + $env.config = ($env.config | default {} hooks) + $env.config = ($env.config | update hooks ($env.config.hooks | default {} env_change)) + $env.config = ($env.config | update hooks.env_change ($env.config.hooks.env_change | default [] PWD)) + $env.config = ($env.config | update hooks.env_change.PWD ($env.config.hooks.env_change.PWD | append {|_, dir| + zoxide add -- $dir + })) +} + +# ============================================================================= +# +# When using zoxide with --no-cmd, alias these internal functions as desired. +# + +# Jump to a directory using only keywords. +def --env __zoxide_z [...rest:string] { + let arg0 = ($rest | append '~').0 + let path = if (($rest | length) <= 1) and ($arg0 == '-' or ($arg0 | path expand | path type) == dir) { + $arg0 + } else { + (zoxide query --exclude $env.PWD -- ...$rest | str trim -r -c "\n") + } + cd $path +} + +# Jump to a directory using interactive search. +def --env __zoxide_zi [...rest:string] { + cd $'(zoxide query --interactive -- ...$rest | str trim -r -c "\n")' +} + +# ============================================================================= +# +# Commands for zoxide. Disable these using --no-cmd. +# + +alias z = __zoxide_z +alias zi = __zoxide_zi + +# ============================================================================= +# +# Add this to your env file (find it by running `$nu.env-path` in Nushell): +# +# zoxide init nushell | save -f ~/.zoxide.nu +# +# Now, add this to the end of your config file (find it by running +# `$nu.config-path` in Nushell): +# +# source ~/.zoxide.nu +# +# Note: zoxide only supports Nushell v0.89.0+. diff --git a/private_dot_config/sheldon/plugins.toml b/private_dot_config/sheldon/plugins.toml index 0d336d3..9f6f526 100644 --- a/private_dot_config/sheldon/plugins.toml +++ b/private_dot_config/sheldon/plugins.toml @@ -32,7 +32,6 @@ apply = ["defer-medium"] [plugins.zsh-autosuggestions] github = 'zsh-users/zsh-autosuggestions' -apply = ["defer"] [plugins.bash-completions-fallback] github = '3v1n0/zsh-bash-completions-fallback' @@ -73,10 +72,6 @@ apply = ["defer"] #[plugins.aliases] #remote = 'https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/aliases' -[plugins.zsh-vim-plugin] -github = 'nviennot/zsh-vim-plugin' -apply = ["defer"] - [plugins.docker-zsh-completion] github = 'greymd/docker-zsh-completion' apply = ["defer"] diff --git a/private_dot_config/starship.toml b/private_dot_config/starship.toml index 0c1a125..66e6f9e 100644 --- a/private_dot_config/starship.toml +++ b/private_dot_config/starship.toml @@ -33,6 +33,7 @@ $status\ [](bg:bright-red fg:bright-blue) $cmd_duration\ $hostname\ +$sudo\ [](fg:bright-blue) """ @@ -61,22 +62,23 @@ CentOS = " " # AlmaLinux = " " NixOS = " " Windows = " " -Macos = " " +Macos = "" Alpine = " " [directory] style = "bg:bright-red fg:black" format = "[ $path ]($style)" -truncation_length = 3 truncation_symbol = "…/" +truncation_length = 1 +fish_style_pwd_dir_length = 2 # Here is how you can shorten some long paths by text replacement # similar to mapped_locations in Oh My Posh: -[directory.substitutions] -"Documents" = " " -"Downloads" = " " -"Music" = " " -"Pictures" = " " +# [directory.substitutions] +# "Documents" = " " +# "Downloads" = " " +# "Music" = " " +# "Pictures" = " " # Keep in mind that the order matters. For example: # "Important Documents" = "  " # will not be replaced, because "Documents" was already substituted before. @@ -84,7 +86,7 @@ truncation_symbol = "…/" # "Important  " = "  " [c] -symbol = " " +symbol = "" style = "bg:bright-cyan fg:black" format = '[ $symbol ($version) ]($style)' @@ -100,7 +102,7 @@ style = "bg:bright-blue fg:black" format = '[ $symbol $branch ]($style)' [git_commit] -symbol = "" +symbol = " " style = "bg:bright-blue fg:black" format = "[($hash$tag)]($style) " @@ -114,26 +116,27 @@ untracked = '' conflicted = '' staged = ' ' up_to_date = ' ' -diverged = ' ' -deleted = ' ' +diverged = '' +deleted = '' [git_state] style = "bg:bright-blue fg:black" -format = '[\($state( $progress_current of $progress_total)\)]($style) ' +format = '[\($state( $progress_current of $progress_total)\)]($style)' [golang] -symbol = " " +symbol = "" style = "bg:bright-cyan fg:black" -format = '[ $symbol ($version) ]($style)' +format = '[$symbol($version) ]($style)' +version_format = "v${major}.${minor}" [gradle] style = "bg:bright-cyan fg:black" -format = '[ $symbol ($version) ]($style)' +format = '[($symbol$version)]($style)' [java] -symbol = " " +symbol = "" style = "bg:bright-cyan fg:black" -format = '[ $symbol ($version) ]($style)' +format = '[($symbol$version)]($style)' [nodejs] symbol = "" @@ -141,7 +144,7 @@ style = "bg:bright-cyan fg:black" format = '[ $symbol ($version) ]($style)' [python] -symbol = " " +symbol = "" style = "bg:bright-cyan fg:black" format = '[ ${symbol}${pyenv_prefix}(${version} )(\($virtualenv\))]($style)' @@ -158,10 +161,11 @@ format = '[ $time ]($style)' [shell] bash_indicator = "" -powershell_indicator = "" -zsh_indicator = "" +powershell_indicator = " " +zsh_indicator = " " +nu_indicator = "ν" style = "bg:bright-purple fg:black" -format = '[$indicator ]($style)' +format = '[$indicator]($style)' disabled = false [cmd_duration] @@ -172,11 +176,17 @@ show_milliseconds = true [status] disabled=false style="fg:black bg:bright-red" -symbol="" +symbol=" " # success_symbol="" -format = "[ $symbol $status ]($style)" +format = "[ $symbol$status]($style)" [hostname] style="bg:bright-blue fg:black" ssh_symbol="@" format='[ $ssh_symbol$hostname ]($style)' + +[sudo] +style="bg:bright-blue fg:black" +disabled = false +symbol=" " +format = "[ $symbol]($style)" diff --git a/private_dot_config/sway/i3blocks.conf b/private_dot_config/sway/i3blocks.conf index 25ebd28..ba6d00c 100644 --- a/private_dot_config/sway/i3blocks.conf +++ b/private_dot_config/sway/i3blocks.conf @@ -24,7 +24,7 @@ # # The top properties below are applied to every block, but can be overridden. # Each block command defaults to the script name to avoid boilerplate. -command=~/.config/sway/blocks/$BLOCK_NAME/$BLOCK_NAME +command=~/.config/i3blocks/$BLOCK_NAME/$BLOCK_NAME separator_block_width=15 markup=none diff --git a/private_dot_config/swhkd/swhkdrc b/private_dot_config/swhkd/swhkdrc index 35b1787..75efd6e 100644 --- a/private_dot_config/swhkd/swhkdrc +++ b/private_dot_config/swhkd/swhkdrc @@ -4,12 +4,12 @@ super + b # Pipewire controls XF86AudioRaiseVolume - pactl set-sink-volume "$(pactl list short sinks | cut -f 1 | head -n 1)" +5%;# increase sound volume + pactl set-sink-volume @DEFAULT_SINK@ +5%;# increase sound volume XF86AudioLowerVolume - pactl set-sink-volume "$(pactl list short sinks | cut -f 1 | head -n 1)" -5%; # decrease sound volume + pactl set-sink-volume @DEFAULT_SINK@ -5%; # decrease sound volume XF86AudioMute - pactl set-sink-mute 0 toggle # mute sound + pactl set-sink-mute @DEFAULT_SINK@ toggle # mute sound # Media player controls XF86AudioPlay @@ -27,7 +27,7 @@ XF86MonBrightnessDown brightnessctl -e s 5%- super + enter - alacritty + kitty super + shift + e rofi \ @@ -41,14 +41,14 @@ super + tab rofi -show window -show-icons -theme lunar-witch print - flameshot full -r -p "$HOME/Pictures/screenshots/" | cb copy + flameshot full -c -r -p "$HOME/Pictures/screenshots/" shift + print - flameshot gui -s -r -p "$HOME/Pictures/screenshots/" | cb copy + flameshot gui -c -s -r -p "$HOME/Pictures/screenshots/" ctrl + print - flameshot gui -r -p "$HOME/Pictures/screenshots/" | cb copy + flameshot gui -c -r -p "$HOME/Pictures/screenshots/" #super + shift + v