diff --git a/fish/config.fish b/fish/config.fish index 917d9c4..cffb69f 100644 --- a/fish/config.fish +++ b/fish/config.fish @@ -24,7 +24,7 @@ alias g+='bear -- g++ -Wextra -Werror -std=c++20' alias s="kitty +kitten ssh" alias zl='z "" ' alias jo='joshuto' -alias nv='neovide --no-vsync --no-fork --no-multigrid' +alias nv='neovide' alias cr='cargo run' alias grep='rg' alias cat='bat' diff --git a/fish/functions/_tide_detect_os.fish b/fish/functions/_tide_detect_os.fish index 5d96053..5a3263f 100644 --- a/fish/functions/_tide_detect_os.fish +++ b/fish/functions/_tide_detect_os.fish @@ -6,7 +6,7 @@ function _tide_detect_os 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*' + 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 @@ -53,11 +53,11 @@ function _tide_detect_os_linux_cases -a file key 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 + 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 + 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 diff --git a/fish/functions/_tide_item_direnv.fish b/fish/functions/_tide_item_direnv.fish new file mode 100644 index 0000000..5084674 --- /dev/null +++ b/fish/functions/_tide_item_direnv.fish @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..5e06a8b --- /dev/null +++ b/fish/functions/_tide_item_distrobox.fish @@ -0,0 +1,4 @@ +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 index 43d46cb..c419695 100644 --- a/fish/functions/_tide_item_git.fish +++ b/fish/functions/_tide_item_git.fish @@ -1,10 +1,10 @@ function _tide_item_git - if git branch --show-current 2>/dev/null | string replace -r ".+(.{$tide_git_truncation_length})" '…$1' | read -l location + 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 replace -r ".+(.{$tide_git_truncation_length})" '…$1' | read location + 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 @@ -40,8 +40,8 @@ function _tide_item_git # 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 - stat=(git $_set_dir_opt --no-optional-locks status --porcelain 2>/dev/null) \ - string match -qr '(0|(?.*))\n(0|(?.*))\n(0|(?.*)) + 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 diff --git a/fish/functions/_tide_item_pulumi.fish b/fish/functions/_tide_item_pulumi.fish new file mode 100644 index 0000000..9f5e2db --- /dev/null +++ b/fish/functions/_tide_item_pulumi.fish @@ -0,0 +1,19 @@ +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_toolbox.fish b/fish/functions/_tide_item_toolbox.fish index 28975d3..0b33f29 100644 --- a/fish/functions/_tide_item_toolbox.fish +++ b/fish/functions/_tide_item_toolbox.fish @@ -1,3 +1,4 @@ function _tide_item_toolbox - test -e /run/.toolboxenv && _tide_print_item toolbox $tide_toolbox_icon' ' $hostname + test -e /run/.toolboxenv && + _tide_print_item toolbox $tide_toolbox_icon' ' (string match -rg 'name="(.*)"' \$trunc.)\" \$dir_section && v=\$parent_dir/\$trunc*/ set -q v[2] + string match -qr \"(?\..|.)\" \$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 diff --git a/fish/functions/_tide_remove_unusable_items.fish b/fish/functions/_tide_remove_unusable_items.fish index f1111cb..a2e5698 100644 --- a/fish/functions/_tide_remove_unusable_items.fish +++ b/fish/functions/_tide_remove_unusable_items.fish @@ -1,9 +1,13 @@ 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 docker git go java kubectl nix_shell node php rustc terraform toolbox virtual_env + 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 diff --git a/fish/functions/tide.fish b/fish/functions/tide.fish index 1a58f40..84bbbf1 100644 --- a/fish/functions/tide.fish +++ b/fish/functions/tide.fish @@ -2,7 +2,7 @@ function tide --description 'Manage your Tide prompt' argparse --stop-nonopt v/version h/help -- $argv if set -q _flag_version - echo 'tide, version 5.5.1' + echo 'tide, version 5.6.0' else if set -q _flag_help _tide_help else if functions --query _tide_sub_$argv[1] diff --git a/fish/functions/tide/configure/configs/classic.fish b/fish/functions/tide/configure/configs/classic.fish index 9b23f37..f844676 100644 --- a/fish/functions/tide/configure/configs/classic.fish +++ b/fish/functions/tide/configure/configs/classic.fish @@ -24,10 +24,24 @@ 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 @@ -41,6 +55,7 @@ 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  @@ -80,6 +95,9 @@ 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 @@ -89,7 +107,7 @@ 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 node virtual_env rustc java php chruby go kubectl toolbox terraform aws nix_shell crystal +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  diff --git a/fish/functions/tide/configure/configs/classic_16color.fish b/fish/functions/tide/configure/configs/classic_16color.fish index acdc411..6043117 100644 --- a/fish/functions/tide/configure/configs/classic_16color.fish +++ b/fish/functions/tide/configure/configs/classic_16color.fish @@ -12,8 +12,18 @@ 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 @@ -45,6 +55,8 @@ 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 diff --git a/fish/functions/tide/configure/configs/lean.fish b/fish/functions/tide/configure/configs/lean.fish index 2565e0a..853bde9 100644 --- a/fish/functions/tide/configure/configs/lean.fish +++ b/fish/functions/tide/configure/configs/lean.fish @@ -24,10 +24,24 @@ 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 @@ -41,6 +55,7 @@ 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  @@ -80,6 +95,9 @@ 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 @@ -89,7 +107,7 @@ 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 node virtual_env rustc java php chruby go kubectl toolbox terraform aws nix_shell crystal +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 ' ' diff --git a/fish/functions/tide/configure/configs/lean_16color.fish b/fish/functions/tide/configure/configs/lean_16color.fish index 49a8606..546868d 100644 --- a/fish/functions/tide/configure/configs/lean_16color.fish +++ b/fish/functions/tide/configure/configs/lean_16color.fish @@ -12,8 +12,18 @@ 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 @@ -45,6 +55,8 @@ 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 diff --git a/fish/functions/tide/configure/configs/rainbow.fish b/fish/functions/tide/configure/configs/rainbow.fish index 39ce7bb..5087f36 100644 --- a/fish/functions/tide/configure/configs/rainbow.fish +++ b/fish/functions/tide/configure/configs/rainbow.fish @@ -24,10 +24,24 @@ 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 @@ -41,6 +55,7 @@ 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  @@ -80,6 +95,9 @@ 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 @@ -89,7 +107,7 @@ 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 node virtual_env rustc java php chruby go kubectl toolbox terraform aws nix_shell crystal +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  diff --git a/fish/functions/tide/configure/configs/rainbow_16color.fish b/fish/functions/tide/configure/configs/rainbow_16color.fish index c102e2f..7803596 100644 --- a/fish/functions/tide/configure/configs/rainbow_16color.fish +++ b/fish/functions/tide/configure/configs/rainbow_16color.fish @@ -12,8 +12,18 @@ 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 @@ -45,6 +55,8 @@ 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 diff --git a/gtk-4.0/servers b/gtk-4.0/servers index 847a392..54cbf3a 100644 --- a/gtk-4.0/servers +++ b/gtk-4.0/servers @@ -3,12 +3,12 @@ xmlns:bookmark="http://www.freedesktop.org/standards/desktop-bookmarks" xmlns:mime="http://www.freedesktop.org/standards/shared-mime-info" > - + Windows shares on 192.168.1.4 - + diff --git a/hypr/conf/env.conf b/hypr/conf/env.conf index 092f811..b70ae3c 100644 --- a/hypr/conf/env.conf +++ b/hypr/conf/env.conf @@ -1,21 +1,19 @@ -# #fix the fucking portal exec-once=systemctl --user import-environment exec-once=dbus-update-activation-environment --systemd --all -# -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=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=XCURSOR_SIZE,24 -env=PKG_CONFIG_PATH,/usr/local/lib/pkgconfig -env=LD_LIBRARY_PATH,/usr/local/lib -env=EDITOR,"neovide --novsync --nofork" +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 = 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 diff --git a/hypr/conf/general.conf b/hypr/conf/general.conf index 19f6b32..d81deca 100644 --- a/hypr/conf/general.conf +++ b/hypr/conf/general.conf @@ -1,4 +1,3 @@ - input { kb_layout=diaeresis repeat_delay=200 @@ -12,13 +11,14 @@ input { } general { - sensitivity=1.0 # for mouse cursor + sensitivity=1.0 gaps_in=3 3 3 3 gaps_out=2 5 5 5 border_size=3 col.active_border=0xFFFF0000 0xFF00FF00 0xFF0000FF 45deg col.inactive_border=0x66333333 - apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse) + apply_sens_to_raw=0 + allow_tearing=true } decoration { @@ -52,5 +52,5 @@ misc { disable_splash_rendering = true disable_hyprland_logo = true swallow_regex=^(.*)(kitty)(.*)$ - layers_hog_keyboard_focus=false + layers_hog_keyboard_focus=true } diff --git a/hypr/conf/keybinds.conf b/hypr/conf/keybinds.conf index 88168e2..8f0b67e 100644 --- a/hypr/conf/keybinds.conf +++ b/hypr/conf/keybinds.conf @@ -1,22 +1,22 @@ -# binds +#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 "0,0 3440x1440" - | wl-copy + +#Programs bind=SUPER,F,exec,firefox bind=SUPER,T,exec,kitty -1 -bind=SUPER,Q,killactive, -bind=SUPERSHIFTALT,M,exit, bind=SUPER,E,exec,nautilus -w -bind=SUPER,N,exec,neovide --novsync +bind=SUPER,N,exec,neovide bind=SUPER,M,exec,oxidash -bind=SUPER,V,togglefloating, -bind=SUPER,B,fullscreen, bind=SUPER,R,exec,anyrun -bind=SUPER,C,togglesplit bind=SUPER,G,exec,oxicalc -bind=SUPERSHIFT,G,exec,gamelock +bind=SUPER,D,exec,oxishut +bind=SUPER,A,exec,copyq toggle bind=SUPERSHIFT,L,exec, playerctl -a pause & swaylock -c 000000 & systemctl suspend + +#Media Keys bind=,XF86AudioMute,exec,pactl $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% @@ -25,27 +25,37 @@ 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% -bind=SUPER,D,exec,oxishut -bind=SUPER,A,exec,copyq toggle + +#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 -# bind=SUPER,W,movetoworkspace,special - +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 @@ -57,6 +67,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 @@ -68,6 +79,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 @@ -79,15 +91,13 @@ 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 -bindm=SUPER,mouse:272,movewindow -bindm=SUPER,mouse:273,resizewindow - #binds for debug testing # bind=SUPERALT,J,pass,^(wlroots)$ # bind=SUPERALT,left,pass,^(wlroots)$ diff --git a/hypr/conf/monitor.conf b/hypr/conf/monitor.conf index e46ea69..72a629a 100644 --- a/hypr/conf/monitor.conf +++ b/hypr/conf/monitor.conf @@ -1,22 +1,21 @@ -monitor=DP-3,2560x1440@165,-2560x0,1 -monitor=DP-1,3440x1440@180,0x0,1 -monitor=DP-2,1920x1200@60,3440x0,1 -monitor=DP-2,transform,1 +# monitors +monitor=DP-2,2560x1440@165,0x0,1 +monitor=DP-1,3440x1440@180,2560x0,1 +monitor=HDMI-A-1,1920x1200@60,6000x0,1 +monitor=HDMI-A-1,transform,1 + monitor=,highrr,auto,1 -workspace=DP-3,1 -workspace=DP-1,2 -workspace=DP-2,3 - -workspace = 2,monitor:DP-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-3 -workspace = 5,monitor:DP-3 -workspace = 3,monitor:DP-2 +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 index a46e6f7..dce154d 100644 --- a/hypr/conf/plugins.conf +++ b/hypr/conf/plugins.conf @@ -1,13 +1,12 @@ -#plugin = $HOME/.config/hypr/plugins/libhycov.so exec-once= hyprpm reload -n && hyprctl reload plugin { hycov { - enable_hotarea = 0 # enable mouse cursor hotarea - overview_gappo = 30 #gas width from screem - overview_gappi = 10 #gas width from clients - bind = SUPER,W,hycov:toggleoverview + enable_hotarea = 0 + overview_gappo = 30 + overview_gappi = 10 auto_fullscreen = 0 + bind = SUPER,W,hycov:toggleoverview } } diff --git a/hypr/conf/rules.conf b/hypr/conf/rules.conf index 42f25af..9207c11 100644 --- a/hypr/conf/rules.conf +++ b/hypr/conf/rules.conf @@ -4,8 +4,6 @@ windowrule=float,^(.*)(OxiCalc)(.*)$ windowrule=float,^(.*)(winecfg.exe)(.*)$ windowrule=float,^(.*)(speed.exe)(.*)$ windowrule=float,^(.*)(copyq)(.*)$ -# windowrule=center,^(.*)(gnome)(.*)$ -# windowrule=size 1200 800,^(org.gnome.NautilusPreviewer)$ windowrule=center,^(.*)(swappy)(.*)$ windowrule=float,title:^(.*)(Spirit)(.*)$ windowrule=float,title:^(.*)(reset)(.*)$ @@ -15,3 +13,5 @@ windowrule=workspace 9 silent,^(.*)(battlebits)(.*)$ windowrule=workspace 9 silent,^(.*)(aoe)(.*)$ windowrule=nomaximizerequest,^(.*)(neovide)(.*)$ windowrule=nofullscreenrequest,^(.*)(neovide)(.*)$ +windowrulev2=immediate,class:^(.*)(Pal)$ +windowrulev2=forceinput,class:^(.*)(Pal)$ diff --git a/hypr/hyprgreet.conf b/hypr/hyprgreet.conf index c14d707..8ccbd63 100644 --- a/hypr/hyprgreet.conf +++ b/hypr/hyprgreet.conf @@ -1,9 +1,8 @@ -#exec-once=gsettings set org.gnome.desktop.interface gtk-theme 'adw-gtk3-dark' exec-once=gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark' monitor=DP-1,3440x1440@180,0x0,1 monitor=DP-2,disable -monitor=DP-3,disable +monitor=HDMI-A-1,disable input { force_no_accel = true diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf index a3a340b..d6cbd32 100644 --- a/hypr/hyprpaper.conf +++ b/hypr/hyprpaper.conf @@ -3,6 +3,8 @@ preload = /home/dashie/Pictures/backgrounds/tree_1200.jpg preload = /home/dashie/Pictures/backgrounds/pxfuel.jpg preload = /home/dashie/Pictures/backgrounds/pxfuel(3).jpg -wallpaper = DP-2,/home/dashie/Pictures/backgrounds/tree_1200.jpg +wallpaper = HDMI-A-1,/home/dashie/Pictures/backgrounds/tree_1200.jpg wallpaper = DP-1,/home/dashie/Pictures/backgrounds/pxfuel.jpg -wallpaper = DP-3,/home/dashie/Pictures/backgrounds/pxfuel(3).jpg +wallpaper = DP-2,/home/dashie/Pictures/backgrounds/pxfuel(3).jpg + +splash = true diff --git a/hypr/plugins/libhycov.so b/hypr/plugins/libhycov.so deleted file mode 100755 index d89d735..0000000 Binary files a/hypr/plugins/libhycov.so and /dev/null differ diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index d4116e2..4dfddaf 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,87 +1,87 @@ { - "LazyVim": { "branch": "main", "commit": "879e29504d43e9f178d967ecc34d482f902e5a91" }, - "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" }, - "SchemaStore.nvim": { "branch": "main", "commit": "fcb1522fefd0f9029b7dc71aa2664d2d0ead0fb3" }, - "alpha-nvim": { "branch": "main", "commit": "29074eeb869a6cbac9ce1fbbd04f5f5940311b32" }, - "bufferline.nvim": { "branch": "main", "commit": "e48ce1805697e4bb97bc171c081e849a65859244" }, - "catppuccin": { "branch": "main", "commit": "5e36ca599f4aa41bdd87fbf2c5aae4397ac55074" }, + "LazyVim": { "branch": "main", "commit": "c433ea7aa842c446edc2b1570998bf5440c68188" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, + "SchemaStore.nvim": { "branch": "main", "commit": "898a19cb54f310dda7cdeedf3d75aeeffcf19136" }, + "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" }, + "bufferline.nvim": { "branch": "main", "commit": "b15c6daf5a64426c69732b31a951f4e438cb6590" }, + "catppuccin": { "branch": "main", "commit": "c2034f7b549152e5cc757820426341ea5000bc7a" }, "clangd_extensions.nvim": { "branch": "main", "commit": "34c8eaa12be192e83cd4865ce2375e9f53e728f2" }, - "cmake-tools.nvim": { "branch": "master", "commit": "5c39242383f5db39b04248bb5c65e0b72f984b22" }, - "cmp-async-path": { "branch": "main", "commit": "d8229a93d7b71f22c66ca35ac9e6c6cd850ec61d" }, + "cmake-tools.nvim": { "branch": "master", "commit": "055d7bb37d5c4038ce1e400656b6504602934ce7" }, + "cmp-async-path": { "branch": "main", "commit": "9d581eec5acf812316913565c135b0d1ee2c9a71" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "75e7c5c7eb5fbd53f8b12dc420b31ec70770b231" }, - "crates.nvim": { "branch": "main", "commit": "6d779c7b85139d89d92a4a0bcf0afbdcf0cd961a" }, - "dressing.nvim": { "branch": "master", "commit": "94b0d24483d56f3777ee0c8dc51675f21709318c" }, - "edgy.nvim": { "branch": "main", "commit": "8355be45610afdf79a0bab32b91ee297997455b4" }, + "conform.nvim": { "branch": "master", "commit": "c0e0e80f0c233cb3a249f719a44324c660163a3f" }, + "crates.nvim": { "branch": "main", "commit": "ec2b04a380c9f3a8e6ca38c230e4990d71978143" }, + "dressing.nvim": { "branch": "master", "commit": "6f212262061a2120e42da0d1e87326e8a41c0478" }, + "edgy.nvim": { "branch": "main", "commit": "0b35dc6da4cae6cc2f724bc610eadf955cd2319b" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, - "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" }, - "git-blame.nvim": { "branch": "master", "commit": "f07e913b7143f19edd6787229f2d51759b478600" }, - "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" }, + "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" }, + "git-blame.nvim": { "branch": "master", "commit": "196602b570b1d754b7b8f9a9f75fa7bd88f12ef8" }, + "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" }, "headlines.nvim": { "branch": "master", "commit": "e3d7bfdf40e41a020d966d35f8b48d75b90367d2" }, "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3c8a185da4b8ab7aef487219f5e001b11d4b6aaf" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, "instant.nvim": { "branch": "master", "commit": "294b6d08143b3db8f9db7f606829270149e1a786" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "ltex_extra.nvim": { "branch": "master", "commit": "9bed99b2b8488cc2daf66c76d2e0cf051ee80d13" }, - "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, + "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, + "ltex_extra.nvim": { "branch": "master", "commit": "42dd3572cb09b52a137e91e515f2dff5eb631b1e" }, + "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" }, - "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, - "mini.ai": { "branch": "main", "commit": "f7787cff9cc42004f722ca1e64e6af4e64e34177" }, + "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, + "mini.ai": { "branch": "main", "commit": "3ad9d455a91b8bf3c24d4e50518d9a6b9dddb42c" }, "mini.bufremove": { "branch": "main", "commit": "020243bfed8c8b941f2c20626faf3ea39c0c0e1b" }, - "mini.comment": { "branch": "main", "commit": "67f00d3ebbeae15e84584d971d0c32aad4f4f3a4" }, - "mini.indentscope": { "branch": "main", "commit": "5a8369475cd7cd6f207a4d288406d03b0fc48bdb" }, + "mini.comment": { "branch": "main", "commit": "b0b359ada4293cdcea7ab4072dfd5b031aac3f8e" }, + "mini.indentscope": { "branch": "main", "commit": "ca129b71edb672d30b8d7ec3138106db1b1f6a8b" }, "mini.pairs": { "branch": "main", "commit": "552062017ff207e1f35f7028bfb3f27c7421d22d" }, - "mini.surround": { "branch": "main", "commit": "7bf8915ba15d7a4f3c2afe7868d3c15a858d73f1" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "77d9f484b88fd380386b46ed9206e5374d69d9d8" }, - "neoconf.nvim": { "branch": "main", "commit": "64437787dba70fce50dad7bfbb97d184c5bc340f" }, - "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" }, - "neoscroll.nvim": { "branch": "master", "commit": "be4ebf855a52f71ca4338694a5696675d807eff9" }, - "neotest": { "branch": "master", "commit": "1ee3fcc150207f33dba8c9b3f478e5a0148d661d" }, - "neotest-go": { "branch": "main", "commit": "d29d20d912aca81a07c50022d880cc66f0d26542" }, - "neotest-python": { "branch": "master", "commit": "86ac2bbc8a4da3f203e56d9303d6ed1d7e50c1f6" }, - "neotest-rust": { "branch": "main", "commit": "3c06f239ad260f02c8678141e08b57d20fbe2c55" }, + "mini.surround": { "branch": "main", "commit": "5ceb6a12d3761bc719fbdad5432c89333deb1498" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "e578fe7a5832421b0d2c5b3c0a7a1e40e0f6a47a" }, + "neoconf.nvim": { "branch": "main", "commit": "4b61c859853a6f62ed14c8b85cf2e5ab85f50c46" }, + "neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" }, + "neoscroll.nvim": { "branch": "master", "commit": "6e3546751076890304428150e53bd59198a4505d" }, + "neotest": { "branch": "master", "commit": "89a5b1fc22ee5d459262955fe564c3d14e35fd67" }, + "neotest-go": { "branch": "main", "commit": "17579611af5d47bea5ff4d77e6493a6d647d3a15" }, + "neotest-python": { "branch": "master", "commit": "2e83d2bc00acbcc1fd529dbf0a0e677cabfe6b50" }, + "neotest-rust": { "branch": "main", "commit": "392b54e18174b8c69eba779f94a9fd0b318d383e" }, "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, - "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, - "nvim-dap": { "branch": "master", "commit": "aad46274f09ba29933e4cef2257cdda5ec19cf7a" }, + "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, + "nvim-dap": { "branch": "master", "commit": "780fd4dd06b0744b235a520d71660c45279d9447" }, "nvim-dap-go": { "branch": "main", "commit": "a5cc8dcad43f0732585d4793deb02a25c4afb766" }, - "nvim-dap-python": { "branch": "master", "commit": "091e4ae00a12085f9ed4200a3cd04af7179b8a23" }, - "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" }, + "nvim-dap-python": { "branch": "master", "commit": "f5b6f3a90aae0284b61fb3565e575267c19a16e6" }, + "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "d4542ac257d3c7ee4131350db6179ae6340ce40b" }, - "nvim-jdtls": { "branch": "master", "commit": "66b5ace68a5d1c45fdfb1afa8d847e87af2aa1f8" }, - "nvim-lint": { "branch": "master", "commit": "8df53b5dde8ea80f0a039775777eae6648a10229" }, - "nvim-lspconfig": { "branch": "master", "commit": "796394fd19fb878e8dbc4fd1e9c9c186ed07a5f4" }, - "nvim-spectre": { "branch": "master", "commit": "d8906855f1949ac97b1e77aaf8d3fe12ed158ddc" }, - "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" }, - "nvim-treesitter-context": { "branch": "master", "commit": "400a99ad43ac78af1148061da3491cba2637ad29" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "85b9d0cbd4ff901abcda862b50dbb34e0901848b" }, - "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" }, - "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" }, + "nvim-jdtls": { "branch": "master", "commit": "4f4de4d80e1df43d58e5e21677fca4c63676664d" }, + "nvim-lint": { "branch": "master", "commit": "985ce08212551f6c5d661ce00d7e1e38aa22f51e" }, + "nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" }, + "nvim-spectre": { "branch": "master", "commit": "6a0785ef64c839d935a2f92e20988e962fb6537e" }, + "nvim-treesitter": { "branch": "master", "commit": "5973b617a9a48212e40c5c0a0727ad7c91b27484" }, + "nvim-treesitter-context": { "branch": "master", "commit": "9c06b115abc57c99cf0aa81dc29490f5001f57a1" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" }, + "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, + "nvim-web-devicons": { "branch": "master", "commit": "313d9e7193354c5de7cdb1724f9e2d3f442780b0" }, "omnisharp-extended-lsp.nvim": { "branch": "main", "commit": "4be2e8689067494ed7e5a4f1221adc31d1a07783" }, - "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" }, - "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, + "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" }, + "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "bc25c56083939f274edcfe395c6ff7de23b67c50" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "4bd5657b14b58e069287f5ac591a647bb860b2ed" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "6dd6522bc1a4cbe5883eb0272f5cc7a54ae3858b" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope-project.nvim": { "branch": "master", "commit": "1aaf16580a614601a7f7077d9639aeb457dc5559" }, "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" }, - "telescope.nvim": { "branch": "master", "commit": "4367e05c06d19f28c514e1498bcd9410f4bc65b2" }, - "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" }, - "tokyonight.nvim": { "branch": "main", "commit": "f247ee700b569ed43f39320413a13ba9b0aef0db" }, - "tree-sitter-hypr": { "branch": "master", "commit": "42aa7274b5f093cec92b7a5bab629ba26b4be439" }, + "telescope.nvim": { "branch": "master", "commit": "236083884cfe6c874e03e6cb4e7cb08809c1333c" }, + "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, + "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" }, + "tree-sitter-hyprlang": { "branch": "master", "commit": "e60fc858e6327a15c0b26f99ec96945fecd1e4ee" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, - "typst.vim": { "branch": "main", "commit": "630bb8b7faf1fe02c253673a37a70c135ad43a40" }, - "venv-selector.nvim": { "branch": "main", "commit": "79709f8ad99ac2082d99a713985f3da0c924f4a2" }, - "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, + "typst.vim": { "branch": "main", "commit": "e28d440c7ba4df2516d7d7f908c4fb664a8cf86c" }, + "venv-selector.nvim": { "branch": "main", "commit": "fcb30164f2c4f8a34a305ead3247954a1fd8634f" }, + "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" }, - "vim-visual-multi": { "branch": "master", "commit": "aec289a9fdabaa0ee6087d044d75b32e12084344" }, - "vimtex": { "branch": "master", "commit": "f9b19d09ee6f0ba70dad0b5c2e710dd700681000" }, + "vim-visual-multi": { "branch": "master", "commit": "e67f7fa011c98fc5426352d3bb06362a0f70af3c" }, + "vimtex": { "branch": "master", "commit": "f36e5856d85ff97aced152020ac92e3e3a10096b" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file diff --git a/nvim/lua/plugins/plugins.lua b/nvim/lua/plugins/plugins.lua index 45c7d35..c73c8fd 100644 --- a/nvim/lua/plugins/plugins.lua +++ b/nvim/lua/plugins/plugins.lua @@ -36,12 +36,6 @@ return { require("telescope").load_extension("harpoon") end, }, - { - "iamcco/markdown-preview.nvim", - lazy = true, - event = "FileType markdown", - build = "cd app && yarn install", - }, { "nvim-telescope/telescope-project.nvim", lazy = true, diff --git a/nvim/snippets/typst.lua b/nvim/snippets/typst.lua index 6742046..32b52d3 100644 --- a/nvim/snippets/typst.lua +++ b/nvim/snippets/typst.lua @@ -94,14 +94,14 @@ local patternSnippet = s( *Problem* | {2}\ *Solution* | {3}\ #set text(size: 11pt) - {5} + {4} #columns(2, [ #text(green)[Benefits] - - {6} + - {5} #colbreak() #text(red)[Liabilities] - - {7} + - {6} ]) ]], { @@ -111,7 +111,6 @@ local patternSnippet = s( i(4, ""), i(5, ""), i(6, ""), - i(7, ""), } ) ) diff --git a/setup.sh b/setup.sh index f7ee387..7a7cd79 100755 --- a/setup.sh +++ b/setup.sh @@ -3,15 +3,22 @@ mv $HOME/.config/.zshrc ../.zshrc unlink $HOME/.config/.git unlink $HOME/.config/.gitignore unlink $HOME/.config/README.md -unlink $HOME/.config/hypr_desktop -unlink $HOME/.config/hypr_laptop unlink $HOME/.config/setup.sh unlink $HOME/.config/dotFiles +sudo pacman -S rustup +rustup default nightly +cargo install paru +pac load + gsettings set org.gnome.desktop.interface gtk-theme 'adw-gtk3' && gsettings set org.gnome.desktop.interface color-scheme 'default' -if [ "$1" = "laptop" ]; then - ln -s $PWD/hypr_laptop $HOME/.config/hypr -elif [ "$1" = "desktop" ]; then - ln -s $PWD/hypr_desktop $HOME/.config/hypr -fi +cargo install oxinoti +cargo install oxidash +cargo install oxishut +cargo install hyprdock +cargo install reset + +flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo + +reboot