.bashrc

@@ -18,6 +18,6 @@ fi
 # Put your fun stuff here.
 
 # https://wiki.gentoo.org/wiki/Fish#fish_as_a_default_shell_with_bash_as_the_login_shell
-# Use nu in place of bash
+# Use fish in place of bash
 # keep this line at the bottom of ~/.bashrc
-# [ -x /bin/nu ] && SHELL=/bin/nu exec nu
+[ -x /bin/fish ] && SHELL=/bin/fish exec fish

.config/kitty/kitty.conf

@@ -7,7 +7,6 @@ bold_italic_font Iosevka Term SS15 Bold Italic
 font_size 14
 
 # shell stuff
-
 shell_integration enabled
 
 enable_audio_bell no

.config/kitty/open-actions.conf

@@ -13,3 +13,8 @@ action launch --type=os-window --cwd $FILE_PATH
 protocol file
 fragment_matches [0-9]+
 action launch --type=overlay --cwd=current nvim +${FRAGMENT} ${FILE_PATH}
+
+# Open text files without fragments in the editor
+protocol file
+mime text/*
+action launch --type=overlay --cwd=current ${EDITOR} ${FILE_PATH}

.config/nvim

@@ -1 +1 @@
-Subproject commit fd3bdba06fa3bffe1f3465ef6963606e71ba5ff4
+Subproject commit 2c98923861d2954c646f764bf68a56c408c32d2e

.config/sway/conf.d/keybinds

@@ -5,7 +5,7 @@ set $left h
 set $down j
 set $up k
 set $right l
-set $term kitty -1
+set $term kitty -1 /bin/fish
 set $menu fuzzel
 
 # my keybinds

.config/sway/scripts/logout.sh

@@ -9,7 +9,7 @@ if [[ ! $(which swayidle 2> /dev/null) ]]; then
 fi
 
 choices=("suspend" "poweroff" "reboot" "lock")
-choice=$(printf "%s\n" "${choices[@]}" | fuzzel -d --prompt "🔌: ")
+choice=$(printf "%s\n" "${choices[@]}" | fuzzel -d --prompt "󰚥: ")
 
 
 if test "$choice" = lock ; then

.zshrc

@@ -24,11 +24,15 @@ zinit wait lucid for \
     agkozak/zsh-z \
     zpm-zsh/colors \
     zpm-zsh/colorize \
-    rywng/shortify.zsh
+    rywng/shortify.zsh \
+    rywng/kitty-zsh
 
-zinit ice wait lucid atinit"bindkey '^ ' autosuggest-execute" atload'_zsh_autosuggest_start'
+zinit ice wait lucid atinit"bindkey '' autosuggest-execute" atload'_zsh_autosuggest_start'
 zinit light zsh-users/zsh-autosuggestions
 
+zinit ice wait lucid
+zinit load hlissner/zsh-autopair
+
 zinit light zsh-users/zsh-completions
 zinit light zsh-users/zsh-history-substring-search
 
@@ -38,16 +42,13 @@ if  ! command -v bat &> /dev/null ; then
 	zinit light sharkdp/bat
 fi
 
-if ! command -v direnv &> /dev/null; then
+zinit ice from"gh-r" as"program" mv"direnv* -> direnv"
-	zinit ice from"gh-r" as"program" mv"direnv* -> direnv"
+zinit light direnv/direnv
-	zinit light direnv/direnv
-fi
 
 autoload -Uz _zinit
 (( ${+_comps} )) && _comps[zinit]=_zinit
 
 test -n "$LS_COLORS" || eval $(dircolors) || echo 'Warning: Unable to set LS_COLORS'
-
 # The following lines were added by compinstall
 
 zstyle ':completion:*' auto-description '%F{green}Specify%f: %F{cyan}%d%f'
@@ -58,19 +59,20 @@ zstyle ':completion:*' file-sort name
 zstyle ':completion:*' format '%F{green}Completing%f %F{yellow}%d%f'
 zstyle ':completion:*' glob 1
 zstyle ':completion:*' group-name ''
-zstyle ':completion:*' ignore-parents parent pwd .. directory
+zstyle ':completion:*' ignore-parents parent pwd ..
 zstyle ':completion:*' insert-unambiguous true
 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
-zstyle ':completion:*' matcher-list '' 'm:{[:lower:]}={[:upper:]}' 'r:|[._-]=** r:|=**' 'l:|=* r:|=*'
+zstyle ':completion:*' list-prompt %S%F{green}At %p%f: Hit TAB for more, or the character to insert%s
-zstyle ':completion:*' max-errors 2
+zstyle ':completion:*' matcher-list '' 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'r:|[._-]=** r:|=**' 'l:|=* r:|=*'
+zstyle ':completion:*' max-errors 16 numeric
 zstyle ':completion:*' menu select=1
 zstyle ':completion:*' original false
 zstyle ':completion:*' preserve-prefix '//[^/]##/'
 zstyle ':completion:*' prompt '%F{green}Completing%f, with %F{red}%e%f errors'
-zstyle ':completion:*' select-prompt '%S%F{green}Scrolling%f active: current selection at %F{blue}%p%f%s'
+zstyle ':completion:*' select-prompt %S%F{green}Scrolling%f active: current selection at %F{blue}%p%f%s
-zstyle ':completion:*' substitute 0
+zstyle ':completion:*' substitute 1
-zstyle ':completion:*' verbose true
+zstyle ':completion:*' use-compctl true
-zstyle :compinstall filename '/home/ryan/.zshrc'
+zstyle :compinstall filename ~/.zshrc
 
 autoload -Uz compinit
 compinit
@@ -79,8 +81,8 @@ compinit
 HISTFILE=~/.cache/zhistory
 HISTSIZE=8192
 SAVEHIST=8192
-setopt autocd autopushd extendedglob nomatch
+setopt autocd extendedglob nomatch notify auto_pushd
-unsetopt beep notify
+unsetopt beep
 bindkey -e
 # End of lines configured by zsh-newuser-install
 
@@ -105,8 +107,8 @@ bindkey -M menuselect 'j' vi-down-line-or-history
 
 bindkey '^[[A' history-substring-search-up
 bindkey '^[[B' history-substring-search-down
-bindkey '^P' history-substring-search-up
+bindkey '' history-substring-search-up
-bindkey '^N' history-substring-search-down
+bindkey '' history-substring-search-down
 
 bindkey ' ' magic-space
 
@@ -123,14 +125,15 @@ export ZSHZ_DATA=$HOME/.cache/z
 export BAT_THEME="base16"
 export FZF_DEFAULT_OPTS="--reverse --cycle --height=40% --border sharp --prompt=🔎"
 export GPG_TTY=$(tty) # fixes gpg
-export LESS="-i $LESS"
+export HISTORY_SUBSTRING_SEARCH_FUZZY=1
 export MANROFFOPT="-c"
 export MANWIDTH=${MANWIDTH:-78}
 export SSH_AUTH_SOCK=$XDG_RUNTIME_DIR/ssh-agent.socket
 
 # local path
 export MANPATH="${MANPATH}:${HOME}/.local/share/man"
-export PATH="${PATH}:${HOME}/.local/bin:${HOME}/.scripts:${HOME}/.cache/go/bin:${HOME}/.local/share/nvim/mason/bin"
+export PATH="${PATH}:${HOME}/.local/bin:${HOME}/.scripts:${HOME}/cargo/bin:${HOME}/.cache/go/bin:${HOME}/.local/share/nvim/mason/bin"
 
 # ccache support
 export PATH="/usr/lib/ccache/bin${PATH:+:}$PATH"
+export USE_CCACHE=1

README.md

@@ -2,24 +2,16 @@
 
 Linux desktop with gruvbox colorscheme, following the KISS philosophy.
 
+## TODO
+
+- [ ] Use [zim](https://github.com/zimfw/zimfw) 
+- [ ] Update screenshots (It's using serenade instead of gruvbox)
+
 # Screenshots
 
-![code](https://github.com/rywng/dotfiles/assets/72336775/2101a2b3-240f-4c18-9bd4-630c1d4c9036)
-![blank](https://github.com/rywng/dotfiles/assets/72336775/c8626d9b-2ea1-4576-946d-883fb5b3688f)
-
-<details open>
-<summary>Old Screenshots</summary>
-<br>
-
-These are screenshots I took 2 years ago when I was using [serenade](https://github.com/rywng/dotfiles/commit/85e37a124be69b2c9366c6745204457c91cb8871) :)
-
-Kept them around because they look quite good
-
 ![terminal](https://user-images.githubusercontent.com/72336775/176679848-a66143cb-0df8-4fd0-a567-66693c33741e.png)
 ![blank](https://user-images.githubusercontent.com/72336775/176679629-c8da017a-2daf-4871-a34f-75bcd3738e28.png)
 
-</details>
-
 # Installing
 
 I use [yadm](https://github.com/TheLocehiliosan/yadm) to manage dotfiles, the directory layout is unchanged.
@@ -30,25 +22,23 @@ yadm clone https://github.com/JuanCldCmt/dotfiles
 
 # Software
 
-| Name    | Description                         |
+| Name | Description |
-| ------- | ----------------------------------- |
+|------|-------------|
-| fuzzel  | App launcher & dmenu alternative    |
+|hyprland|wayland WM with better nvidia support|
-| kitty   | Terminal emulator                   |
+|waybar|Custom bar for sway|
-| mpv     | Video player                        |
+|swayNC|Notification center|
-| swayNC  | Notification center                 |
+|wofi|App launcher|
-| swayWM  | Stupid simple and stable wayland WM |
+|kitty|Terminal emulator|
-| waybar  | bar                                 |
+|zsh|Interactive Shell|
-| zathura | PDF viewer                          |
+|mpv|Video player|
-| zsh     | Interactive Shell                   |
+|zathura|PDF viewer|
 
-# Dependencies
+# Depencencies
 
-| Name        | Description                                                                             |
+|Name|Description|
-| ----------- | --------------------------------------------------------------------------------------- |
+|----|-----------|
-| acpilight   | CLI for managing backlight                                                              |
+|wlsunset|Shift blue color based on time|
-| easyeffects | EQ for IEMs and headphones                                                              |
+|light|CLI for managing backlight|
-| pipewire    | Sound daemon                                                                            |
+|pipewire|Sound deamon|
-| playerctld  | Control players                                                                         |
+|wireplumber|media session management (remember to replace it in sway's config if using non-gentoo)|
-| wireplumber | media session management (remember to replace it in sway's config if using non-systemd) |
+|playerctld|Control players|
-| wlsunset    | Shift blue color based on time (Protects my eyes)                                       |
-| wob         | show screen backlight and audio output volume level                                     |