From 1db94cb24cd16bdb9b2ea29abe99954d2fd8cd06 Mon Sep 17 00:00:00 2001
From: thatscringebro <thatscringebro@tutanota.com>
Date: Wed, 23 Jul 2025 08:19:00 -0400
Subject: [PATCH] added fish and mako

---
 .config/fish/config.fish                  |  3 +++
 .config/fish/fish_variables               | 31 +++++++++++++++++++++++
 .config/fish/functions/fish_greeting.fish |  2 ++
 .config/fish/functions/hx.fish            |  4 +++
 .config/fish/functions/sysinfo.fish       |  4 +++
 .config/hypr/hyprland.conf                |  2 +-
 .config/mako/config                       |  7 +++++
 .zshrc                                    |  6 +++++
 8 files changed, 58 insertions(+), 1 deletion(-)
 create mode 100644 .config/fish/config.fish
 create mode 100644 .config/fish/fish_variables
 create mode 100644 .config/fish/functions/fish_greeting.fish
 create mode 100644 .config/fish/functions/hx.fish
 create mode 100644 .config/fish/functions/sysinfo.fish
 create mode 100644 .config/mako/config

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
new file mode 100644
index 0000000..d714361
--- /dev/null
+++ b/.config/fish/config.fish
@@ -0,0 +1,3 @@
+if status is-interactive
+    # Commands to run in interactive sessions can go here
+end
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
new file mode 100644
index 0000000..74b1ee1
--- /dev/null
+++ b/.config/fish/fish_variables
@@ -0,0 +1,31 @@
+# This file contains fish universal variable definitions.
+# VERSION: 3.0
+SETUVAR __fish_initialized:3800
+SETUVAR fish_color_autosuggestion:brblack
+SETUVAR fish_color_cancel:\x2dr
+SETUVAR fish_color_command:normal
+SETUVAR fish_color_comment:red
+SETUVAR fish_color_cwd:green
+SETUVAR fish_color_cwd_root:red
+SETUVAR fish_color_end:green
+SETUVAR fish_color_error:brred
+SETUVAR fish_color_escape:brcyan
+SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_host:normal
+SETUVAR fish_color_host_remote:yellow
+SETUVAR fish_color_normal:normal
+SETUVAR fish_color_operator:brcyan
+SETUVAR fish_color_param:cyan
+SETUVAR fish_color_quote:yellow
+SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
+SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_status:red
+SETUVAR fish_color_user:brgreen
+SETUVAR fish_color_valid_path:\x2d\x2dunderline
+SETUVAR fish_key_bindings:fish_default_key_bindings
+SETUVAR fish_pager_color_completion:normal
+SETUVAR fish_pager_color_description:yellow\x1e\x2di
+SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
+SETUVAR fish_pager_color_selected_background:\x2dr
diff --git a/.config/fish/functions/fish_greeting.fish b/.config/fish/functions/fish_greeting.fish
new file mode 100644
index 0000000..018520b
--- /dev/null
+++ b/.config/fish/functions/fish_greeting.fish
@@ -0,0 +1,2 @@
+function fish_greeting
+end
diff --git a/.config/fish/functions/hx.fish b/.config/fish/functions/hx.fish
new file mode 100644
index 0000000..fcc71eb
--- /dev/null
+++ b/.config/fish/functions/hx.fish
@@ -0,0 +1,4 @@
+function hx --wraps=helix --description 'alias hx helix'
+  helix $argv
+        
+end
diff --git a/.config/fish/functions/sysinfo.fish b/.config/fish/functions/sysinfo.fish
new file mode 100644
index 0000000..1165008
--- /dev/null
+++ b/.config/fish/functions/sysinfo.fish
@@ -0,0 +1,4 @@
+function sysinfo
+	clear
+	fastfetch
+end
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 36c5ba4..4838fea 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -4,7 +4,7 @@ monitor = HDMI-A-2, 1920x1080@75, 2560x360, 1
 monitor = HDMI-A-1, 1920x1080@60, 2920x1440, 1.5
 
 # AUTOSTART
-exec-once = dunst
+exec-once = mako
 exec-once = /home/merlin/.cargo/bin/ironbar
 exec-once = sleep 10 && syncthing
 
diff --git a/.config/mako/config b/.config/mako/config
new file mode 100644
index 0000000..2cf3afc
--- /dev/null
+++ b/.config/mako/config
@@ -0,0 +1,7 @@
+sort=-time
+default-timeout=5000
+background-color=#424242
+border-color=#ffffff
+
+[urgency=high]
+border-color=#8f0a0a
diff --git a/.zshrc b/.zshrc
index 312996c..3cde4f1 100755
--- a/.zshrc
+++ b/.zshrc
@@ -102,3 +102,9 @@ alias hx="helix"
 # Example aliases
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
+
+## [Completion]
+## Completion scripts setup. Remove the following line to uninstall
+[[ -f /home/merlin/.dart-cli-completion/zsh-config.zsh ]] && . /home/merlin/.dart-cli-completion/zsh-config.zsh || true
+## [/Completion]
+