1
1
mirror of https://github.com/rywng/dotfiles.git synced 2024-11-24 20:01:49 +08:00

Compare commits

..

6 Commits

Author SHA1 Message Date
Ryan
d1643efc5c fix(kitty): remove open with nvim 2024-03-06 22:20:06 +08:00
Ryan
fb9a01a940 docs(README): Update readme for dots
(It's been around 2 years)
2024-03-06 22:17:20 +08:00
Ryan Wong
58a35a9541
Merge pull request #4 from rywng/nu
i gave up nu
2024-03-06 13:35:27 +00:00
Ryan
5a86871551 feat(shell): change bindings, and zsh settings 2024-03-06 21:30:43 +08:00
Ryan
135b1e7f88 feat(shell): change back to zsh 2024-03-06 19:59:54 +08:00
Ryan
209599e6ee feat(shell): try nu 2024-03-06 19:10:18 +08:00
8 changed files with 59 additions and 56 deletions

View File

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

View File

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

View File

@ -13,8 +13,3 @@ action launch --type=os-window --cwd $FILE_PATH
protocol file protocol file
fragment_matches [0-9]+ fragment_matches [0-9]+
action launch --type=overlay --cwd=current nvim +${FRAGMENT} ${FILE_PATH} 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}

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

View File

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

View File

@ -9,7 +9,7 @@ if [[ ! $(which swayidle 2> /dev/null) ]]; then
fi fi
choices=("suspend" "poweroff" "reboot" "lock") 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 if test "$choice" = lock ; then

43
.zshrc
View File

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

View File

@ -2,16 +2,24 @@
Linux desktop with gruvbox colorscheme, following the KISS philosophy. 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 # 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) ![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) ![blank](https://user-images.githubusercontent.com/72336775/176679629-c8da017a-2daf-4871-a34f-75bcd3738e28.png)
</details>
# Installing # Installing
I use [yadm](https://github.com/TheLocehiliosan/yadm) to manage dotfiles, the directory layout is unchanged. I use [yadm](https://github.com/TheLocehiliosan/yadm) to manage dotfiles, the directory layout is unchanged.
@ -23,22 +31,24 @@ yadm clone https://github.com/JuanCldCmt/dotfiles
# Software # Software
| Name | Description | | Name | Description |
|------|-------------| | ------- | ----------------------------------- |
|hyprland|wayland WM with better nvidia support| | fuzzel | App launcher & dmenu alternative |
|waybar|Custom bar for sway| | kitty | Terminal emulator |
|swayNC|Notification center| | mpv | Video player |
|wofi|App launcher| | swayNC | Notification center |
|kitty|Terminal emulator| | swayWM | Stupid simple and stable wayland WM |
|zsh|Interactive Shell| | waybar | bar |
|mpv|Video player| | zathura | PDF viewer |
|zathura|PDF viewer| | zsh | Interactive Shell |
# Depencencies # Dependencies
|Name|Description| | Name | Description |
|----|-----------| | ----------- | --------------------------------------------------------------------------------------- |
|wlsunset|Shift blue color based on time| | acpilight | CLI for managing backlight |
|light|CLI for managing backlight| | easyeffects | EQ for IEMs and headphones |
|pipewire|Sound deamon| | pipewire | Sound daemon |
|wireplumber|media session management (remember to replace it in sway's config if using non-gentoo)| | playerctld | Control players |
|playerctld|Control players| | wireplumber | media session management (remember to replace it in sway's config if using non-systemd) |
| wlsunset | Shift blue color based on time (Protects my eyes) |
| wob | show screen backlight and audio output volume level |