update hypr fish and nvim

6 files changed, 28 insertions, 54 deletions

diff --git a/dot_config/fish/config.fish b/dot_config/fish/config.fish
index 26ec776..6e83a73 100644
--- a/dot_config/fish/config.fish
+++ b/dot_config/fish/config.fish
@@ -35,6 +35,7 @@ function copy
     end
 end
 
+set -U fish_complete_path $fish_complete_path /nix/var/nix/profiles/default/share/fish/vendor_completions.d
 set -Ux EDITOR nvim
 set -U fish_history_max 1000
 
@@ -45,5 +46,6 @@ alias untar='tar -zxvf '
 alias grep='grep --color=auto'
 alias cleanup='sudo pacman -Rns (pacman -Qtdq)'
 
+direnv hook fish | source
 zoxide init fish | source
 starship init fish | source
diff --git a/dot_config/fish/private_fish_variables b/dot_config/fish/private_fish_variables
index cd1276f..0a00f63 100644
--- a/dot_config/fish/private_fish_variables
+++ b/dot_config/fish/private_fish_variables
@@ -1,41 +1,10 @@
 # This file contains fish universal variable definitions.
 # VERSION: 3.0
 SETUVAR --export EDITOR:nvim
-SETUVAR --export STARSHIP_CONFIG:/home/pablu/\x2econfig/starship/starship\x2etoml
-SETUVAR __done_min_cmd_duration:10000
-SETUVAR __done_notification_urgency_level:low
 SETUVAR __fish_initialized:4300
-SETUVAR fish_color_autosuggestion:6c7086\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_cancel:f38ba8\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_command:89b4fa\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_comment:7f849c\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_cwd:f9e2af\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_cwd_root:\x1d
-SETUVAR fish_color_end:fab387\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_error:f38ba8\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_escape:eba0ac\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_gray:6c7086\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_history_current:\x1d
-SETUVAR fish_color_host:89b4fa\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_host_remote:a6e3a1\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_keyword:cba6f7\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_normal:cdd6f4\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_operator:f5c2e7\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_option:a6e3a1\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_param:f2cdcd\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_quote:a6e3a1\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_redirection:f5c2e7\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d313244\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_selection:\x2d\x2dbackground\x3d313244\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_status:f38ba8\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_user:94e2d5\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_color_valid_path:\x1d
+SETUVAR __fish_webconfig_theme_notification:set\x2dtheme\x2dv1\x2d\x232
+SETUVAR fish_complete_path:/home/pablu/\x2econfig/fish/completions\x1e/etc/fish/completions\x1e/home/pablu/\x2elocal/share/fish/vendor_completions\x2ed\x1e/usr/local/share/fish/vendor_completions\x2ed\x1e/usr/share/fish/vendor_completions\x2ed\x1e/home/pablu/\x2enix\x2dprofile/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/home/pablu/\x2ecache/fish/generated_completions\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed\x1e/nix/var/nix/profiles/default/share/fish/vendor_completions\x2ed
 SETUVAR fish_history_max:1000
-SETUVAR fish_pager_color_completion:cdd6f4\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_pager_color_description:6c7086\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_pager_color_prefix:f5c2e7\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_pager_color_progress:6c7086\x1e\x2d\x2dtheme\x3dcatppuccin\x2dmocha
-SETUVAR fish_pager_color_selected_background:\x1d
 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/dot_config/hypr/config/general.conf b/dot_config/hypr/config/general.conf
index 8c8b600..df2e16c 100644
--- a/dot_config/hypr/config/general.conf
+++ b/dot_config/hypr/config/general.conf
@@ -1,7 +1,5 @@
 monitor=DP-4,2560x1440@240,auto,1
 workspace=DP-3,1
-# monitor=DP-2,1920x1080@240,0x0,1
-  # workspace=DP-2,6
 monitor=DP-3,1920x1200@60,auto-left,1,transform,1
 workspace=DP-4,6
 
