diff --git a/Configs/bash/.bash_profile b/Configs/bash/.bash_profile index 287b4fc..87c43fa 100644 --- a/Configs/bash/.bash_profile +++ b/Configs/bash/.bash_profile @@ -40,3 +40,5 @@ update_path "$HOME/.cargo/bin/" if [ -f ~/.bashrc ]; then . ~/.bashrc fi + +. "$HOME/.local/share/../bin/env" diff --git a/Configs/bash/.bashrc b/Configs/bash/.bashrc index 6cd3f11..ff5d68d 100644 --- a/Configs/bash/.bashrc +++ b/Configs/bash/.bashrc @@ -2,12 +2,7 @@ # │ Auto drop into fish only on login │ # ╰──────────────────────────────────────────────────────────╯ -if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} && ${SHLVL} == 1 ]]; then - shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION='' - exec fish $LOGIN_OPTION -fi - -. "$HOME/.atuin/bin/env" - -[[ -f ~/.bash-preexec.sh ]] && source ~/.bash-preexec.sh -eval "$(atuin init bash)" +# if [[ $(ps --no-header --pid=$PPID --format=comm) != "fish" && -z ${BASH_EXECUTION_STRING} && ${SHLVL} == 1 ]]; then +# shopt -q login_shell && LOGIN_OPTION='--login' || LOGIN_OPTION='' +# exec fish $LOGIN_OPTION +# fi diff --git a/Configs/fish/.config/fish/completions/fish-lsp.fish b/Configs/fish/.config/fish/completions/fish-lsp.fish new file mode 100644 index 0000000..28713a9 --- /dev/null +++ b/Configs/fish/.config/fish/completions/fish-lsp.fish @@ -0,0 +1,331 @@ +# +# AUTO GENERATED BY 'fish-lsp' +# +# * Any command should generate the completions file +# +# >_ fish-lsp complete > ~/.config/fish/completions/fish-lsp.fish +# >_ fish-lsp complete > $fish_complete_path[1]/fish-lsp.fish +# >_ yarn install && yarn dev # from inside the '~/path/to/fish-lsp' source code +# +# * You can test the completions by editing: +# +# ~/.config/fish/completions/fish-lsp.fish +# +# or by using the command: +# +# >_ fish-lsp complete +# +# to visually check what is wrong +# +# * To interactively test the completions, you can use: +# +# >_ complete -c fish-lsp -e # erase all fish-lsp completions +# >_ fish-lsp complete | source +# +# * For more info, try editing the generated output inside: +# +# ~/...install_path.../fish-lsp/src/utils/get-lsp-completions.ts +# +# * You can see if the completions are up to date by running the command: +# +# >_ fish-lsp info --check-health +# +# REPO URL: https://github.com/ndonfris/fish-lsp + + +############################################# +# helper functions for fish-lsp completions # +############################################# + +# print all unique `fish-lsp start --enable|--disable ...` features (i.e., complete, hover, etc.) +# if a feature is already specified in the command line, it will be skipped +# the features can also be used in the global environment variables `fish_lsp_enabled_handlers` or `fish_lsp_disabled_handlers` +function __fish_lsp_get_features -d 'print all features controlled by the server, not yet used in the commandline' + set -l all_features 'complete' 'hover' 'rename' 'definition' 'implementation' 'reference' 'formatting' 'formatRange' 'typeFormatting' 'codeAction' 'codeLens' 'folding' 'signature' 'executeCommand' 'inlayHint' 'highlight' 'diagnostic' 'popups' + set -l features_to_complete + set -l features_to_skip + set -l opts (commandline -opc) + for opt in $opts + if contains -- $opt $all_features + set features_to_skip $features_to_skip $opt + end + end + for feature in $all_features + if not contains -- $feature $features_to_skip + printf '%b\t%s\n' $feature "$feature handler" + end + end +end + +# print all unique 'fish-lsp env --only ...` env_variables (i.e., $fish_lsp_*, ...) +# if a env_variable is already specified in the command line, it will not be included again +function __fish_lsp_get_env_variables -d 'print all fish_lsp_* env variables, not yet used in the commandline' + # every env variable name + set -l env_names "fish_lsp_enabled_handlers" \ + "fish_lsp_disabled_handlers" \ + "fish_lsp_commit_characters" \ + "fish_lsp_log_file" \ + "fish_lsp_log_level" \ + "fish_lsp_all_indexed_paths" \ + "fish_lsp_modifiable_paths" \ + "fish_lsp_diagnostic_disable_error_codes" \ + "fish_lsp_enable_experimental_diagnostics" \ + "fish_lsp_max_background_files" \ + "fish_lsp_show_client_popups" \ + "fish_lsp_single_workspace_support" + + # every completion argument `name\t'description'`, only unused env variables will be printed + set -l env_names_with_descriptions "fish_lsp_enabled_handlers\t'server handlers to enable'" \ + "fish_lsp_disabled_handlers\t'server handlers to disable'" \ + "fish_lsp_commit_characters\t'commit characters that select completion items'" \ + "fish_lsp_log_file\t'path to the fish-lsp's log file'" \ + "fish_lsp_log_level\t'minimum log level to include in the log file'" \ + "fish_lsp_all_indexed_paths\t'directories that the server should always index on startup'" \ + "fish_lsp_modifiable_paths\t'indexed paths that can be modified'" \ + "fish_lsp_diagnostic_disable_error_codes\t'diagnostic codes to disable'" \ + "fish_lsp_enable_experimental_diagnostics\t'enable fish-lsp's experimental diagnostics'" \ + "fish_lsp_max_background_files\t'maximum number of files to analyze in the background on startup'" \ + "fish_lsp_show_client_popups\t'send `connection/window/*` requests in the server'" \ + "fish_lsp_single_workspace_support\t'limit workspace searching to only the current workspace'" + + # get the current command line token (for comma separated options) + set -l current (commandline -ct) + + # utility function to check if the current token contains a comma + function has_comma --inherit-variable current --description 'check if the current token contains a comma' + string match -rq '.*,.*' -- $current || string match -rq -- '--only=.*' $current + return $status + end + + # get the current command line options, adding the current token if it contains a comma + set -l opts (commandline -opc) + has_comma && set -a opts $current + + # create two arrays, one for the env variables already used, and the other + # for all the arguments passed into the commandline + set -l features_to_skip + set -l fixed_opts + + # split any comma separated options + for opt in $opts + if string match -rq -- '--only=.*' $opt + set -a fixed_opts '--only' (string split -m1 -f2 -- '--only=' $opt | string split ',') + else if string match -q '*,*' -- $opt + set fixed_opts $fixed_opts (string split ',' -- $opt) + else + set fixed_opts $fixed_opts $opt + end + end + + # skip any env variable that is already specified in the command line + for opt in $fixed_opts + if contains -- $opt $env_names + set -a features_to_skip $opt + end + end + + # if using the `--only=` syntax, remove the `--only` part. + # when entries are separated by commas, we need to keep the current token's prefix comma + # in the completion output + set prefix '' + if has_comma + set prefix (string replace -r '[^,]*$' '' -- $current | string replace -r -- '^--only=' '') + end + + # print the completions that haven't been used yet + for line in $env_names_with_descriptions + set name (string split -f1 -m1 '\t' -- $line) + if not contains -- $name $features_to_skip + echo -e "$prefix$line" + end + end +end + +# check for usage of the main switches in env command `fish-lsp env --show|--create|--show-default|--names` +# +# requires passing in one of switches: `--none` or `--any` +# - `--none` check that none of the main switches are used +# - `--any` check that a main switch has been seen +# - `--no-names` check that the `--names` switch is not used, but needs to be +# paired with `--none` or `--any` +# +# used in the `env` completions, for grouping repeated logic on those +# completions conditional checks. +# +# ``` +# complete -n '__fish_lsp_env_main_switch --none' +# ``` +function __fish_lsp_env_main_switch --description 'check if the commandline contains any of the main env switches (--show|--create|--show-default|--names)' + argparse any none no-names names-joined -- $argv + or return 1 + + # none means we don't want to see any of the main switches + # no-names doesn't change anything here, since we are making sure that + # names already doesn't exist in the command line + if set -ql _flag_none + not __fish_contains_opt names + and not __fish_contains_opt -s s show + and not __fish_contains_opt -s c create + and not __fish_contains_opt show-default + return $status + end + + # any means that one of the main switches has been used. + if set -ql _flag_any + if set -ql _flag_no_names + __fish_contains_opt names + and return 1 + end + not set -ql _flag_no_names && __fish_contains_opt names + or __fish_contains_opt -s s show + or __fish_contains_opt -s c create + or __fish_contains_opt show-default + return $status + end + + # names joined means that both the --names and --joined switches are used + if set -ql _flag_names_joined + __fish_contains_opt names + and not __fish_contains_opt -s j joined + and return $status + end + # if no switches are found, return 1 + return 1 +end + + + +# make sure `fish-lsp start --stdio|--node-ipc|--socket` is used singularly +# and not in combination with any other connection related option +function __fish_lsp_start_connection_opts -d 'check if any option (--stdio|--node-ipc|--socket) is used' + __fish_contains_opt stdio || __fish_contains_opt node-ipc || __fish_contains_opt socket +end + +# check if the last `fish-lsp start ...` flag/switch is `--enable` or `--disable` +# this will find the last `-*` argument in the command line, skipping any argument not starting with `-` +# and make sure it matches any of the provided `$argv` passed in to the function (defaulting to: `--enable` `--disable`) +# we use this to allow multiple sequential features to follow `fish-lsp start --enable|--disable ...` +# USAGE: +# > `fish-lsp --stdio --start complete hover --disable codeAction highlight formatting ` +# `__fish_lsp_last_switch --enable --disable ` would return 0 since `--disable` is the last switch +function __fish_lsp_last_switch -d 'check if the last argument w/ a leading `-` matches any $argv' + set -l opts (commandline -opc) + set -l last_opt + for opt in $opts + switch $opt + case '-*' + set last_opt $opt + case '*' + continue + end + end + set -l match_opts $argv + if test (count $argv) -eq 0 + set match_opts '--enable' '--disable' + end + for switch in $match_opts + if test "$last_opt" = "$switch" + return 0 + end + end + return 1 +end + +############################### +### END OF HELPER FUNCTIONS ### +############################### + +## disable file completions +complete -c fish-lsp -f + +## fish-lsp +complete -c fish-lsp -n "__fish_is_first_arg; and __fish_complete_subcommand" -k -a " +start\t'start the lsp' +info\t'show info about the fish-lsp' +url\t'show helpful url(s) related to the fish-lsp' +complete\t'generate fish shell completions' +env\t'generate environment variables for lsp configuration'" + +## `fish-lsp -` +complete -c fish-lsp -n 'not __fish_use_subcommand; and __fish_is_first_arg; and not __fish_contains_opt -s v version' -s v -l version -d 'Show lsp version' +complete -c fish-lsp -n 'not __fish_use_subcommand; and __fish_is_first_arg; and not __fish_contains_opt -s h help' -s h -l help -d 'Show help information' +complete -c fish-lsp -n 'not __fish_use_subcommand; and __fish_is_first_arg; and not __fish_contains_opt help-all' -l help-all -d 'Show all help information' +complete -c fish-lsp -n 'not __fish_use_subcommand; and __fish_is_first_arg; and not __fish_contains_opt help-short' -l help-short -d 'Show short help information' +complete -c fish-lsp -n 'not __fish_use_subcommand; and __fish_is_first_arg; and not __fish_contains_opt help-man' -l help-man -d 'Show raw manpage' + +## `fish-lsp start --` +complete -c fish-lsp -n '__fish_seen_subcommand_from start; and not __fish_contains_opt dump' -l dump -d 'stop lsp & show the startup options being read' +complete -c fish-lsp -n '__fish_seen_subcommand_from start' -l enable -d 'enable the startup option' -xa '(__fish_lsp_get_features)' +complete -c fish-lsp -n '__fish_seen_subcommand_from start' -l disable -d 'disable the startup option' -xa '(__fish_lsp_get_features)' +complete -c fish-lsp -n '__fish_seen_subcommand_from start; and __fish_lsp_last_switch --disable --enable' -a '(__fish_lsp_get_features)' # allow completing multiple features in a row (when last seen switch is either: `--enable|--disable`) +complete -c fish-lsp -n '__fish_seen_subcommand_from start; and not __fish_lsp_start_connection_opts' -l stdio -d 'use stdin/stdout for communication (default)' +complete -c fish-lsp -n '__fish_seen_subcommand_from start; and not __fish_lsp_start_connection_opts' -l node-ipc -d 'use node IPC for communication' +complete -c fish-lsp -n '__fish_seen_subcommand_from start; and not __fish_lsp_start_connection_opts' -l socket -d 'use TCP socket for communication' -x +complete -c fish-lsp -n '__fish_seen_subcommand_from start; and not __fish_contains_opt memory-limit' -l memory-limit -d 'set memory usage limit in MB' -x +complete -c fish-lsp -n '__fish_seen_subcommand_from start; and not __fish_contains_opt max-files' -l max-files -d 'override the maximum number of files to analyze' -xa '(echo 100; echo 500; seq 1000 500 10000)' +complete -c fish-lsp -n '__fish_seen_subcommand_from start; and test (commandline -opc)[-1] = "--max-files"' -a '(echo 100; echo 500; seq 1000 500 10000)' -d 'override the maximum number of files to analyze' + +## fish-lsp url -- +complete -c fish-lsp -n '__fish_seen_subcommand_from url; and not __fish_contains_opt repo' -l repo -d 'show git repo url' +complete -c fish-lsp -n '__fish_seen_subcommand_from url; and not __fish_contains_opt git' -l git -d 'show git repo url' +complete -c fish-lsp -n '__fish_seen_subcommand_from url; and not __fish_contains_opt npm' -l npm -d 'show npmjs.com url' +complete -c fish-lsp -n '__fish_seen_subcommand_from url; and not __fish_contains_opt homepage' -l homepage -d 'show website url' +complete -c fish-lsp -n '__fish_seen_subcommand_from url; and not __fish_contains_opt contributing' -l contributing -d 'show git CONTRIBUTING.md url' +complete -c fish-lsp -n '__fish_seen_subcommand_from url; and not __fish_contains_opt wiki' -l wiki -d 'show git wiki url' +complete -c fish-lsp -n '__fish_seen_subcommand_from url; and not __fish_contains_opt issues' -l issues -d 'show git issues url' +complete -c fish-lsp -n '__fish_seen_subcommand_from url; and not __fish_contains_opt report' -l report -d 'show git issues url' +complete -c fish-lsp -n '__fish_seen_subcommand_from url; and not __fish_contains_opt discussions' -l discussions -d 'show git discussions url' +complete -c fish-lsp -n '__fish_seen_subcommand_from url; and not __fish_contains_opt clients-repo' -l clients-repo -d 'show git clients-repo url' +complete -c fish-lsp -n '__fish_seen_subcommand_from url; and not __fish_contains_opt sources' -l sources -d 'show useful url list of sources' + +## fish-lsp complete -- +complete -c fish-lsp -n '__fish_seen_subcommand_from complete; and not __fish_contains_opt fish' -l fish -d 'DEFAULT BEHAVIOR: show output for completion/fish-lsp.fish' +complete -c fish-lsp -n '__fish_seen_subcommand_from complete; and not __fish_contains_opt names' -l names -d 'show names of subcommands' +complete -c fish-lsp -n '__fish_seen_subcommand_from complete; and not __fish_contains_opt names-with-summary' -l names-with-summary -d 'show `name\tsummary\n` of subcommands' +complete -c fish-lsp -n '__fish_seen_subcommand_from complete; and not __fish_contains_opt features' -l features -d 'show feature/toggle names' +complete -c fish-lsp -n '__fish_seen_subcommand_from complete; and not __fish_contains_opt toggles' -l toggles -d 'show feature/toggle names' +complete -c fish-lsp -n '__fish_seen_subcommand_from complete; and not __fish_contains_opt env-variables' -l env-variables -d 'show env variable completions' +complete -c fish-lsp -n '__fish_seen_subcommand_from complete; and not __fish_contains_opt env-variable-names' -l env-variable-names -d 'show env variable names' + +## fish-lsp info -- +complete -c fish-lsp -n '__fish_seen_subcommand_from info; and not __fish_contains_opt bin' -l bin -d 'show the binary path' +complete -c fish-lsp -n '__fish_seen_subcommand_from info; and not __fish_contains_opt repo' -l repo -d 'show the repo path' +complete -c fish-lsp -n '__fish_seen_subcommand_from info; and not __fish_contains_opt build-time' -l build-time -d 'show the build-time' +complete -c fish-lsp -n '__fish_seen_subcommand_from info; and not __fish_contains_opt lsp-version' -l lsp-version -d 'show the npm package for the lsp-version' +complete -c fish-lsp -n '__fish_seen_subcommand_from info; and not __fish_contains_opt capabilities' -l capabilities -d 'show the lsp capabilities implemented' +complete -c fish-lsp -n '__fish_seen_subcommand_from info; and not __fish_contains_opt man-file' -l man-file -d 'show man file path' +complete -c fish-lsp -n '__fish_seen_subcommand_from info; and not __fish_contains_opt log-file' -l log-file -d 'show log file path' +complete -c fish-lsp -n '__fish_seen_subcommand_from info; and not __fish_contains_opt more' -l more -d 'show more info' +complete -c fish-lsp -n '__fish_seen_subcommand_from info; and not __fish_contains_opt time-startup' -l time-startup -d 'show startup timing info' +complete -c fish-lsp -n '__fish_seen_subcommand_from info; and not __fish_contains_opt check-health' -l check-health -d 'show the server health' + +## fish-lsp env -- +# fish-lsp env +complete -c fish-lsp -n '__fish_seen_subcommand_from env; and __fish_lsp_env_main_switch --none; and __fish_complete_subcommand --fcs-skip=2' -kra " +--show-default\t'show the default values for fish-lsp env variables' +-c\t'create the env variables' +--create\t'create the env variables' +-s\t'show the current fish-lsp env variables with their values' +--show\t'show the current fish-lsp env variables with their values' +--names\t'output only the names of the env variables'" +# main switches (first arguments after the `env` subcommand) +complete -c fish-lsp -n '__fish_seen_subcommand_from env; and __fish_lsp_env_main_switch --none' -l show-default -d 'show the default values for fish-lsp env variables' -k +complete -c fish-lsp -n '__fish_seen_subcommand_from env; and __fish_lsp_env_main_switch --none' -s c -l create -d 'build initial fish-lsp env variables' -k +complete -c fish-lsp -n '__fish_seen_subcommand_from env; and __fish_lsp_env_main_switch --none' -s s -l show -d 'show the current fish-lsp env variables' -k +complete -c fish-lsp -n '__fish_seen_subcommand_from env; and __fish_lsp_env_main_switch --none' -l names -d 'output only the names of the env variables' -k +# --only switch +complete -c fish-lsp -n '__fish_seen_subcommand_from env; and __fish_lsp_env_main_switch --any' -l only -d 'show only certain env variables' -xa '(__fish_lsp_get_env_variables)' +complete -c fish-lsp -n '__fish_seen_subcommand_from env; and __fish_lsp_last_switch --only' -xa '(__fish_lsp_get_env_variables)' +# switches usable after the main switches +complete -c fish-lsp -n '__fish_seen_subcommand_from env; and __fish_lsp_env_main_switch --any --no-names; and not __fish_contains_opt no-comments' -l no-comments -d 'skip outputting comments' +complete -c fish-lsp -n '__fish_seen_subcommand_from env; and __fish_lsp_env_main_switch --any --no-names; and not __fish_contains_opt no-global' -l no-global -d 'use local exports' +complete -c fish-lsp -n '__fish_seen_subcommand_from env; and __fish_lsp_env_main_switch --any --no-names; and not __fish_contains_opt no-local' -l no-local -d 'do not use local scope (pair with --no-global)' +complete -c fish-lsp -n '__fish_seen_subcommand_from env; and __fish_lsp_env_main_switch --any --no-names; and not __fish_contains_opt no-export' -l no-export -d 'do not export variables' +complete -c fish-lsp -n '__fish_seen_subcommand_from env; and __fish_lsp_env_main_switch --any --no-names; and not __fish_contains_opt confd' -l confd -d 'output for redirect to "conf.d/fish-lsp.fish"' +complete -c fish-lsp -n '__fish_seen_subcommand_from env; and __fish_lsp_env_main_switch --names-joined; and not __fish_contains_opt joined' -l joined -d 'output the names in a single line' + + +# built by any of the commands: +# fish-lsp complete > ~/.config/fish/completions/fish-lsp.fish +# fish-lsp complete > $fish_complete_path[1]/fish-lsp.fish +# fish-lsp complete > $__fish_config_dir/completions/fish-lsp.fish diff --git a/Configs/fish/.config/fish/conf.d/uv.env.fish b/Configs/fish/.config/fish/conf.d/uv.env.fish new file mode 100644 index 0000000..d97734b --- /dev/null +++ b/Configs/fish/.config/fish/conf.d/uv.env.fish @@ -0,0 +1,2 @@ + +source "$HOME/.local/share/../bin/env.fish" diff --git a/Configs/fish/.config/fish/config.fish b/Configs/fish/.config/fish/config.fish index b6bd022..cbde320 100644 --- a/Configs/fish/.config/fish/config.fish +++ b/Configs/fish/.config/fish/config.fish @@ -1,5 +1,3 @@ -. ~/.cargo/env.fish - if status is-interactive # Commands to run in interactive sessions can go here zoxide init --cmd cd fish | source diff --git a/Configs/fish/.config/fish/fish_variables b/Configs/fish/.config/fish/fish_variables index 85d7434..53cbe7a 100644 --- a/Configs/fish/.config/fish/fish_variables +++ b/Configs/fish/.config/fish/fish_variables @@ -47,6 +47,7 @@ SETUVAR fish_pager_color_selected_background:\x1d SETUVAR fish_pager_color_selected_completion:\x1d SETUVAR fish_pager_color_selected_description:\x1d SETUVAR fish_pager_color_selected_prefix:\x1d +SETUVAR fish_user_paths:/usr/local/sbin\x1e/usr/local/bin\x1e/usr/bin\x1e/var/lib/flatpak/exports/bin\x1e/home/aleidk/\x2elocal/bin SETUVAR pure_begin_prompt_with_current_directory:true SETUVAR pure_check_for_new_release:false SETUVAR pure_color_at_sign:pure_color_mute diff --git a/Configs/fish/.config/fish/functions/curl.fish b/Configs/fish/.config/fish/functions/curl.fish new file mode 100644 index 0000000..bd18505 --- /dev/null +++ b/Configs/fish/.config/fish/functions/curl.fish @@ -0,0 +1,19 @@ +function http --argument-names method url --description "Curl wrapper with cache options" + + argparse h/help c/cache '#cache_time' -- $argv + or return + + # If -h or --help is given, we print a little help text and return + if set -ql _flag_help + echo "http [-h|--help] [-s|--second] METHOD URL" + return 0 + end + + if set -ql _flag_cache + mkdir -p /tmp/fish_http + + curl -SsL -X (string upper $method) $url | tee /tmp/fish_http/(string escape --style=url $url) + else + curl -X (string upper $method) $url + end +end diff --git a/Configs/hypr/.config/hypr/hyprland.conf b/Configs/hypr/.config/hypr/hyprland.conf index 8d66b6b..ce6d9b7 100644 --- a/Configs/hypr/.config/hypr/hyprland.conf +++ b/Configs/hypr/.config/hypr/hyprland.conf @@ -13,12 +13,10 @@ # ── System apps ───────────────────────────────────────────────────────── exec-once = pipewire exec-once = udieskie -exec-once = /usr/libexec/polkit-gnome-authentication-agent-1 exec-once = hyprctl setcursor catppuccin-macchiato-lavender-cursors 24 # ── Utils ─────────────────────────────────────────────────────────────── -exec-once = ~/.cargo/bin/wpaperd -d -exec-once = waybar +exec-once = wpaperd -d exec-once = hyprpaper exec-once = mako @@ -31,11 +29,22 @@ source = ~/.config/hypr/theme.conf # ── Monitors ────────────────────────────────────────────────────────── monitor = , preferred, auto, 1 +monitorv2 { + output = desc:GWD ARZOPA 000000000000 + mode = 1920x1080@60, transform + position = auto + scale = 1 + transform = 3 # rotate 180° + supports_wide_color = true + supports_hdr = true +} monitor = WAYLAND-1, disable # hack for when running manually -# Some default env vars. -env = XCURSOR_SIZE,24 -env = QT_STYLE_OVERRIDE,kvantum +# Workaround for wrong wpaperd texture on vertical screen +# https://github.com/hyprwm/Hyprland/issues/9408#issuecomment-2661608482 +render { + expand_undersized_textures = false +} # ── Input devides ───────────────────────────────────────────────────── input { @@ -70,13 +79,13 @@ general { layout = master } -decoration { - rounding = 2 - drop_shadow = true - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba($baseAlphaee) -} +# decoration { +# rounding = 2 +# drop_shadow = true +# shadow_range = 4 +# shadow_render_power = 3 +# col.shadow = rgba($baseAlphaee) +# } animations { enabled = true @@ -126,10 +135,10 @@ workspace = 3, monitor:HDMI-A-1, persistent:true workspace = 4, monitor:HDMI-A-1, persistent:true workspace = 5, monitor:HDMI-A-1, persistent:true -workspace = 6, monitor:eDP-1, persistent:true -workspace = 7, monitor:eDP-1, persistent:true -workspace = 8, monitor:eDP-1, persistent:true -workspace = 9, monitor:eDP-1, persistent:true +workspace = 6, monitor:HDMI-A-2, persistent:true +workspace = 7, monitor:HDMI-A-2, persistent:true +workspace = 8, monitor:HDMI-A-2, persistent:true +workspace = 9, monitor:HDMI-A-2, persistent:true # ╭──────────────────────────────────────────────────────────╮ # │ Keybindings │ @@ -138,10 +147,10 @@ workspace = 9, monitor:eDP-1, persistent:true $mainMod = SUPER # $menu = bemenu-run -iwn --binding vim --vim-esc-exits --scrollbar autohide --fixed-height --counter always -l 20 -P '>' -p 'Open:' -B 2 -R 5 --cw '5x' --fn 'JetBrainsMono 13' --bdr '##$tealAlpha' --ab '##$baseAlpha' --af '##$textAlpha' --fb '##$baseAlpha' --ff '##$textAlpha' --cf '##$mauveAlpha' --hb '##$surface0Alpha' --hf '##$tealAlpha' --nb '##$baseAlpha' --nf '##$textAlpha' --tb '##$mauveAlpha' --tf '##$baseAlpha' --scb '##$surface0Alpha' --scf '##$mauveAlpha' -$menu = rofi -show drun +$menu = rofi -show drun -run-command "uwsm app -- {cmd}" # ── Spawn ───────────────────────────────────────────────────────────── -bind = $mainMod SHIFT, E, exit, +bind = $mainMod SHIFT, E, exec, uwsm stop bind = $mainMod, return, exec, kitty bind = $mainMod SHIFT, q, killactive, bind = $mainMod, D, exec, $menu diff --git a/Configs/nvim/.config/nvim/lazy-lock.json b/Configs/nvim/.config/nvim/lazy-lock.json index faa70a2..b6b7a5a 100644 --- a/Configs/nvim/.config/nvim/lazy-lock.json +++ b/Configs/nvim/.config/nvim/lazy-lock.json @@ -1,38 +1,38 @@ { - "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, - "blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" }, - "catppuccin": { "branch": "main", "commit": "e762a47478377612e59f01aa51db961f605c9aa4" }, + "blink.cmp": { "branch": "main", "commit": "81069e3955a8b4d5063287a2a6a47a844e9ca2cb" }, + "blink.compat": { "branch": "main", "commit": "08943fdf2eb00432d6205db6d0239434135416bd" }, + "catppuccin": { "branch": "main", "commit": "faf15ab0201b564b6368ffa47b56feefc92ce3f4" }, "comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" }, - "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, + "conform.nvim": { "branch": "master", "commit": "a203480a350b03092e473bf3001733d547160a73" }, "flatten.nvim": { "branch": "main", "commit": "72527798e75b5e34757491947c2cb853ce21dc0e" }, - "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "fzf-lua": { "branch": "main", "commit": "f22460450543aa773638135d6aa46c60ab92da99" }, + "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, + "fzf-lua": { "branch": "main", "commit": "758173f499d15410ecb50c5519a41b27c33e645d" }, "grapple.nvim": { "branch": "main", "commit": "b41ddfc1c39f87f3d1799b99c2f0f1daa524c5f7" }, "hardtime.nvim": { "branch": "main", "commit": "3541ad24faff78274669eceaf130502eb7f1261a" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, - "mason.nvim": { "branch": "main", "commit": "197f6352c276bbc2d25541dfce00ec50d1a4e88f" }, + "lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.nvim": { "branch": "main", "commit": "94cae4660a8b2d95dbbd56e1fbc6fcfa2716d152" }, - "neogen": { "branch": "main", "commit": "b2e78708876f4da507839726816010a68e33fec8" }, + "neogen": { "branch": "main", "commit": "dc50715c009f89b8111197fd2f282f6042daa7ea" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-dap": { "branch": "master", "commit": "5dd4d50f2e6a2eaf9e57fad023d294ef371bda35" }, - "nvim-dap-view": { "branch": "main", "commit": "c7385808c7d6a4438f6eef50d539d7103146ba2b" }, + "nvim-dap-view": { "branch": "main", "commit": "390dae6bf67f3342ebb481159932ef0fe54822ba" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, - "nvim-lint": { "branch": "master", "commit": "9c6207559297b24f0b7c32829f8e45f7d65b991f" }, - "nvim-lspconfig": { "branch": "master", "commit": "4d3b3bb8815fbe37bcaf3dbdb12a22382bc11ebe" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-context": { "branch": "master", "commit": "59f318a65d42a5c4037796886a8874fd57f774fc" }, + "nvim-lint": { "branch": "master", "commit": "6b46370d02cd001509a765591a3ffc481b538794" }, + "nvim-lspconfig": { "branch": "master", "commit": "f47cd681d7cb6048876a2e908b6d8ba1e530d152" }, + "nvim-treesitter": { "branch": "master", "commit": "8d4fdc5e47e2a4e00179e43f56221250ce365973" }, + "nvim-treesitter-context": { "branch": "master", "commit": "6b081ea63a3711243d11540ce28ccdb6f35ecd33" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, - "nvim-web-devicons": { "branch": "master", "commit": "0422a19d9aa3aad2c7e5cca167e5407b13407a9d" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "9c74db656c3d0b1c4392fc89a016b1910539e7c0" }, + "nvim-web-devicons": { "branch": "master", "commit": "edbe0a65cfacbbfff6a4a1e98ddd60c28c560509" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "render-markdown": { "branch": "main", "commit": "5c0e241bdbd208b7ae546009378d6bc93c083ef3" }, + "render-markdown": { "branch": "main", "commit": "6096cf3608b576a38fd1396227dbc0473091714d" }, "rustaceanvim": { "branch": "master", "commit": "66398662c07d265b226897500ed50eafba3dffb4" }, - "smart-splits.nvim": { "branch": "master", "commit": "825073e87de5fae98b0c107917e15977d100323b" }, + "smart-splits.nvim": { "branch": "master", "commit": "fc7bb00fe67ab504356bed4310d23c2e4cb4b06b" }, "transfer.nvim": { "branch": "main", "commit": "ab12253c09f83a5b0b6ee108fc131be45abe446a" }, - "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" }, - "ts-node-action": { "branch": "master", "commit": "b0850ecd82a508ad846ba250ea13485b0e13321e" }, + "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, + "ts-node-action": { "branch": "master", "commit": "6d3b60754fd87963d70eadaa2f77873b447eac26" }, "typescript-tools.nvim": { "branch": "master", "commit": "3c501d7c7f79457932a8750a2a1476a004c5c1a9" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, - "yazi.nvim": { "branch": "main", "commit": "6e4e9f0353f94ca4965c20dfc2690fb0d21730f0" } + "yazi.nvim": { "branch": "main", "commit": "053867916a9be3cb46f84b6f095ee731bbddd213" } } diff --git a/Configs/nvim/.config/nvim/lua/aleidk/options.lua b/Configs/nvim/.config/nvim/lua/aleidk/options.lua index e5eec57..2bd7f34 100644 --- a/Configs/nvim/.config/nvim/lua/aleidk/options.lua +++ b/Configs/nvim/.config/nvim/lua/aleidk/options.lua @@ -162,6 +162,8 @@ vim.lsp.config("rust-analyzer", { vim.lsp.enable({ "bashls", "biome", + "fish_lsp", + "hyprls", "lua_ls", "nushell", "pyright", diff --git a/Configs/nvim/.config/nvim/lua/aleidk/plugins/completion.lua b/Configs/nvim/.config/nvim/lua/aleidk/plugins/completion.lua index 47efc65..1cd8b6f 100644 --- a/Configs/nvim/.config/nvim/lua/aleidk/plugins/completion.lua +++ b/Configs/nvim/.config/nvim/lua/aleidk/plugins/completion.lua @@ -37,7 +37,6 @@ return { }, sources = { providers = { - dadbod = { name = "Dadbod", module = "vim_dadbod_completion.blink" }, lazydev = { name = "LazyDev", module = "lazydev.integrations.blink" }, luasnip = { name = 'luasnip', diff --git a/Configs/uwsm/.config/uwsm/env b/Configs/uwsm/.config/uwsm/env new file mode 100644 index 0000000..5387d79 --- /dev/null +++ b/Configs/uwsm/.config/uwsm/env @@ -0,0 +1,4 @@ +export QT_STYLE_OVERRIDE=kvantum +export MOZ_ENABLE_WAYLAND=1 +export XCURSOR_SIZE=24 +export GTK_THEME=catppuccin-macchiato-teal-standard+default diff --git a/Configs/waybar/.config/waybar/config.jsonc b/Configs/waybar/.config/waybar/config.jsonc index c2b5320..b0dfe6f 100644 --- a/Configs/waybar/.config/waybar/config.jsonc +++ b/Configs/waybar/.config/waybar/config.jsonc @@ -14,7 +14,7 @@ "modules-right": [ "tray", "idle_inhibitor", - "network", +// "network", "bluetooth", "backlight", "wireplumber", diff --git a/Configs/waybar/.config/waybar/style.css b/Configs/waybar/.config/waybar/style.css index 43618ce..9345d25 100644 --- a/Configs/waybar/.config/waybar/style.css +++ b/Configs/waybar/.config/waybar/style.css @@ -1,8 +1,9 @@ @import "./themes/catppuccin-macchiato.css"; *{ - font-size: 0.9rem; - font-family: JetBrainsMono Roboto, Helvetica, Arial, sans-serif; + font-size: 13px; + font-family: Open Sans, JetBrainsMono Nerd Font; + font-weight: 500; color: @text; } #waybar { @@ -89,7 +90,7 @@ box.modules-right { } #custom-power{ -color:#c47fd5; -margin-right:10px; -padding-right:14px; + color:#c47fd5; + margin-right:10px; + padding-right:14px; } diff --git a/Configs/wlogout/.config/wlogout/layout b/Configs/wlogout/.config/wlogout/layout index 26b8bf4..3e4d2f4 100644 --- a/Configs/wlogout/.config/wlogout/layout +++ b/Configs/wlogout/.config/wlogout/layout @@ -18,7 +18,7 @@ } { "label" : "shutdown", - "action" : "loginctl poweroff", + "action" : "systemctl -i poweroff", "text" : "Shutdown", "keybind" : "s" } @@ -30,7 +30,7 @@ } { "label" : "reboot", - "action" : "loginctl reboot", + "action" : "systemctl reboot", "text" : "Reboot", "keybind" : "r" } diff --git a/Configs/wpaperd/.config/wpaperd/config.toml b/Configs/wpaperd/.config/wpaperd/config.toml index 92febf9..10241b0 100644 --- a/Configs/wpaperd/.config/wpaperd/config.toml +++ b/Configs/wpaperd/.config/wpaperd/config.toml @@ -1,7 +1,10 @@ [default] duration = "10m" mode = "center" -sorting = "ascending" +sorting = "random" -[any] -path = "~/Pictures/Wallpapers/" +[HDMI-A-1] +path = "~/Pictures/Wallpapers/Landscape/" + +[HDMI-A-2] +path = "~/Pictures/Wallpapers/Portrait/" diff --git a/Configs/zsh/.zshrc b/Configs/zsh/.zshrc index 6b557a8..6dca07a 100644 --- a/Configs/zsh/.zshrc +++ b/Configs/zsh/.zshrc @@ -81,6 +81,8 @@ zinit cdreplay -q eval "$(zoxide init --cmd cd zsh)" -. "$HOME/.atuin/bin/env" +# . "$HOME/.atuin/bin/env" eval "$(atuin init zsh)" + +. "$HOME/.local/share/../bin/env"