fixed fish

6 files changed, 115 insertions, 2 deletions

diff --git a/.gitignore b/.gitignore
index 22e6016..22ec575 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,7 +19,6 @@ go/telemetry/local
 git
 btop
 fastfetch
-fish
 paru
 superfile
 tlpui
diff --git a/fish/config.fish b/fish/config.fish
new file mode 100644
index 0000000..3711bc3
--- /dev/null
+++ b/fish/config.fish
@@ -0,0 +1,36 @@
+#!/bin/fish
+
+function fish_prompt
+    printf '%s%s%s $ ' \ (set_color $fish_color_cwd) (prompt_pwd --full-length-dirs 5) (set_color normal)
+end
+
+function start_niri
+  # Make sure there's no already running session.
+  if systemctl --user -q is-active niri.service
+    echo 'A Niri session is already running.'
+    exit 1
+  end
+  # Reset failed state of all user units
+  systemctl --user reset-failed
+  # Import the login manager environment.
+  # systemctl --user import-environment
+  # DBus activation environment is independent from systemd. While most of
+  # dbus-activated services are already using `SystemdService` directive, some
+  # still don't and thus we should set the dbus environment with a separate
+  # command.
+  dbus-update-activation-environment --all
+  # Start niri and wait for it to terminate.
+  systemctl --user --wait start niri.service
+  # Force stop of graphical-session.target.
+  systemctl --user start --job-mode=replace-irreversibly niri-shutdown.target
+  # Unset environment that we've set.
+  systemctl --user unset-environment WAYLAND_DISPLAY XDG_SESSION_TYPE XDG_CURRENT_DESKTOP NIRI_SOCKET
+end
+
+fish_add_path -p ~/.cargo/bin ~/.ghcup/bin
+set -U fish_greeting
+
+if status is-login
+  start_niri
+  kill $fish_pid
+end
diff --git a/fish/fish_plugins b/fish/fish_plugins
new file mode 100644
index 0000000..797cf45
--- /dev/null
+++ b/fish/fish_plugins
@@ -0,0 +1 @@
+catppuccin/fish
diff --git a/fish/fish_variables b/fish/fish_variables
new file mode 100644
index 0000000..8bdfbd6
--- /dev/null
+++ b/fish/fish_variables
@@ -0,0 +1,47 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __fish_initialized:3400
+SETUVAR _fisher_catppuccin_2F_fish_files:\x7e/\x2econfig/fish/themes/Catppuccin\x20Frappe\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Latte\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Macchiato\x2etheme\x1e\x7e/\x2econfig/fish/themes/Catppuccin\x20Mocha\x2etheme
+SETUVAR _fisher_plugins:catppuccin/fish
+SETUVAR _fisher_upgraded_to_4_4:\x1d
+SETUVAR fish_color_autosuggestion:6e738d
+SETUVAR fish_color_cancel:ed8796
+SETUVAR fish_color_command:8aadf4
+SETUVAR fish_color_comment:8087a2
+SETUVAR fish_color_cwd:eed49f
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:f5a97f
+SETUVAR fish_color_error:ed8796
+SETUVAR fish_color_escape:ee99a0
+SETUVAR fish_color_gray:6e738d
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:8aadf4
+SETUVAR fish_color_host_remote:a6da95
+SETUVAR fish_color_keyword:ed8796
+SETUVAR fish_color_normal:cad3f5
+SETUVAR fish_color_operator:f5bde6
+SETUVAR fish_color_option:a6da95
+SETUVAR fish_color_param:f0c6c6
+SETUVAR fish_color_quote:a6da95
+SETUVAR fish_color_redirection:f5bde6
+SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d363a4f
+SETUVAR fish_color_selection:\x2d\x2dbackground\x3d363a4f
+SETUVAR fish_color_status:ed8796
+SETUVAR fish_color_user:8bd5ca
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_greeting:\x1d
+SETUVAR fish_key_bindings:fish_default_key_bindings
+SETUVAR fish_pager_color_background:\x1d
+SETUVAR fish_pager_color_completion:cad3f5
+SETUVAR fish_pager_color_description:6e738d
+SETUVAR fish_pager_color_prefix:f5bde6
+SETUVAR fish_pager_color_progress:6e738d
+SETUVAR fish_pager_color_secondary_background:\x1d
+SETUVAR fish_pager_color_secondary_completion:\x1d
+SETUVAR fish_pager_color_secondary_description:\x1d
+SETUVAR fish_pager_color_secondary_prefix:\x1d
+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:/home/eric/\x2ecargo/bin\x1e/home/eric/\x2eghcup/bin
diff --git a/fish/themes/Catppuccin Macchiato.theme b/fish/themes/Catppuccin Macchiato.theme
new file mode 100644
index 0000000..e90b630
--- /dev/null
+++ b/fish/themes/Catppuccin Macchiato.theme
@@ -0,0 +1,30 @@
+# name: 'Catppuccin macchiato'
+# url: 'https://github.com/catppuccin/fish'
+# preferred_background: 24273a
+
+fish_color_normal cad3f5
+fish_color_command 8aadf4
+fish_color_param f0c6c6
+fish_color_keyword ed8796
+fish_color_quote a6da95
+fish_color_redirection f5bde6
+fish_color_end f5a97f
+fish_color_comment 8087a2
+fish_color_error ed8796
+fish_color_gray 6e738d
+fish_color_selection --background=363a4f
+fish_color_search_match --background=363a4f
+fish_color_option a6da95
+fish_color_operator f5bde6
+fish_color_escape ee99a0
+fish_color_autosuggestion 6e738d
+fish_color_cancel ed8796
+fish_color_cwd eed49f
+fish_color_user 8bd5ca
+fish_color_host 8aadf4
+fish_color_host_remote a6da95
+fish_color_status ed8796
+fish_pager_color_progress 6e738d
+fish_pager_color_prefix f5bde6
+fish_pager_color_completion cad3f5
+fish_pager_color_description 6e738d
diff --git a/nvim/.luarc.json b/nvim/.luarc.json
index c901255..3f7714a 100644
--- a/nvim/.luarc.json
+++ b/nvim/.luarc.json
@@ -4,4 +4,4 @@
         "_lazygit_toggle",
         "config"
     ]
-}
\ No newline at end of file
+}