6 files changed, 76 insertions, 64 deletions

diff --git a/shell/bash/.bashrc b/shell/bash/.bashrc
index 8da3835..61c9b03 100644
--- a/shell/bash/.bashrc
+++ b/shell/bash/.bashrc
@@ -33,7 +33,7 @@ export XDG_SESSION_DESKTOP=dwm
 export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv
 export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
 export LESSHISTFILE="$XDG_CACHE_HOME"/less/history
-export EDITOR=nvim
+export EDITOR=/usr/bin/nvim
 export BUILDDIR=/tmp/makepkg
 export RAVEDUDE_PORT=/dev/ttyACM0
 export BUN_INSTALL="$HOME/.bun"
@@ -44,12 +44,8 @@ export PATH=$PATH:$ANDROID_HOME/emulator
 export PATH=$PATH:$ANDROID_HOME/platform-tools
 export AWT_TOOLKIT=MToolkit
 export _JAVA_AWT_WM_NONREPARENTING=1
-export JAVA_HOME=/usr/lib/jvm/java-21-openjdk
-export GEM="/home/fw/.local/share/gem/ruby/3.0.0/bin"
-
-alias acl="arduino-cli"
-alias acl="arduino-cli compile"
-alias aclbl="arduino-cli board list"
+export JAVA_HOME=/usr/lib/jvm/openjdk17
+export RUST_LOG=debug
 
 alias get_idf='. $HOME/esp/esp-idf/export.sh'
 
@@ -58,6 +54,7 @@ alias la='ls -la --color=auto'
 alias ls='ls --color=auto'
 alias ..='cd ..'
 
+alias mvn="~/Downloads/apache-maven-3.9.9/bin/mvn"
 alias v="nvim"
 alias c="clear"
 alias j="joshuto"
@@ -66,6 +63,7 @@ alias h="htop"
 alias n="neofetch"
 alias poweroff="doas /usr/bin/poweroff"
 alias reboot="doas /usr/bin/reboot"
+alias update-grub="doas grub-mkconfig -o /boot/grub/grub.cfg"
 
 alias gts="git status"
 alias gta="git add ."
@@ -87,3 +85,8 @@ fi
 
 export GPG_TTY=$(tty)
 export PATH=$PATH:$HOME/.local/bin
+. "$HOME/.cargo/env"
+
+#THIS MUST BE AT THE END OF THE FILE FOR SDKMAN TO WORK!!!
+export SDKMAN_DIR="$HOME/.sdkman"
+[[ -s "$HOME/.sdkman/bin/sdkman-init.sh" ]] && source "$HOME/.sdkman/bin/sdkman-init.sh"
diff --git a/wallpaper.jpg b/wallpaper.jpg
index 271a177..145dfca 100644
--- a/wallpaper.jpg
+++ b/wallpaper.jpg
diff --git a/x/.Xresources b/x/.Xresources
index f1e4504..610199a 100644
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -1,4 +1,4 @@
-! st.alpha: 0.8
+st.alpha: 0.6
 st.font: FiraCode-12;
 dmenu.font: FiraCode-11;
 st.termname: st-256color
@@ -26,13 +26,29 @@ dwm.font: FiraCode-12;
 #define base0F #b15928
 
 *.foreground:   base05
-#ifdef background_opacity
-*.background:   [background_opacity]base00
-#else
-*.background:   base00
-#endif
 *.cursorColor:  base05
 
+*.background:   base00
+*.warning: base 0F
+*.secondary: base08
+*.surface: base05
+*.primary: base0D
+*.success: base0B
+*.panel: base0A
+*.error: base09
+*.accent: base08
+
+
+background:   base00
+warning: base 0F
+secondary: base08
+surface: base05
+primary: base0D
+success: base0B
+panel: base0A
+error: base09
+accent: base08
+
 *.color0:       base00
 *.color1:       base08
 *.color2:       base0B
diff --git a/x/.xprofile b/x/.xprofile
index e484486..f08c8fc 100644
--- a/x/.xprofile
+++ b/x/.xprofile
@@ -10,7 +10,7 @@ xrandr --dpi 96
 xbacklight -set 2
 setxkbmap pl
 pipewire &
-feh --bg-scale ~/repos/rice/wallpaper.jpg &
+~/.fehbg &
 picom -b &
 
 [ -n "$xrdbpid" ] && wait "$xrdbpid"