@@ -93,6 +91,7 @@ misc {
 # https://wiki.hyprland.org/Configuring/Variables/#input
 input {
     kb_layout = de
+    kb_variant = nodeadkeys
     follow_mouse = 1
 
     sensitivity = 0.2 # -1.0 - 1.0, 0 means no modification.
diff --git a/dot_config/hypr/config/programs.conf b/dot_config/hypr/config/programs.conf
index e710951..ec4fece 100644
--- a/dot_config/hypr/config/programs.conf
+++ b/dot_config/hypr/config/programs.conf
@@ -1,27 +1,23 @@
 $terminal = ghostty
-$fileManager = nautilus
 $menu = fuzzel
 $browser = firefox
-$discord = LIBVA_DRIVER_NAME=nvidia discord --ignore-gpu-blocklist --disable-features=UseOzonePlatform --enable-features=VaapiVideoDecoder --use-gl=desktop --enable-gpu-rasterization --enable-zero-copy
+$discord = webcord
+# LIBVA_DRIVER_NAME=nvidia discord --ignore-gpu-blocklist --disable-features=UseOzonePlatform --enable-features=VaapiVideoDecoder --use-gl=desktop --enable-gpu-rasterization --enable-zero-copy
 $hyprlock = ~/.config/hypr/fix-hypr-lock.sh 
 $spotify = LIBVA_DRIVER_NAME=nvidia spotify-launcher 
 $obs = obs
 $steam = steam
-# --enable-features=UseOzonePlatform --ozone-platform=wayland
 
-# exec-once = hyprctl dispatch workspace 1
 exec-once = [workspace 1 silent] $terminal
-# exec-once = [workspace 6 silent] $discord
 exec-once = [workspace 6 silent] $spotify
-# exec-once = [workspace 7 silent] $steam
 
-exec-once = xrandr --output DP-4 --primary 
+# exec-once = xrandr --output DP-4 --primary 
 exec-once = XDG_MENU_PREFIX=arch- kbuildsycoca6
 exec-once = sleep 2 && waybar &
 exec-once = hyprpaper
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec-once = dunst
-exec-once = polkit-kde-agent
-exec-once = playerctld daemon
 
-exec-once = $hyprlock
+exec-once = systemctl --user start hyprpolkitagent
+
+exec-once = playerctld daemon
diff --git a/dot_config/hypr/config/rules.conf b/dot_config/hypr/config/rules.conf
index fe0b7f4..76ec7ea 100644
--- a/dot_config/hypr/config/rules.conf
+++ b/dot_config/hypr/config/rules.conf
@@ -7,12 +7,6 @@ workspace=3,monitor:DP-4,persistent:true
 workspace=4,monitor:DP-4,persistent:true
 workspace=5,monitor:DP-4,persistent:true
 
-# workspace=6,monitor:DP-2,default:true,persistent:true
-# workspace=7,monitor:DP-2,persistent:true
-# workspace=8,monitor:DP-2,persistent:true
-# workspace=9,monitor:DP-2,persistent:true
-# workspace=10,monitor:DP-2,persistent:true
-
 workspace=6,monitor:DP-3,default:true,persistent:true
 workspace=7,monitor:DP-3,persistent:true
 workspace=8,monitor:DP-3,persistent:true
@@ -22,9 +16,22 @@ workspace=10,monitor:DP-3,persistent:true
 # Other
 windowrule = stay_focused on, match:class swappy
 windowrule = allows_input on, match:class discord
-windowrule = monitor DP-2, match:class discord
-windowrule = no_initial_focus on, match:initial_class steam
-windowrule = monitor DP-2, match:initial_class steam
+windowrule = monitor DP-3, match:class discord
+
+windowrule {
+  name = steam
+
+  match:class = steam
+
+  monitor = DP-3
+  workspace = 7 silent
+  no_initial_focus = on
+
+  focus_on_activate = off
+  suppress_event = activatefocus
+  no_focus = on
+  no_focus = on
+}
 
 windowrule = float on, match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$
 windowrule = no_focus on, match:class ^(jetbrains-.*)$, match:title ^(win[0-9]+)$
diff --git a/dot_config/nvim/lua/plugins/lsp.lua b/dot_config/nvim/lua/plugins/lsp.lua
index 2c5d398..551161b 100644
--- a/dot_config/nvim/lua/plugins/lsp.lua
+++ b/dot_config/nvim/lua/plugins/lsp.lua
@@ -15,6 +15,7 @@ return {
       "rust_analyzer",
       "templ",
       "tailwindcss",
+      "nil_ls"
     })