diff --git a/zathura/zathurarc b/zathura/zathurarc
index 2d12705..f0012a7 100644
--- a/zathura/zathurarc
+++ b/zathura/zathurarc
@@ -1,64 +1,57 @@
 set selection-clipboard clipboard
-
 set statusbar-h-padding 0
 set statusbar-v-padding 0
 set page-padding 2
-# Open document in fit-width mode by default
 set adjust-open "fit-page"
-
-# One page per row by default
 set pages-per-row 1
-
-#stop at page boundries
 set scroll-page-aware "true"
 set smooth-scroll "true"
 set scroll-full-overlap 0.01
 set scroll-step 100
-
 set window-title-home-tilde 1
 set statusbar-home-tilde 1
 set window-title-basename 1
 set guioptions 1
-
-# bookmarks settings
-set database "plain"
-# set sandbox "none"
-# zathurarc-dark
-
-set font "Courier 12"
-set default-bg "#0" #00
-set default-fg "#F7F7F6" #01
-
-set statusbar-fg "#B0B0B0" #04
-set statusbar-bg "#202020" #01
-
-
-set notification-error-bg "#AC4142" #08
-set notification-error-fg "#151515" #00
-
-set notification-warning-bg "#AC4142" #08
-set notification-warning-fg "#151515" #00
-
-set highlight-color "#F4BF75" #0A
-set highlight-active-color "#6A9FB5" #0D
-
-set completion-highlight-fg "#151515" #02
-set completion-highlight-bg "#90A959" #0C
-
-set completion-bg "#303030" #02
-set completion-fg "#E0E0E0" #0C
-
-set notification-bg "#90A959" #0B
-set notification-fg "#151515" #00
-
-#set recolor "true"
-set recolor-lightcolor "#000000" #00
-set recolor-darkcolor "#E0E0E0" #06
-set recolor-reverse-video "true"
-set recolor-keephue "true"
-
-
-#set render-loading "false"
-set scroll-step 50
-map <C-b> feedkeys ":bmark "
 set database "plain"
+set sandbox "none"
+
+set notification-error-bg       "rgba(50,48,47,1)"     # bg
+set notification-error-fg       "rgba(251,73,52,1)"    # bright:red
+set notification-warning-bg     "rgba(50,48,47,1)"     # bg
+set notification-warning-fg     "rgba(250,189,47,1)"   # bright:yellow
+set notification-bg             "rgba(50,48,47,1)"     # bg
+set notification-fg             "rgba(184,187,38,1)"   # bright:green
+
+set completion-bg               "#000c18"     # bg2
+set completion-fg               "rgba(235,219,178,1)"  # fg
+set completion-group-bg         "rgba(60,56,54,1)"     # bg1
+set completion-group-fg         "rgba(146,131,116,1)"  # gray
+set completion-highlight-bg     "rgba(131,165,152,1)"  # bright:blue
+set completion-highlight-fg     "rgba(80,73,69,1)"     # bg2
+
+# Define the color in index mode
+set index-bg                    "#000c18"     # bg2
+set index-fg                    "rgba(235,219,178,1)"  # fg
+set index-active-bg             "rgba(131,165,152,1)"  # bright:blue
+set index-active-fg             "rgba(80,73,69,1)"     # bg2
+
+set inputbar-bg                 "#000c18"     # bg
+set inputbar-fg                 "rgba(235,219,178,1)"  # fg
+
+set statusbar-bg                "#000c18"     # bg2
+set statusbar-fg                "rgba(235,219,178,1)"  # fg
+
+set highlight-color             "rgba(250,189,47,0.5)" # bright:yellow
+set highlight-active-color      "rgba(254,128,25,0.5)" # bright:orange
+
+set default-bg                  "#000c18"     # bg
+set default-fg                  "rgba(235,219,178,1)"  # fg
+set render-loading              true
+set render-loading-bg           "#000c18"     # bg
+set render-loading-fg           "rgba(235,219,178,1)"  # fg
+
+# Recolor book content's color
+set recolor-lightcolor          "#000c18"     # bg
+set recolor-darkcolor           "rgba(235,219,178,1)"  # fg
+set recolor                     "true"
+set recolor-keephue             "true"                 # keep original color
diff --git a/zellij/config.kdl b/zellij/config.kdl
index 22df355..90278c1 100644
--- a/zellij/config.kdl
+++ b/zellij/config.kdl
@@ -191,7 +191,7 @@ plugins {
 }
 
 simplified_ui true
-default_shell "zsh"
+default_shell "bash"
 
 themes {
   dracula {