From 75f23153d3b1d9c36da74dcee18a3304e7515dc5 Mon Sep 17 00:00:00 2001 From: g-e-o-m-e-t-r-i-c <79387351+g-e-o-m-e-t-r-i-c@users.noreply.github.com> Date: Sun, 23 Jan 2022 16:44:38 +0800 Subject: [PATCH] tokyonighted everything, removed redundant themes, changed naming convention of colors/ dir --- .bashrc | 136 ------ .config/alacritty/alacritty.yml | 71 +-- .config/alacritty/colors/catppuccin.yml | 42 +- .config/alacritty/colors/edge-dark.yml | 24 + .config/alacritty/colors/edge-light.yml | 24 + ...hard-dark.yml => everforest-dark-hard.yml} | 0 .../colors/everforest-dark-medium.yml | 22 + .../alacritty/colors/everforest-dark-soft.yml | 22 + .../colors/everforest-light-hard.yml | 22 + .../colors/everforest-light-medium.yml | 22 + .../colors/everforest-light-soft.yml | 22 + ...x-med-dark.yml => gruvbox-dark-medium.yml} | 0 ...rk.yml => gruvboxmaterial-dark-medium.yml} | 0 .../colors/gruvboxmaterial-light-soft.yml | 22 + .config/alacritty/colors/melange-light.yml | 22 + .config/alacritty/colors/rose-pine-dark.yml | 34 -- .config/alacritty/colors/rose-pine-moon.yml | 34 -- .config/alacritty/colors/rosepine-dark.yml | 41 ++ .config/alacritty/colors/rosepine-dawn.yml | 41 ++ .config/alacritty/colors/rosepine-moon.yml | 41 ++ .config/alacritty/colors/tokyonight-day.yml | 32 ++ .config/i3/config | 10 +- .config/kitty/colors/catppuccin.conf | 87 ++-- .config/kitty/colors/edge-light.conf | 20 + ...rd-dark.conf => everforest-dark-hard.conf} | 0 .../kitty/colors/everforest-dark-medium.conf | 39 ++ .../kitty/colors/everforest-light-medium.conf | 39 ++ .config/kitty/colors/everforest.conf | 18 - ...med-dark.conf => gruvbox-dark-medium.conf} | 0 ....conf => gruvboxmaterial-dark-medium.conf} | 0 .../colors/gruvboxmaterial-light-soft.conf | 49 ++ .config/kitty/colors/melange-light.conf | 29 ++ ...rose-pine-dark.conf => rosepine-dark.conf} | 0 .config/kitty/colors/rosepine-dawn.conf | 68 +++ ...rose-pine-moon.conf => rosepine-moon.conf} | 0 .config/kitty/colors/tokyonight-day.conf | 45 ++ .config/kitty/colors/vscode-dark.conf | 33 +- .config/kitty/kitty.conf | 19 +- .config/nvim/lua/colorschemes.lua | 50 +- .config/nvim/lua/keymaps.lua | 2 +- .config/nvim/lua/options.lua | 7 +- .config/nvim/lua/plugin-config/explorer.lua | 16 +- .../lua/plugin-config/indent-blankline.lua | 4 +- .config/nvim/lua/plugin-config/null-ls.lua | 8 +- .config/nvim/lua/plugin-config/statusline.lua | 1 - .config/nvim/lua/plugin-config/treesitter.lua | 10 +- .config/nvim/lua/plugin-config/vimtex.lua | 2 +- .config/nvim/lua/plugins.lua | 14 +- .config/nvim/plugin/packer_compiled.lua | 52 ++- .config/picom/picom.conf | 427 +++++------------- .config/rofi/config.rasi | 4 +- .config/rofi/themes/nord.rasi | 149 ------ .config/zathura/zathurarc | 29 -- .doom.d/config.el | 57 --- .doom.d/init.el | 191 -------- .doom.d/packages.el | 50 -- .zshrc | 7 +- README.md | 7 +- 58 files changed, 1004 insertions(+), 1213 deletions(-) delete mode 100644 .bashrc create mode 100644 .config/alacritty/colors/edge-dark.yml create mode 100644 .config/alacritty/colors/edge-light.yml rename .config/alacritty/colors/{everforest-hard-dark.yml => everforest-dark-hard.yml} (100%) create mode 100644 .config/alacritty/colors/everforest-dark-medium.yml create mode 100644 .config/alacritty/colors/everforest-dark-soft.yml create mode 100644 .config/alacritty/colors/everforest-light-hard.yml create mode 100644 .config/alacritty/colors/everforest-light-medium.yml create mode 100644 .config/alacritty/colors/everforest-light-soft.yml rename .config/alacritty/colors/{gruvbox-med-dark.yml => gruvbox-dark-medium.yml} (100%) rename .config/alacritty/colors/{gruvbox-material-med-dark.yml => gruvboxmaterial-dark-medium.yml} (100%) create mode 100644 .config/alacritty/colors/gruvboxmaterial-light-soft.yml create mode 100644 .config/alacritty/colors/melange-light.yml delete mode 100644 .config/alacritty/colors/rose-pine-dark.yml delete mode 100644 .config/alacritty/colors/rose-pine-moon.yml create mode 100644 .config/alacritty/colors/rosepine-dark.yml create mode 100644 .config/alacritty/colors/rosepine-dawn.yml create mode 100644 .config/alacritty/colors/rosepine-moon.yml create mode 100644 .config/alacritty/colors/tokyonight-day.yml create mode 100644 .config/kitty/colors/edge-light.conf rename .config/kitty/colors/{everforest-hard-dark.conf => everforest-dark-hard.conf} (100%) create mode 100644 .config/kitty/colors/everforest-dark-medium.conf create mode 100644 .config/kitty/colors/everforest-light-medium.conf delete mode 100644 .config/kitty/colors/everforest.conf rename .config/kitty/colors/{gruvbox-med-dark.conf => gruvbox-dark-medium.conf} (100%) rename .config/kitty/colors/{gruvbox-material-med-dark.conf => gruvboxmaterial-dark-medium.conf} (100%) create mode 100644 .config/kitty/colors/gruvboxmaterial-light-soft.conf create mode 100644 .config/kitty/colors/melange-light.conf rename .config/kitty/colors/{rose-pine-dark.conf => rosepine-dark.conf} (100%) create mode 100644 .config/kitty/colors/rosepine-dawn.conf rename .config/kitty/colors/{rose-pine-moon.conf => rosepine-moon.conf} (100%) create mode 100644 .config/kitty/colors/tokyonight-day.conf delete mode 100644 .config/rofi/themes/nord.rasi delete mode 100644 .doom.d/config.el delete mode 100644 .doom.d/init.el delete mode 100644 .doom.d/packages.el diff --git a/.bashrc b/.bashrc deleted file mode 100644 index 823d9b4..0000000 --- a/.bashrc +++ /dev/null @@ -1,136 +0,0 @@ -# -# ~/.bashrc -# - -[[ $- != *i* ]] && return - -colors() { - local fgc bgc vals seq0 - - printf "Color escapes are %s\n" '\e[${value};...;${value}m' - printf "Values 30..37 are \e[33mforeground colors\e[m\n" - printf "Values 40..47 are \e[43mbackground colors\e[m\n" - printf "Value 1 gives a \e[1mbold-faced look\e[m\n\n" - - # foreground colors - for fgc in {30..37}; do - # background colors - for bgc in {40..47}; do - fgc=${fgc#37} # white - bgc=${bgc#40} # black - - vals="${fgc:+$fgc;}${bgc}" - vals=${vals%%;} - - seq0="${vals:+\e[${vals}m}" - printf " %-9s" "${seq0:-(default)}" - printf " ${seq0}TEXT\e[m" - printf " \e[${vals:+${vals+$vals;}}1mBOLD\e[m" - done - echo; echo - done -} - -[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion - -# Change the window title of X terminals -case ${TERM} in - xterm*|rxvt*|Eterm*|aterm|kterm|gnome*|interix|konsole*) - PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\007"' - ;; - screen*) - PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\033\\"' - ;; -esac - -use_color=true - -# Set colorful PS1 only on colorful terminals. -# dircolors --print-database uses its own built-in database -# instead of using /etc/DIR_COLORS. Try to use the external file -# first to take advantage of user additions. Use internal bash -# globbing instead of external grep binary. -safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM -match_lhs="" -[[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)" -[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(/dev/null \ - && match_lhs=$(dircolors --print-database) - [[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true - - if ${use_color} ; then - # Enable colors for ls, etc. Prefer ~/.dir_colors #64489 - if type -P dircolors >/dev/null ; then - if [[ -f ~/.dir_colors ]] ; then - eval $(dircolors -b ~/.dir_colors) - elif [[ -f /etc/DIR_COLORS ]] ; then - eval $(dircolors -b /etc/DIR_COLORS) - fi - fi - - if [[ ${EUID} == 0 ]] ; then - PS1='\[\033[01;31m\][\h\[\033[01;36m\] \W\[\033[01;31m\]]\$\[\033[00m\] ' - else - PS1='\[\033[01;32m\][\u@\h\[\033[01;37m\] \W\[\033[01;32m\]]\$\[\033[00m\] ' - fi - - alias ls='ls --color=auto' - alias grep='grep --colour=auto' - alias egrep='egrep --colour=auto' - alias fgrep='fgrep --colour=auto' - else - if [[ ${EUID} == 0 ]] ; then - # show root@ when we don't have colors - PS1='\u@\h \W \$ ' - else - PS1='\u@\h \w \$ ' - fi - fi - - unset use_color safe_term match_lhs sh - - alias cp="cp -i" # confirm before overwriting something - alias df='df -h' # human-readable sizes - alias free='free -m' # show sizes in MB - alias np='nano -w PKGBUILD' - alias more=less - - xhost +local:root > /dev/null 2>&1 - -# Bash won't get SIGWINCH if another process is in the foreground. -# Enable checkwinsize so that bash will check the terminal size when -# it regains control. #65623 -# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11) -shopt -s checkwinsize - -shopt -s expand_aliases - -# export QT_SELECT=4 - -# Enable history appending instead of overwriting. #139609 -shopt -s histappend - -# -# # ex - archive extractor -# # usage: ex -ex () { - if [ -f $1 ] ; then - case $1 in - *.tar.bz2) tar xjf $1 ;; - *.tar.gz) tar xzf $1 ;; - *.bz2) bunzip2 $1 ;; - *.rar) unrar x $1 ;; - *.gz) gunzip $1 ;; - *.tar) tar xf $1 ;; - *.tbz2) tar xjf $1 ;; - *.tgz) tar xzf $1 ;; - *.zip) unzip $1 ;; - *.Z) uncompress $1;; - *.7z) 7z x $1 ;; - *) echo "'$1' cannot be extracted via ex()" ;; - esac - else - echo "'$1' is not a valid file" - fi -} diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 1e14f74..b3c38f0 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -16,42 +16,53 @@ font: # size: 8 size: 8.5 # size: 9 + # size: 10 normal: - # family: Fira Mono Nerd Font - # family: Hack Nerd Font - # family: Hasklug Nerd Font + # family: Iosevka SS14 family: JetBrains Mono Nerd Font - # family: Meslo LG S Nerd Font - # family: Liga SF Mono Nerd Font - # family: Roboto Mono Nerd Font - bold: - # family: Fira Mono Nerd Font + # family: BlexMono Nerd Font # family: Hack Nerd Font - # family: Hasklug Nerd Font - family: JetBrains Mono Nerd Font - # family: Meslo LG S Nerd Font - # family: Liga SF Mono Nerd Font - # family: Roboto Mono Nerd Font - style: Bold - italic: - # family: Victor Mono Nerd Font - # family: Hack Nerd Font - # family: Hasklug Nerd Font - family: JetBrains Mono Nerd Font - # family: Meslo LG S Nerd Font - # family: Liga SF Mono Nerd Font - # family: Roboto Mono Nerd Font - style: Italic - # style: Medium Italic # Victor Mono - bold_italic: - # family: Victor Mono Nerd Font - # family: Hack Nerd Font - # family: Hasklug Nerd Font - family: JetBrains Mono Nerd Font + # family: Cozette Vector + # family: Scientifica + # family: SauceCodePro Nerd Font # family: Meslo LG S Nerd Font # family: Liga SF Mono Nerd Font # family: Roboto Mono Nerd Font - style: Bold Italic + # family: Fira Code iCursive Op + # bold: + # style: Bold + # family: JetBrains Mono Nerd Font + # family: Fira Mono Nerd Font + # family: Hack Nerd Font + # family: Hasklug Nerd Font + # family: Meslo LG S Nerd Font + # family: Liga SF Mono Nerd Font + # family: Roboto Mono Nerd Font + # family: Fira Code Nerd Font Complete Mono Windows Compatible + # italic: + # style: Italic + # family: Iosevka SS14 + # family: JetBrains Mono Nerd Font + # family: Victor Mono Nerd Font + # family: Hack Nerd Font + # family: Hasklug Nerd Font + # family: Meslo LG S Nerd Font + # family: Liga SF Mono Nerd Font + # family: Roboto Mono Nerd Font + # family: Operator Mono Lig Book Italic Nerd Font Complete Mono Windows Compatible + # style: Medium Italic # Victor Mono + # style: Book Italic + # style: Regular Italic # SF Mono + # bold_italic: + # style: Bold Italic + # family: Hack Nerd Font + # family: Iosevka SS14 + # family: JetBrains Mono Nerd Font + # family: Victor Mono Nerd Font + # family: Hasklug Nerd Font + # family: Meslo LG S Nerd Font + # family: Liga SF Mono Nerd Font + # family: Roboto Mono Nerd Font # spaces per tab tabspaces: 2 diff --git a/.config/alacritty/colors/catppuccin.yml b/.config/alacritty/colors/catppuccin.yml index 70893f8..833e303 100644 --- a/.config/alacritty/colors/catppuccin.yml +++ b/.config/alacritty/colors/catppuccin.yml @@ -2,36 +2,36 @@ colors: # Default colors primary: - background: "#1E1E28" - foreground: "#DADAE8" + background: "#1E1D2F" + foreground: "#D9E0EE" # Colors the cursor will use if `custom_cursor_colors` is true cursor: - text: "#1E1E28" - cursor: "#B1E3AD" + text: "#1E1D2F" + cursor: "#F5E0DC" # Normal colors normal: black: "#6E6C7E" - red: "#E38C8F" - green: "#B1E3AD" - yellow: "#EBDDAA" - blue: "#A4B9EF" - magenta: "#C6AAE8" - cyan: "#E5B4E2" - white: "#DADAE8" + red: "#F28FAD" + green: "#ABE9B3" + yellow: "#FAE3B0" + blue: "#96CDFB" + magenta: "#F5C2E7" + cyan: "#89DCEB" + white: "#D9E0EE" # Bright colors bright: - black: "#6E6C7E" - red: "#E38C8F" - green: "#B1E3AD" - yellow: "#EBDDAA" - blue: "#A4B9EF" - magenta: "#C6AAE8" - cyan: "#E5B4E2" - white: "#DADAE8" + black: "#988BA2" + red: "#F28FAD" + green: "#ABE9B3" + yellow: "#FAE3B0" + blue: "#96CDFB" + magenta: "#F5C2E7" + cyan: "#89DCEB" + white: "#D9E0EE" indexed_colors: - - { index: 16, color: "#F2CECF" } - - { index: 17, color: "#3E4058" } + - { index: 16, color: "#F8BD96" } + - { index: 17, color: "#F5E0DC" } diff --git a/.config/alacritty/colors/edge-dark.yml b/.config/alacritty/colors/edge-dark.yml new file mode 100644 index 0000000..f8d5faf --- /dev/null +++ b/.config/alacritty/colors/edge-dark.yml @@ -0,0 +1,24 @@ +colors: + primary: + background: "#2c2e34" + foreground: "#c5cdd9" + + normal: + black: "#3e4249" + red: "#ec7279" + green: "#a0c980" + yellow: "#deb974" + blue: "#6cb6eb" + magenta: "#d38aea" + cyan: "#5dbbc1" + white: "#c5cdd9" + + bright: + black: "#3e4249" + red: "#ec7279" + green: "#a0c980" + yellow: "#deb974" + blue: "#6cb6eb" + magenta: "#d38aea" + cyan: "#5dbbc1" + white: "#c5cdd9" diff --git a/.config/alacritty/colors/edge-light.yml b/.config/alacritty/colors/edge-light.yml new file mode 100644 index 0000000..8896d2f --- /dev/null +++ b/.config/alacritty/colors/edge-light.yml @@ -0,0 +1,24 @@ +colors: + primary: + background: "#fafafa" + foreground: "#4b505b" + + normal: + black: "#4b505b" + red: "#d05858" + green: "#608e32" + yellow: "#be7e05" + blue: "#5079be" + magenta: "#b05ccc" + cyan: "#3a8b84" + white: "#fafafa" + + bright: + black: "#4b505b" + red: "#d05858" + green: "#608e32" + yellow: "#be7e05" + blue: "#5079be" + magenta: "#b05ccc" + cyan: "#3a8b84" + white: "#fafafa" diff --git a/.config/alacritty/colors/everforest-hard-dark.yml b/.config/alacritty/colors/everforest-dark-hard.yml similarity index 100% rename from .config/alacritty/colors/everforest-hard-dark.yml rename to .config/alacritty/colors/everforest-dark-hard.yml diff --git a/.config/alacritty/colors/everforest-dark-medium.yml b/.config/alacritty/colors/everforest-dark-medium.yml new file mode 100644 index 0000000..a156999 --- /dev/null +++ b/.config/alacritty/colors/everforest-dark-medium.yml @@ -0,0 +1,22 @@ +colors: + primary: + background: "#2f383e" + foreground: "#d3c6aa" + normal: + black: "#4b565c" + red: "#e67e80" + green: "#a7c080" + yellow: "#dbbc7f" + blue: "#7fbbb3" + magenta: "#d699b6" + cyan: "#83c092" + white: "#d3c6aa" + bright: + black: "#4b565c" + red: "#e67e80" + green: "#a7c080" + yellow: "#dbbc7f" + blue: "#7fbbb3" + magenta: "#d699b6" + cyan: "#83c092" + white: "#d3c6aa" diff --git a/.config/alacritty/colors/everforest-dark-soft.yml b/.config/alacritty/colors/everforest-dark-soft.yml new file mode 100644 index 0000000..929128e --- /dev/null +++ b/.config/alacritty/colors/everforest-dark-soft.yml @@ -0,0 +1,22 @@ +colors: + primary: + background: "#323d43" + foreground: "#d3c6aa" + normal: + black: "#4b565c" + red: "#e67e80" + green: "#a7c080" + yellow: "#dbbc7f" + blue: "#7fbbb3" + magenta: "#d699b6" + cyan: "#83c092" + white: "#d3c6aa" + bright: + black: "#4b565c" + red: "#e67e80" + green: "#a7c080" + yellow: "#dbbc7f" + blue: "#7fbbb3" + magenta: "#d699b6" + cyan: "#83c092" + white: "#d3c6aa" diff --git a/.config/alacritty/colors/everforest-light-hard.yml b/.config/alacritty/colors/everforest-light-hard.yml new file mode 100644 index 0000000..fda7822 --- /dev/null +++ b/.config/alacritty/colors/everforest-light-hard.yml @@ -0,0 +1,22 @@ +colors: + primary: + background: "#fff9e8" + foreground: "#5c6a72" + normal: + black: "#5c6a72" + red: "#f85552" + green: "#8da101" + yellow: "#dfa000" + blue: "#3a94c5" + magenta: "#df69ba" + cyan: "#35a77c" + white: "#dfddc8" + bright: + black: "#5c6a72" + red: "#f85552" + green: "#8da101" + yellow: "#dfa000" + blue: "#3a94c5" + magenta: "#df69ba" + cyan: "#35a77c" + white: "#dfddc8" diff --git a/.config/alacritty/colors/everforest-light-medium.yml b/.config/alacritty/colors/everforest-light-medium.yml new file mode 100644 index 0000000..3c70e25 --- /dev/null +++ b/.config/alacritty/colors/everforest-light-medium.yml @@ -0,0 +1,22 @@ +colors: + primary: + background: "#fdf6e3" + foreground: "#5c6a72" + normal: + black: "#5c6a72" + red: "#f85552" + green: "#8da101" + yellow: "#dfa000" + blue: "#3a94c5" + magenta: "#df69ba" + cyan: "#35a77c" + white: "#dfddc8" + bright: + black: "#5c6a72" + red: "#f85552" + green: "#8da101" + yellow: "#dfa000" + blue: "#3a94c5" + magenta: "#df69ba" + cyan: "#35a77c" + white: "#dfddc8" diff --git a/.config/alacritty/colors/everforest-light-soft.yml b/.config/alacritty/colors/everforest-light-soft.yml new file mode 100644 index 0000000..58a7236 --- /dev/null +++ b/.config/alacritty/colors/everforest-light-soft.yml @@ -0,0 +1,22 @@ +colors: + primary: + background: "#f8f0dc" + foreground: "#5c6a72" + normal: + black: "#5c6a72" + red: "#f85552" + green: "#8da101" + yellow: "#dfa000" + blue: "#3a94c5" + magenta: "#df69ba" + cyan: "#35a77c" + white: "#dfddc8" + bright: + black: "#5c6a72" + red: "#f85552" + green: "#8da101" + yellow: "#dfa000" + blue: "#3a94c5" + magenta: "#df69ba" + cyan: "#35a77c" + white: "#dfddc8" diff --git a/.config/alacritty/colors/gruvbox-med-dark.yml b/.config/alacritty/colors/gruvbox-dark-medium.yml similarity index 100% rename from .config/alacritty/colors/gruvbox-med-dark.yml rename to .config/alacritty/colors/gruvbox-dark-medium.yml diff --git a/.config/alacritty/colors/gruvbox-material-med-dark.yml b/.config/alacritty/colors/gruvboxmaterial-dark-medium.yml similarity index 100% rename from .config/alacritty/colors/gruvbox-material-med-dark.yml rename to .config/alacritty/colors/gruvboxmaterial-dark-medium.yml diff --git a/.config/alacritty/colors/gruvboxmaterial-light-soft.yml b/.config/alacritty/colors/gruvboxmaterial-light-soft.yml new file mode 100644 index 0000000..321df51 --- /dev/null +++ b/.config/alacritty/colors/gruvboxmaterial-light-soft.yml @@ -0,0 +1,22 @@ +colors: + primary: + background: "0xf2e5bc" + foreground: "0x654735" + normal: + black: "0x654735" + red: "0xc14a4a" + green: "0x6c782e" + yellow: "0xb47109" + blue: "0x45707a" + magenta: "0x945e80" + cyan: "0x4c7a5d" + white: "0xe6d5ae" + bright: + black: "0x654735" + red: "0xc14a4a" + green: "0x6c782e" + yellow: "0xb47109" + blue: "0x45707a" + magenta: "0x945e80" + cyan: "0x4c7a5d" + white: "0xe6d5ae" diff --git a/.config/alacritty/colors/melange-light.yml b/.config/alacritty/colors/melange-light.yml new file mode 100644 index 0000000..ba5b2bd --- /dev/null +++ b/.config/alacritty/colors/melange-light.yml @@ -0,0 +1,22 @@ +colors: + primary: + foreground: '#6B5C4D' + background: '#F4F0ED' + normal: + black: '#E9E1DB' + red: '#D7898C' + green: '#83B887' + yellow: '#C29830' + blue: '#485F84' + magenta: '#BE79BB' + cyan: '#729893' + white: '#A38D78' + bright: + black: '#DED2C8' + red: '#C65333' + green: '#659E69' + yellow: '#C29830' + blue: '#485F84' + magenta: '#854882' + cyan: '#436460' + white: '#867462' diff --git a/.config/alacritty/colors/rose-pine-dark.yml b/.config/alacritty/colors/rose-pine-dark.yml deleted file mode 100644 index b2e2e8a..0000000 --- a/.config/alacritty/colors/rose-pine-dark.yml +++ /dev/null @@ -1,34 +0,0 @@ -colors: - primary: - background: "#191724" - foreground: "#e0def4" - cursor: - text: "#191724" - cursor: "#796268" - vi_mode_cursor: - text: "#191724" - cursor: "#796268" - line_indicator: - foreground: None - background: None - selection: - text: CellForeground - background: "#2A2738" - normal: - black: "#6e6a86" - red: "#eb6f92" - green: "#9ccfd8" - yellow: "#f6c177" - blue: "#31748f" - magenta: "#c4a7e7" - cyan: "#ebbcba" - white: "#e0def4" - bright: - black: "#6e6a86" - red: "#eb6f92" - green: "#9ccfd8" - yellow: "#f6c177" - blue: "#31748f" - magenta: "#c4a7e7" - cyan: "#ebbcba" - white: "#e0def4" diff --git a/.config/alacritty/colors/rose-pine-moon.yml b/.config/alacritty/colors/rose-pine-moon.yml deleted file mode 100644 index 2b6e6b0..0000000 --- a/.config/alacritty/colors/rose-pine-moon.yml +++ /dev/null @@ -1,34 +0,0 @@ -colors: - primary: - background: "#232136" - foreground: "#e0def4" - cursor: - text: "#232136" - cursor: "#825B65" - vi_mode_cursor: - text: "#191724" - cursor: "#825B65" - line_indicator: - foreground: None - background: None - selection: - text: CellForeground - background: "#312E45" - normal: - black: "#817c9c" - red: "#eb6f92" - green: "#9ccfd8" - yellow: "#f6c177" - blue: "#3e8fb0" - magenta: "#c4a7e7" - cyan: "#ea9a97" - white: "#e0def4" - bright: - black: "#6e6a86" - red: "#eb6f92" - green: "#9ccfd8" - yellow: "#f6c177" - blue: "#31748f" - magenta: "#c4a7e7" - cyan: "#ebbcba" - white: "#e0def4" diff --git a/.config/alacritty/colors/rosepine-dark.yml b/.config/alacritty/colors/rosepine-dark.yml new file mode 100644 index 0000000..0e9ff7f --- /dev/null +++ b/.config/alacritty/colors/rosepine-dark.yml @@ -0,0 +1,41 @@ +colors: + primary: + background: '0x191724' + foreground: '0xe0def4' + cursor: + text: '0x191724' + cursor: '0x796268' + vi_mode_cursor: + text: '0x191724' + cursor: '0x796268' + line_indicator: + foreground: None + background: None + selection: + text: CellForeground + background: '0x2A2738' + normal: + black: '0x6e6a86' + red: '0xeb6f92' + green: '0x9ccfd8' + yellow: '0xf6c177' + blue: '0x31748f' + magenta: '0xc4a7e7' + cyan: '0xebbcba' + white: '0xe0def4' + bright: + black: '0x6e6a86' + red: '0xeb6f92' + green: '0x9ccfd8' + yellow: '0xf6c177' + blue: '0x31748f' + magenta: '0xc4a7e7' + cyan: '0xebbcba' + white: '0xe0def4' + hints: + start: + foreground: '#6e6a86' + background: '#26233a' + end: + foreground: '#555169' + background: '#26233a' diff --git a/.config/alacritty/colors/rosepine-dawn.yml b/.config/alacritty/colors/rosepine-dawn.yml new file mode 100644 index 0000000..9e2ac36 --- /dev/null +++ b/.config/alacritty/colors/rosepine-dawn.yml @@ -0,0 +1,41 @@ +colors: + primary: + background: '0xfffaf3' + foreground: '0x575279' + cursor: + text: '0xfaf4ed' + cursor: '0xECC5BF' + vi_mode_cursor: + text: '0xfaf4ed' + cursor: '0xECC5BF' + line_indicator: + foreground: None + background: None + selection: + text: CellForeground + background: '0xF5E2DF' + normal: + black: '0x6e6a86' + red: '0xb4637a' + green: '0x56949f' + yellow: '0xea9d34' + blue: '0x286983' + magenta: '0x907aa9' + cyan: '0xd7827e' + white: '0x575279' + bright: + black: '0x6e6a86' + red: '0xeb6f92' + green: '0x9ccfd8' + yellow: '0xf6c177' + blue: '0x31748f' + magenta: '0xc4a7e7' + cyan: '0xebbcba' + white: '0xe0def4' + hints: + start: + foreground: '#6e6a86' + background: '#f2e9de' + end: + foreground: '#9893a5' + background: '#f2e9de' diff --git a/.config/alacritty/colors/rosepine-moon.yml b/.config/alacritty/colors/rosepine-moon.yml new file mode 100644 index 0000000..783417a --- /dev/null +++ b/.config/alacritty/colors/rosepine-moon.yml @@ -0,0 +1,41 @@ +colors: + primary: + background: '0x232136' + foreground: '0xe0def4' + cursor: + text: '0x232136' + cursor: '0x825B65' + vi_mode_cursor: + text: '0x191724' + cursor: '0x825B65' + line_indicator: + foreground: None + background: None + selection: + text: CellForeground + background: '0x312E45' + normal: + black: '0x817c9c' + red: '0xeb6f92' + green: '0x9ccfd8' + yellow: '0xf6c177' + blue: '0x3e8fb0' + magenta: '0xc4a7e7' + cyan: '0xea9a97' + white: '0xe0def4' + bright: + black: '0x6e6a86' + red: '0xeb6f92' + green: '0x9ccfd8' + yellow: '0xf6c177' + blue: '0x31748f' + magenta: '0xc4a7e7' + cyan: '0xebbcba' + white: '0xe0def4' + hints: + start: + foreground: '#817c9c' + background: '#393552' + end: + foreground: '#59546d' + background: '#393552' diff --git a/.config/alacritty/colors/tokyonight-day.yml b/.config/alacritty/colors/tokyonight-day.yml new file mode 100644 index 0000000..a76826a --- /dev/null +++ b/.config/alacritty/colors/tokyonight-day.yml @@ -0,0 +1,32 @@ +# TokyoNight Alacritty Colors +colors: + # Default colors + primary: + background: "#e1e2e7" + foreground: "#3760bf" + + # Normal colors + normal: + black: "#e9e9ed" + red: "#f52a65" + green: "#587539" + yellow: "#8c6c3e" + blue: "#2e7de9" + magenta: "#9854f1" + cyan: "#007197" + white: "#6172b0" + + # Bright colors + bright: + black: "#a1a6c5" + red: "#f52a65" + green: "#587539" + yellow: "#8c6c3e" + blue: "#2e7de9" + magenta: "#9854f1" + cyan: "#007197" + white: "#3760bf" + + indexed_colors: + - { index: 16, color: "#b15c00" } + - { index: 17, color: "#c64343" } diff --git a/.config/i3/config b/.config/i3/config index 1d7a14d..8f8ba8b 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -87,7 +87,7 @@ bindsym $mod+Shift+space floating toggle bindsym $mod+space focus mode_toggle # focus the parent container -bindsym $mod+a focus parent +bindsym $mod+p focus parent # focus the child container bindsym $mod+c focus child @@ -163,13 +163,11 @@ mode "resize" { bindsym $mod+r mode "resize" -# emacs server -exec /usr/bin/emacs --daemon & - # bindsym $mod+e exec emacs -bindsym $mod+e exec emacsclient -c -a 'emacs' # emacs +bindsym $mod+n exec neovide # neovide bindsym $mod+Shift+w exec firefox bindsym $mod+Shift+x exec stacer +bindsym $mod+a exec rofi -show calc # calculator # screenshot keybindings bindsym $mod+Shift+s exec flameshot gui @@ -183,7 +181,7 @@ exec_always --no-startup-id fcitx & # Hide title bars default_border pixel 3 -default_floating_border pixel 1 +default_floating_border pixel 3 # gaps gaps inner 18 diff --git a/.config/kitty/colors/catppuccin.conf b/.config/kitty/colors/catppuccin.conf index 6b26c86..6ab0f7f 100644 --- a/.config/kitty/colors/catppuccin.conf +++ b/.config/kitty/colors/catppuccin.conf @@ -1,79 +1,80 @@ # vim:ft=conf -# name: Catppuccin -# author: Pocco81 (https://github.com/Pocco81) -# license: MIT -# upstream: https://github.com/catppuccin/kitty/blob/main/catppuccin.conf -# blurb: Vibrant pastel theme for the high-spirited! +## name: Catppuccin +## author: Pocco81 (https://github.com/Pocco81) +## license: MIT +## upstream: https://github.com/catppuccin/kitty/blob/main/catppuccin.conf +## blurb: Soothing pastel theme for the high-spirited! # The basic colors -foreground #DADAE8 -background #1E1E29 -selection_foreground #E5B4E2 -selection_background #332E41 +foreground #D9E0EE +background #1E1E2E +selection_foreground #D9E0EE +selection_background #575268 # Cursor colors -cursor #B1E3AD -cursor_text_color #1E1E28 +cursor #F5E0DC +cursor_text_color #1E1E2E # URL underline color when hovering with mouse -url_color #A4B9EF +url_color #F5E0DC # kitty window border colors -active_border_color #E5B4E2 -inactive_border_color #6E6C7E -bell_border_color #EBDDAA +active_border_color #C9CBFF +inactive_border_color #575268 +bell_border_color #FAE3B0 # OS Window titlebar colors -# wayland_titlebar_color system -# macos_titlebar_color system +wayland_titlebar_color system +macos_titlebar_color system #: Tab bar colors -active_tab_foreground #DADAE8 -active_tab_background #1E1E29 -inactive_tab_foreground #A4B9EF -inactive_tab_background #1B1923 -tab_bar_background #15121C +active_tab_foreground #F5C2E7 +active_tab_background #575268 +inactive_tab_foreground #D9E0EE +inactive_tab_background #1E1E2E +tab_bar_background #161320 # Colors for marks (marked text in the terminal) -mark1_foreground #1E1E29 -mark1_background #F9C096 -mark2_foreground #1E1E29 -mark2_background #F2CECF -mark3_foreground #1E1E29 -mark3_background #C6AAE8 +mark1_foreground #1E1E2E +mark1_background #96CDFB +mark2_foreground #1E1E2E +mark2_background #F5C2E7 +mark3_foreground #1E1E2E +mark3_background #B5E8E0 #: The 16 terminal colors #: black color0 #6E6C7E -color8 #6E6C7E +color8 #988BA2 #: red -color1 #E38C8F -color9 #E38C8F +color1 #F28FAD +color9 #F28FAD #: green -color2 #B1E3AD -color10 #B1E3AD +color2 #ABE9B3 +color10 #ABE9B3 #: yellow -color3 #EBDDAA -color11 #EBDDAA +color3 #FAE3B0 +color11 #FAE3B0 #: blue -color4 #A4B9EF -color12 #A4B9EF +color4 #96CDFB +color12 #96CDFB #: magenta -color5 #C6AAE8 -color13 #C6AAE8 +color5 #F5C2E7 +color13 #F5C2E7 #: cyan -color6 #E5B4E2 -color14 #E5B4E2 +color6 #89DCEB +color14 #89DCEB #: white -color7 #DADAE8 -color15 #DADAE8 +color7 #D9E0EE +color15 #D9E0EE + diff --git a/.config/kitty/colors/edge-light.conf b/.config/kitty/colors/edge-light.conf new file mode 100644 index 0000000..b59f686 --- /dev/null +++ b/.config/kitty/colors/edge-light.conf @@ -0,0 +1,20 @@ +# vim:ft=conf + +foreground #4b505b +background #fafafa +color0 #4b505b +color8 #4b505b +color1 #d05858 +color9 #d05858 +color2 #608e32 +color10 #608e32 +color3 #be7e05 +color11 #be7e05 +color4 #5079be +color12 #5079be +color5 #b05ccc +color13 #b05ccc +color6 #3a8b84 +color14 #3a8b84 +color7 #fafafa +color15 #fafafa diff --git a/.config/kitty/colors/everforest-hard-dark.conf b/.config/kitty/colors/everforest-dark-hard.conf similarity index 100% rename from .config/kitty/colors/everforest-hard-dark.conf rename to .config/kitty/colors/everforest-dark-hard.conf diff --git a/.config/kitty/colors/everforest-dark-medium.conf b/.config/kitty/colors/everforest-dark-medium.conf new file mode 100644 index 0000000..889045d --- /dev/null +++ b/.config/kitty/colors/everforest-dark-medium.conf @@ -0,0 +1,39 @@ +## Everforest (Dark/Medium) +foreground #d8cacc +background #323d43 +selection_foreground #3c474d +selection_background #525c62 +url_color #415c6d +cursor #7fbbb3 + +# black +color0 #4a555b +color8 #525c62 + +# red +color1 #e68183 +color9 #e68183 + +# green +color2 #a7c080 +color10 #a7c080 + +# yellow +color3 #dbbc7f +color11 #dbbc7f + +# blue +color4 #7fbbb3 +color12 #7fbbb3 + +# magenta +color5 #d699b6 +color13 #d699b6 + +# cyan +color6 #83c092 +color14 #83c092 + +# white +color7 #d8caac +color15 #d8caac diff --git a/.config/kitty/colors/everforest-light-medium.conf b/.config/kitty/colors/everforest-light-medium.conf new file mode 100644 index 0000000..2bab050 --- /dev/null +++ b/.config/kitty/colors/everforest-light-medium.conf @@ -0,0 +1,39 @@ +## Everforest (Light Medium) +foreground #323d43 +background #fdf6e3 +selection_foreground #e4e1cd +selection_background #d3dbc8 +url_color #415c6d +cursor #7fbbb3 + +# black +color0 #4a555b +color8 #525c62 + +# red +color1 #e68183 +color9 #e68183 + +# green +color2 #a7c080 +color10 #a7c080 + +# yellow +color3 #dbbc7f +color11 #dbbc7f + +# blue +color4 #7fbbb3 +color12 #7fbbb3 + +# magenta +color5 #d699b6 +color13 #d699b6 + +# cyan +color6 #83c092 +color14 #83c092 + +# white +color7 #f3efda +color15 #f3efda diff --git a/.config/kitty/colors/everforest.conf b/.config/kitty/colors/everforest.conf deleted file mode 100644 index bcd5aff..0000000 --- a/.config/kitty/colors/everforest.conf +++ /dev/null @@ -1,18 +0,0 @@ -background #2b3339 -foreground #d3c6aa -color0 #4b565c -color1 #e67e80 -color2 #a7c080 -color3 #dbbc7f -color4 #7fbbb3 -color5 #d699b6 -color6 #83c092 -color7 #d3c6aa -color8 #4b565c -color9 #e67e80 -color10 #a7c080 -color11 #dbbc7f -color12 #7fbbb3 -color13 #d699b6 -color14 #83c092 -color15 #d3c6aa diff --git a/.config/kitty/colors/gruvbox-med-dark.conf b/.config/kitty/colors/gruvbox-dark-medium.conf similarity index 100% rename from .config/kitty/colors/gruvbox-med-dark.conf rename to .config/kitty/colors/gruvbox-dark-medium.conf diff --git a/.config/kitty/colors/gruvbox-material-med-dark.conf b/.config/kitty/colors/gruvboxmaterial-dark-medium.conf similarity index 100% rename from .config/kitty/colors/gruvbox-material-med-dark.conf rename to .config/kitty/colors/gruvboxmaterial-dark-medium.conf diff --git a/.config/kitty/colors/gruvboxmaterial-light-soft.conf b/.config/kitty/colors/gruvboxmaterial-light-soft.conf new file mode 100644 index 0000000..88cc76a --- /dev/null +++ b/.config/kitty/colors/gruvboxmaterial-light-soft.conf @@ -0,0 +1,49 @@ +# vim:ft=conf + +background #f2e5bc +foreground #654735 + +selection_background #654735 +selection_foreground #f2e5bc + +cursor #928374 +cursor_text_color background + +active_tab_background #f2e5bc +active_tab_foreground #654735 +active_tab_font_style bold +inactive_tab_background #f2e5bc +inactive_tab_foreground #7c6f64 +inactive_tab_font_style normal + +## Black +color0 #bdae93 +color8 #928374 + +## Red +color1 #c14a4a +color9 #c14a4a + +## Green +color2 #6c782e +color10 #6c782e + +## Yellow +color3 #c35e0a +color11 #b47109 + +## Blue +color4 #45707a +color12 #45707a + +## Magenta +color5 #945e80 +color13 #945e80 + +## Cyan +color6 #4c7a5d +color14 #4c7a5d + +## White +color7 #654735 +color15 #654735 diff --git a/.config/kitty/colors/melange-light.conf b/.config/kitty/colors/melange-light.conf new file mode 100644 index 0000000..ba276a5 --- /dev/null +++ b/.config/kitty/colors/melange-light.conf @@ -0,0 +1,29 @@ +# vim:ft=conf + +background #F4F0ED +foreground #6B5C4D +cursor #6B5C4D +url_color #485F84 +selection_background #DED2C8 +selection_foreground #6B5C4D +tab_bar_background #E9E1DB +active_tab_background #E9E1DB +active_tab_foreground #C29830 +inactive_tab_background #E9E1DB +inactive_tab_foreground #867462 +color0 #E9E1DB +color1 #D7898C +color2 #83B887 +color3 #C29830 +color4 #485F84 +color5 #BE79BB +color6 #729893 +color7 #A38D78 +color8 #DED2C8 +color9 #C65333 +color10 #659E69 +color11 #C29830 +color12 #485F84 +color13 #854882 +color14 #436460 +color15 #867462 diff --git a/.config/kitty/colors/rose-pine-dark.conf b/.config/kitty/colors/rosepine-dark.conf similarity index 100% rename from .config/kitty/colors/rose-pine-dark.conf rename to .config/kitty/colors/rosepine-dark.conf diff --git a/.config/kitty/colors/rosepine-dawn.conf b/.config/kitty/colors/rosepine-dawn.conf new file mode 100644 index 0000000..faeabb4 --- /dev/null +++ b/.config/kitty/colors/rosepine-dawn.conf @@ -0,0 +1,68 @@ +## name: Rosé Pine Dawn +## author: mvllow +## license: MIT +## upstream: https://github.com/rose-pine/kitty/blob/main/rose-pine-dawn.conf +## blurb: All natural pine, faux fur and a bit of soho vibes for the classy minimalist + +foreground #575279 +background #faf4ed +selection_foreground #575279 +selection_background #eee9e6 + +cursor #9893a5 +cursor_text_color #575279 + +url_color #907aa9 + +# active_border_color +# inactive_border_color +# bell_border_color + +# wayland_titlebar_color system +# macos_titlebar_color system + +active_tab_foreground #575279 +active_tab_background #f2e9de +inactive_tab_foreground #6e6a86 +inactive_tab_background #faf4ed +# tab_bar_background none + +# mark1_foreground +# mark1_background +# mark2_foreground +# mark2_background +# mark3_foreground +# mark3_background + +# black +color0 #f2e9de +color8 #6e6a86 + +# red +color1 #b4637a +color9 #b4637a + +# green +color2 #286983 +color10 #286983 + +# yellow +color3 #ea9d34 +color11 #ea9d34 + +# blue +color4 #56949f +color12 #56949f + +# magenta +color5 #907aa9 +color13 #907aa9 + +# cyan +color6 #d7827e +color14 #d7827e + +# white +color7 #575279 +color15 #575279 + diff --git a/.config/kitty/colors/rose-pine-moon.conf b/.config/kitty/colors/rosepine-moon.conf similarity index 100% rename from .config/kitty/colors/rose-pine-moon.conf rename to .config/kitty/colors/rosepine-moon.conf diff --git a/.config/kitty/colors/tokyonight-day.conf b/.config/kitty/colors/tokyonight-day.conf new file mode 100644 index 0000000..443d51e --- /dev/null +++ b/.config/kitty/colors/tokyonight-day.conf @@ -0,0 +1,45 @@ +# vim:ft=conf + +## name: Tokyo Night Day +## license: MIT +## author: Folke Lemaitre +## upstream: https://github.com/folke/tokyonight.nvim/raw/main/extras/kitty_tokyonight_day.conf + +background #e1e2e7 +foreground #3760bf +selection_background #99a7df +selection_foreground #3760bf +url_color #387068 +cursor #3760bf + +# Tabs +active_tab_background #2e7de9 +active_tab_foreground #d4d6e4 +inactive_tab_background #c4c8da +inactive_tab_foreground #8990b3 +# tab_bar_background #e9e9ed + +# normal +color0 #e9e9ed +color1 #f52a65 +color2 #587539 +color3 #8c6c3e +color4 #2e7de9 +color5 #9854f1 +color6 #007197 +color7 #6172b0 + +# bright +color8 #a1a6c5 +color9 #f52a65 +color10 #587539 +color11 #8c6c3e +color12 #2e7de9 +color13 #9854f1 +color14 #007197 +color15 #3760bf + +# extended colors +color16 #b15c00 +color17 #c64343 + diff --git a/.config/kitty/colors/vscode-dark.conf b/.config/kitty/colors/vscode-dark.conf index 71d5e21..d0f23c3 100644 --- a/.config/kitty/colors/vscode-dark.conf +++ b/.config/kitty/colors/vscode-dark.conf @@ -4,19 +4,20 @@ foreground #e5e5e5 background #1e1e1e selection_background #565656 selection_foreground #e5e5e5 -color0 #000000 -color1 #cd3131 -color2 #0dbc79 -color3 #e5e510 -color4 #2472c8 -color5 #bc3fbc -color6 #11a8cd -color7 #e5e5e5 -color8 #666666 -color9 #f14c4c -color10 #23d18b -color11 #f5f543 -color12 #3b8eea -color13 #d670d6 -color14 #29b8db -color15 #e5e5e5 + +color0 #000000 +color1 #cd3131 +color2 #0dbc79 +color3 #e5e510 +color4 #2472c8 +color5 #bc3fbc +color6 #11a8cd +color7 #e5e5e5 +color8 #666666 +color9 #f14c4c +color10 #23d18b +color11 #f5f543 +color12 #3b8eea +color13 #d670d6 +color14 #29b8db +color15 #e5e5e5 diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index f76bf3a..cab6987 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -2,10 +2,10 @@ include ./colors/tokyonight-night.conf # Fonts -font_family JetBrains Mono Nerd Font -bold_font JetBrains Mono Bold Nerd Font Complete -italic_font JetBrains Mono Italic Nerd Font Complete -bold_italic_font JetBrains Mono Bold Italic Nerd Font Complete +font_family JetBrains Mono Nerd Font Mono +bold_font JetBrains Mono Bold Nerd Font Complete Mono +italic_font JetBrains Mono Italic Nerd Font Complete Mono +bold_italic_font JetBrains Mono Bold Italic Nerd Font Complete Mono # font_family Fira Code Nerd Font # bold_font Fira Code Bold Nerd Font Complete @@ -17,6 +17,17 @@ bold_italic_font JetBrains Mono Bold Italic Nerd Font Complete # italic_font Hasklug Italic Nerd Font Complete # bold_italic_font Hasklug Bold Italic Nerd Font Complete +# font_family Fira Code iCursive Op +# bold_font Fira Code Bold Nerd Font Complete Mono Windows Compatible +# italic_font Operator Mono Lig Book Italic Nerd Font Complete Mono Windows Compatible + +# font_family Liga SFMono Nerd Font + +# font_family Victor Mono Medium Nerd Font Complete +# italic_font Victor Mono Medium Italic Nerd Font Complete +# bold_font Victor Mono Bold Nerd Font Complete +# bold_italic_font Victor Mono Bold Italic Nerd Font Complete + font_size 14 # cursor shape diff --git a/.config/nvim/lua/colorschemes.lua b/.config/nvim/lua/colorschemes.lua index 3208ce9..e2bc996 100644 --- a/.config/nvim/lua/colorschemes.lua +++ b/.config/nvim/lua/colorschemes.lua @@ -12,69 +12,85 @@ o.termguicolors = true -- catppuccin -- require("catppuccin").setup({ -- integrations = { +-- cmp = true, -- lsp_saga = true, -- gitsigns = true, -- telescope = true, --- nvimtree = { enabled = true }, +-- nvimtree = { enabled = true, show_root = true }, -- which_key = true, --- indent_blankline = { enabled = true }, +-- indent_blankline = { enabled = true, colored_indent_levels = true }, -- dashboard = true, -- barbar = true, --- cmp = true, -- ts_rainbow = true, -- }, -- }) -- cmd("colorscheme catppuccin") +-- calvera +-- g.calvera_italic_comments = true +-- g.calvera_italic_keywords = true +-- g.calvera_borders = true +-- require("calvera").set() + -- dracula --- cmd('colorscheme dracula') +-- cmd("colorscheme dracula") -- edge --- g.edge_style = 'aura' +-- g.edge_style = "neon" -- g.edge_enable_italic = 1 -- g.edge_better_performance = 1 --- cmd('colorscheme edge') +-- cmd("colorscheme edge") -- everforest --- g.everforest_background = 'hard' +-- g.everforest_background = "soft" -- "hard" for dark mode -- g.everforest_enable_italic = 1 -- g.everforest_better_performance = 1 --- cmd('colorscheme everforest') +-- cmd("colorscheme everforest") -- gruvbox -- g.gruvbox_italic = 1 --- cmd('colorscheme gruvbox') +-- cmd("colorscheme gruvbox") -- gruvbox material +-- -- g.gruvbox_material_background = "hard" -- g.gruvbox_material_enable_italic = 1 -- g.gruvbox_material_better_performance = 1 --- cmd('colorscheme gruvbox-material') +-- cmd("colorscheme gruvbox-material") -- melange --- cmd('colorscheme melange') +-- cmd("colorscheme melange") -- nightfox --- require("nightfox").setup({ styles = { comments = "italic", keywords = "italic" } }) --- require("nightfox").load("dayfox") +-- require("nightfox").setup({ +-- -- styles = { comments = "italic", keywords = "italic", functions = "italic" }, +-- styles = { comments = "italic", keywords = "italic" }, +-- }) +-- require("nightfox").load("nordfox") -- nord -- g.nord_contrast = true -- g.nord_borders = true --- cmd('colorscheme nord') +-- cmd("colorscheme nord") -- rose pine --- g.rose_pine_variant = 'moon' +-- -- g.rose_pine_variant = 'moon' -- cmd("colorscheme rose-pine") +-- tokyodark +-- g.tokyodark_enable_italic_comment = true +-- g.tokyodark_enable_italic = true +-- g.tokyodark_color_gamma = "1.2" +-- cmd("colorscheme tokyodark") + -- tokyonight g.tokyonight_style = "night" cmd("colorscheme tokyonight") -- sonokai --- g.sonokai_style = 'maia' +-- g.sonokai_style = "andromeda" -- g.sonokai_enable_italic = 1 -- g.sonokai_better_performance = 1 --- cmd('colorscheme sonokai') +-- cmd("colorscheme sonokai") -- vscode (idk why it's light by default) -- g.vscode_style = 'dark' diff --git a/.config/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua index 4cd69ed..54ca9be 100644 --- a/.config/nvim/lua/keymaps.lua +++ b/.config/nvim/lua/keymaps.lua @@ -270,7 +270,7 @@ wk.register({ [";"] = { ":Dashboard", "dashboard" }, -- hover - ["?"] = { ":Lspsaga hover_doc", "hover", silent = false }, + ["?"] = { ":Lspsaga hover_doc", "lsp-hover", silent = false }, -- autosave ["a"] = { ":ASToggle", "toggle-autosave" }, diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua index a943da5..16d8425 100644 --- a/.config/nvim/lua/options.lua +++ b/.config/nvim/lua/options.lua @@ -36,14 +36,17 @@ o.swapfile = false o.undofile = true -- clipboard -o.clipboard = "unnamedplus" +-- o.clipboard = "unnamedplus" -- quite annoying when you have to delete something then paste something else -- buffer opening o.splitbelow = true o.splitright = true +-- case-insensitive search +o.ignorecase = true + -- mouse o.mouse = "a" -- gui -o.guifont = "Hasklug Nerd Font:h9" +o.guifont = "BlexMono Nerd Font:h9" diff --git a/.config/nvim/lua/plugin-config/explorer.lua b/.config/nvim/lua/plugin-config/explorer.lua index ac94647..c36edb5 100644 --- a/.config/nvim/lua/plugin-config/explorer.lua +++ b/.config/nvim/lua/plugin-config/explorer.lua @@ -1,26 +1,16 @@ vim.g.nvim_tree_respect_buf_cwd = 1 vim.g.nvim_tree_git_hl = 1 +-- some defaults not listed, because they don't need to be reiterated require("nvim-tree").setup({ update_cwd = true, auto_close = true, - open_on_tab = false, - update_to_buf_dir = { - enable = false, - auto_open = false, - }, update_focused_file = { enable = true, update_cwd = true, }, diagnostics = { enable = true, - icons = { - hint = "", - info = "", - warning = "", - error = "", - }, }, filters = { dotfiles = false, @@ -33,12 +23,12 @@ require("nvim-tree").setup({ }, git = { enable = true, - ignore = false, + ignore = true, timeout = 500, }, trash = { cmd = "trash", require_confirm = true, }, - root_folder_modifier = ":t", + -- root_folder_modifier = ":t", }) diff --git a/.config/nvim/lua/plugin-config/indent-blankline.lua b/.config/nvim/lua/plugin-config/indent-blankline.lua index d2b172e..9dcdd55 100644 --- a/.config/nvim/lua/plugin-config/indent-blankline.lua +++ b/.config/nvim/lua/plugin-config/indent-blankline.lua @@ -3,13 +3,13 @@ local g = vim.g o.list = true o.listchars:append("space:⋅") --- o.listchars:append("eol:↴") +o.listchars:append("eol:↴") g.indent_blankline_filetype_exclude = { "help", "dashboard", "terminal", "packer", "startuptime" } require("indent_blankline").setup({ set_conceal = 0, space_char_blankline = " ", - -- show_end_of_line = true, + show_end_of_line = true, -- show_current_context = true, -- show_current_context_start = true, }) diff --git a/.config/nvim/lua/plugin-config/null-ls.lua b/.config/nvim/lua/plugin-config/null-ls.lua index 6f6de25..aaaa991 100644 --- a/.config/nvim/lua/plugin-config/null-ls.lua +++ b/.config/nvim/lua/plugin-config/null-ls.lua @@ -15,16 +15,16 @@ local sources = { -- nl.builtins.diagnostics.eslint, -- builtin tsserver is ok -- nl.builtins.diagnostics.stylelint, - -- python (builtin lsp is fine, however i like these better) - nl.builtins.formatting.yapf, + -- python (works with native LSP) + -- nl.builtins.formatting.black, -- nl.builtins.formatting.isort, -- nl.builtins.diagnostics.flake8, - -- c/c++ (works already with builtin LSP, does not need to be added) + -- c/c++ (works with native LSP) -- nl.builtins.formatting.clang_format, -- nl.builtins.diagnostics.cppcheck, - -- go (keeps giving errors) + -- go (works with native LSP) -- nl.builtins.formatting.gofmt, -- nl.builtins.formatting.goimports, -- nl.builtins.diagnostics.staticcheck, diff --git a/.config/nvim/lua/plugin-config/statusline.lua b/.config/nvim/lua/plugin-config/statusline.lua index 242f078..693de17 100644 --- a/.config/nvim/lua/plugin-config/statusline.lua +++ b/.config/nvim/lua/plugin-config/statusline.lua @@ -1,6 +1,5 @@ require("lualine").setup({ options = { - -- theme = 'tokyonight', section_separators = "", component_separators = "", disabled_filetypes = { "dashboard" }, diff --git a/.config/nvim/lua/plugin-config/treesitter.lua b/.config/nvim/lua/plugin-config/treesitter.lua index 6e42dcb..35e354c 100644 --- a/.config/nvim/lua/plugin-config/treesitter.lua +++ b/.config/nvim/lua/plugin-config/treesitter.lua @@ -18,9 +18,9 @@ require("nvim-treesitter.configs").setup({ node_decremental = "grm", }, }, - -- rainbow = { - -- enable = true, - -- -- extended_mode = true, - -- max_file_lines = 50000 - -- } + rainbow = { + enable = true, + -- extended_mode = true, + max_file_lines = 50000 + } }) diff --git a/.config/nvim/lua/plugin-config/vimtex.lua b/.config/nvim/lua/plugin-config/vimtex.lua index 0a24f50..950e2e6 100644 --- a/.config/nvim/lua/plugin-config/vimtex.lua +++ b/.config/nvim/lua/plugin-config/vimtex.lua @@ -8,7 +8,7 @@ vim.cmd([[ let &runtimepath = '~/.local/share/nvim/site/pack/packer/opt/vimtex,' vim.cmd([[ let &runtimepath .= ',~/.local/share/nvim/site/pack/packer/opt/vimtex/after' ]]) -- folding (preamble, sections, subsections, etc.) -g.vimtex_fold_enabled = 1 +-- g.vimtex_fold_enabled = 1 -- viewing g.vimtex_view_method = "zathura" diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 27d416b..45a4dd6 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -1,5 +1,4 @@ vim.cmd("packadd packer.nvim") - return require("packer").startup(function() -- package management use("wbthomason/packer.nvim") @@ -67,7 +66,7 @@ return require("packer").startup(function() }) -- bracket colorizer - -- use('p00f/nvim-ts-rainbow') + -- use("p00f/nvim-ts-rainbow") -- snippet engine use("L3MON4D3/LuaSnip") @@ -76,7 +75,7 @@ return require("packer").startup(function() use("rafamadriz/friendly-snippets") -- ai completion - use("github/copilot.vim") + -- use("github/copilot.vim") -- latex use({ "lervag/vimtex", ft = { "tex" } }) @@ -105,9 +104,14 @@ return require("packer").startup(function() -- fuzzy finder use({ "nvim-telescope/telescope.nvim", - requires = { "nvim-lua/plenary.nvim" }, + requires = { + "nvim-lua/plenary.nvim", + "nvim-lua/popup.nvim", + -- "nvim-telescope/telescope-media-files.nvim", + }, config = function() require("telescope").setup() + -- require("telescope").load_extension("media_files") end, }) @@ -208,6 +212,7 @@ return require("packer").startup(function() -- themes use("Shatur/neovim-ayu") use({ "catppuccin/nvim", as = "catppuccin" }) + use("yashguptaz/calvera-dark.nvim") use("Mofiqul/dracula.nvim") use("sainnhe/edge") use("sainnhe/everforest") @@ -218,6 +223,7 @@ return require("packer").startup(function() use("shaunsingh/nord.nvim") use({ "rose-pine/neovim", as = "rose-pine" }) use("sainnhe/sonokai") + use("tiagovla/tokyodark.nvim") use("folke/tokyonight.nvim") use("Mofiqul/vscode.nvim") diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index 0df5574..3b58319 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -86,6 +86,11 @@ _G.packer_plugins = { path = "/home/geo/.local/share/nvim/site/pack/packer/start/barbar.nvim", url = "https://github.com/romgrk/barbar.nvim" }, + ["calvera-dark.nvim"] = { + loaded = true, + path = "/home/geo/.local/share/nvim/site/pack/packer/start/calvera-dark.nvim", + url = "https://github.com/yashguptaz/calvera-dark.nvim" + }, catppuccin = { loaded = true, path = "/home/geo/.local/share/nvim/site/pack/packer/start/catppuccin", @@ -116,11 +121,6 @@ _G.packer_plugins = { path = "/home/geo/.local/share/nvim/site/pack/packer/start/cmp_luasnip", url = "https://github.com/saadparwaiz1/cmp_luasnip" }, - ["copilot.vim"] = { - loaded = true, - path = "/home/geo/.local/share/nvim/site/pack/packer/start/copilot.vim", - url = "https://github.com/github/copilot.vim" - }, ["dashboard-nvim"] = { loaded = true, path = "/home/geo/.local/share/nvim/site/pack/packer/start/dashboard-nvim", @@ -277,6 +277,11 @@ _G.packer_plugins = { path = "/home/geo/.local/share/nvim/site/pack/packer/start/plenary.nvim", url = "https://github.com/nvim-lua/plenary.nvim" }, + ["popup.nvim"] = { + loaded = true, + path = "/home/geo/.local/share/nvim/site/pack/packer/start/popup.nvim", + url = "https://github.com/nvim-lua/popup.nvim" + }, ["rose-pine"] = { loaded = true, path = "/home/geo/.local/share/nvim/site/pack/packer/start/rose-pine", @@ -293,6 +298,11 @@ _G.packer_plugins = { path = "/home/geo/.local/share/nvim/site/pack/packer/start/telescope.nvim", url = "https://github.com/nvim-telescope/telescope.nvim" }, + ["tokyodark.nvim"] = { + loaded = true, + path = "/home/geo/.local/share/nvim/site/pack/packer/start/tokyodark.nvim", + url = "https://github.com/tiagovla/tokyodark.nvim" + }, ["tokyonight.nvim"] = { loaded = true, path = "/home/geo/.local/share/nvim/site/pack/packer/start/tokyonight.nvim", @@ -364,10 +374,10 @@ time([[Config for nvim-treesitter]], false) time([[Config for nvim-cmp]], true) try_loadstring("\27LJ\1\0028\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\29plugin-config.completion\frequire\0", "config", "nvim-cmp") time([[Config for nvim-cmp]], false) --- Config for: which-key.nvim -time([[Config for which-key.nvim]], true) -try_loadstring("\27LJ\1\0027\0\0\2\0\3\0\0064\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\1G\0\1\0\nsetup\14which-key\frequire\0", "config", "which-key.nvim") -time([[Config for which-key.nvim]], false) +-- Config for: nvim-tree.lua +time([[Config for nvim-tree.lua]], true) +try_loadstring("\27LJ\1\0026\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\27plugin-config.explorer\frequire\0", "config", "nvim-tree.lua") +time([[Config for nvim-tree.lua]], false) -- Config for: barbar.nvim time([[Config for barbar.nvim]], true) try_loadstring("\27LJ\1\0025\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\26plugin-config.tabline\frequire\0", "config", "barbar.nvim") @@ -376,6 +386,10 @@ time([[Config for barbar.nvim]], false) time([[Config for indent-blankline.nvim]], true) try_loadstring("\27LJ\1\2>\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0#plugin-config.indent-blankline\frequire\0", "config", "indent-blankline.nvim") time([[Config for indent-blankline.nvim]], false) +-- Config for: nvim-lspconfig +time([[Config for nvim-lspconfig]], true) +try_loadstring("\27LJ\1\0021\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\22plugin-config.lsp\frequire\0", "config", "nvim-lspconfig") +time([[Config for nvim-lspconfig]], false) -- Config for: nvim-colorizer.lua time([[Config for nvim-colorizer.lua]], true) try_loadstring("\27LJ\1\0027\0\0\2\0\3\0\0064\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\1G\0\1\0\nsetup\14colorizer\frequire\0", "config", "nvim-colorizer.lua") @@ -384,10 +398,6 @@ time([[Config for nvim-colorizer.lua]], false) time([[Config for telescope.nvim]], true) try_loadstring("\27LJ\1\0027\0\0\2\0\3\0\0064\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\1G\0\1\0\nsetup\14telescope\frequire\0", "config", "telescope.nvim") time([[Config for telescope.nvim]], false) --- Config for: nvim-lspconfig -time([[Config for nvim-lspconfig]], true) -try_loadstring("\27LJ\1\0021\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\22plugin-config.lsp\frequire\0", "config", "nvim-lspconfig") -time([[Config for nvim-lspconfig]], false) -- Config for: lualine.nvim time([[Config for lualine.nvim]], true) try_loadstring("\27LJ\1\0028\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\29plugin-config.statusline\frequire\0", "config", "lualine.nvim") @@ -400,10 +410,10 @@ time([[Config for gitsigns.nvim]], false) time([[Config for lspsaga.nvim]], true) try_loadstring("\27LJ\1\0025\0\0\2\0\3\0\0064\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\1G\0\1\0\nsetup\flspsaga\frequire\0", "config", "lspsaga.nvim") time([[Config for lspsaga.nvim]], false) --- Config for: null-ls.nvim -time([[Config for null-ls.nvim]], true) -try_loadstring("\27LJ\1\0025\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\26plugin-config.null-ls\frequire\0", "config", "null-ls.nvim") -time([[Config for null-ls.nvim]], false) +-- Config for: which-key.nvim +time([[Config for which-key.nvim]], true) +try_loadstring("\27LJ\1\0027\0\0\2\0\3\0\0064\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\1G\0\1\0\nsetup\14which-key\frequire\0", "config", "which-key.nvim") +time([[Config for which-key.nvim]], false) -- Config for: Comment.nvim time([[Config for Comment.nvim]], true) try_loadstring("\27LJ\1\2Z\0\0\3\0\6\0\t4\0\0\0%\1\1\0>\0\2\0027\0\2\0003\1\4\0003\2\3\0:\2\5\1>\0\2\1G\0\1\0\rmappings\1\0\0\1\0\1\rextended\2\nsetup\fComment\frequire\0", "config", "Comment.nvim") @@ -412,10 +422,10 @@ time([[Config for Comment.nvim]], false) time([[Config for nvim-autopairs]], true) try_loadstring("\27LJ\1\2<\0\0\2\0\3\0\0064\0\0\0%\1\1\0>\0\2\0027\0\2\0>\0\1\1G\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs") time([[Config for nvim-autopairs]], false) --- Config for: nvim-tree.lua -time([[Config for nvim-tree.lua]], true) -try_loadstring("\27LJ\1\0026\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\27plugin-config.explorer\frequire\0", "config", "nvim-tree.lua") -time([[Config for nvim-tree.lua]], false) +-- Config for: null-ls.nvim +time([[Config for null-ls.nvim]], true) +try_loadstring("\27LJ\1\0025\0\0\2\0\2\0\0044\0\0\0%\1\1\0>\0\2\1G\0\1\0\26plugin-config.null-ls\frequire\0", "config", "null-ls.nvim") +time([[Config for null-ls.nvim]], false) -- Command lazy-loads time([[Defining lazy-load commands]], true) diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index 7a61653..5e3f61d 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -1,335 +1,138 @@ -transition-length = 300 -transition-pow-x = 0.1 -transition-pow-y = 0.1 -transition-pow-w = 0.1 -transition-pow-h = 0.1 -size-transition = true - -corner-radius = 8; -rounded-corners-exclude = [ - "class_g = 'Polybar'", - "class_g = 'dmenu'", - "class_g = 'rofi'", -]; +## General +daemon = true; +backend = "glx"; +experimental-backends = true; +vsync = true; +detect-rounded-corners = false; +use-damage = true; +## Corners & Borders +corner-radius = 10; round-borders = 1; -round-borders-exclude = [ - "class_g = 'rofi'", +round-borders-rule = [ + # terminals + "3:class_g = 'Alacritty'", + "3:class_g = 'kitty'", + "3:class_g = 'konsole'", + + # system + "3:class_g = 'balena-etcher-electron'", + "3:class_g = 'dunst'", + "3:class_g = 'Fcitx-config-gtk3'", + "3:class_g = 'stacer'", + "3:class_g = 'systemsettings'", + "3:class_g = 'VirtualBox'", + "3:class_g = 'VirtualBox Manager'", + "3:class_g = 'VirtualBoxVM'", + "3:class_g = 'xdg-desktop-portal-kde'", + + # web + "3:class_g = 'discord'", + "3:class_g = 'firefox'", + "3:class_g = 'Google-chrome'", + "3:class_g = 'Thunderbird'", + "3:class_g = 'zoom'", + + # programming + "3:class_g = 'Code'", + "3:class_g = 'Emacs'", + "3:class_g = 'neovide'", + + # productivity + "3:class_g = 'Pcmanfm'", + "3:class_g = 'okular'", + "3:class_g = 'Zathura'", + + # image & video + "3:class_g = 'feh'", + "3:class_g = 'Gimp-2.10'", + "3:class_g = 'Nitrogen'", + "3:class_g = 'obs'", + "3:class_g = 'vlc'", + + # office + "3:class_g = 'libreoffice-calc'", + "3:class_g = 'libreoffice-draw'", + "3:class_g = 'libreoffice-impress'", + "3:class_g = 'libreoffice-math'", + "3:class_g = 'libreoffice-writer'", + "3:class_g = 'libreoffice-startcenter'", + "3:class_g = 'Soffice'", ]; -shadow = true; -shadow-radius = 12; -shadow-offset-x = -7; -shadow-offset-y = -7; - -no-dock-shadow = true -no-dnd-shadow = true -shadow-exclude = [ - "name = 'Notification'", - "class_g = 'Conky'", - "class_g ?= 'Notify-osd'", - "class_g = 'Cairo-clock'", - "class_g = 'slop'", - "_GTK_FRAME_EXTENTS@:c", +rounded-corners-exclude = [ + "class_g = 'VirtualBox Machine'", ]; -fading = true; -fade-in-step = 0.028; -fade-out-step = 0.03; -fade-exclude = [ - "class_g = 'slop'", - "class_g = 'Polybar'", - "name = 'Notification'", -] - -# inactive-opacity = 0.75; -# frame-opacity = 1.0; -# menu-opacity = 1.0; -# -# popup_menu = { opacity = 0.9; } -# dropdown_menu = { opacity = 0.9; } -# -# inactive-opacity-override = false; -# active-opacity = 0.85; +## Opacity & Dim +inactive-opacity = 0.8; +# inactive-opacity-override = true; +active-opacity = 0.9; -# inactive-dim = 0.0 - -focus-exclude = [ - "class_g = 'Cairo-clock'", - "class_g = 'Polybar'", - "class_g = 'slop'", -]; - -inactive-dim-fixed = 1.0 +# inactive-dim = 0.1; +# inactive-dim-fixed = 0.5; opacity-rule = [ - "100:class_g = 'firefox'", - "100:class_g = 'thunderbird'", - "100:class_g = 'zoom'", - "100:class_g = 'Google-chrome'", - "100:class_g = 'VirtualBox Manager'", - "100:class_g = 'VirtualBox Machine'", - "100:class_g = 'obs'", - "100:class_g = 'DesktopEditors'", + # web + "100:class_g = 'firefox'", + "100:class_g = 'Google-chrome'", + "100:class_g = 'Thunderbird'", + "100:class_g = 'zoom'", + + # system + "100:class_g = 'stacer'", + "100:class_g = 'systemsettings'", + "100:class_g = 'VirtualBox'", + "100:class_g = 'VirtualBox Machine'", + "100:class_g = 'VirtualBox Manager'", + "100:class_g = 'VirtualBoxVM'", + + # productivity + "100:class_g = 'okular'", + + # office + "100:class_g = 'DesktopEditors'", + "100:class_g = 'libreoffice-calc'", + "100:class_g = 'libreoffice-draw'", + "100:class_g = 'libreoffice-impress'", + "100:class_g = 'libreoffice-math'", + "100:class_g = 'libreoffice-startcenter'", + "100:class_g = 'libreoffice-writer'", + "100:class_g = 'Soffice'", + + # image & video + "100:class_g = 'feh'", + "100:class_g = 'Gimp-2.10'", + "100:class_g = 'Nitrogen'", + "100:class_g = 'obs'", + "100:class_g = 'vlc'", ]; -# blur-method = -# blur-size = 12 -# blur-deviation = false -# blur-background = true; - -# Blur background of windows when the window frame is not opaque. -# Implies: -# blur-background -# Bad in performance, with driver-dependent behavior. The name may change. -# -# blur-background-frame = false; - -# Use fixed blur strength rather than adjusting according to window opacity. -# blur-background-fixed = false; - - -# Specify the blur convolution kernel, with the following format: -# example: -# blur-kern = "5,5,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1"; -# -# blur-kern = '' -# blur-kern = "3x3box"; - +## Blur blur: { - method = "kawase"; - strength = 2; - background = false; - background-frame = false; - background-fixed = false; - kern = "3x3box"; + # requires: https://github.com/ibhagwan/picom + method = "dual_kawase"; + # method = "kernel"; + strength = 7; + # deviation = 1.0; + # kernel = "11x11gaussian"; + background = false; + background-frame = false; + background-fixed = false; + kern = "3x3box"; } -# Exclude conditions for background blur. blur-background-exclude = [ - "_GTK_FRAME_EXTENTS@:c" + "class_g = 'VirtualBox Machine'", ]; -# Daemonize process. Fork to background after initialization. Causes issues with certain (badly-written) drivers. -daemon = true - -# Specify the backend to use: `xrender`, `glx`, or `xr_glx_hybrid`. -# `xrender` is the default one. - -experimental-backends = true; -backend = "glx"; -#backend = "xrender"; - - -# Enable/disable VSync. -# vsync = false -vsync = true - -# Enable remote control via D-Bus. See the *D-BUS API* section below for more details. -# dbus = false - -# Try to detect WM windows (a non-override-redirect window with no -# child that has 'WM_STATE') and mark them as active. -# -# mark-wmwin-focused = false -mark-wmwin-focused = true; - -# Mark override-redirect windows that doesn't have a child window with 'WM_STATE' focused. -# mark-ovredir-focused = false -mark-ovredir-focused = true; - -# Try to detect windows with rounded corners and don't consider them -# shaped windows. The accuracy is not very high, unfortunately. -# -# detect-rounded-corners = false -detect-rounded-corners = false; - -# Detect '_NET_WM_OPACITY' on client windows, useful for window managers -# not passing '_NET_WM_OPACITY' of client windows to frame windows. -# -# detect-client-opacity = false -detect-client-opacity = true; - -# Specify refresh rate of the screen. If not specified or 0, picom will -# try detecting this with X RandR extension. -# -# refresh-rate = 60 -refresh-rate = 0 - -# Limit picom to repaint at most once every 1 / 'refresh_rate' second to -# boost performance. This should not be used with -# vsync drm/opengl/opengl-oml -# as they essentially does sw-opti's job already, -# unless you wish to specify a lower refresh rate than the actual value. -# -# sw-opti = - -# Use EWMH '_NET_ACTIVE_WINDOW' to determine currently focused window, -# rather than listening to 'FocusIn'/'FocusOut' event. Might have more accuracy, -# provided that the WM supports it. -# -# use-ewmh-active-win = false - -# Unredirect all windows if a full-screen opaque window is detected, -# to maximize performance for full-screen windows. Known to cause flickering -# when redirecting/unredirecting windows. paint-on-overlay may make the flickering less obvious. -# -# unredir-if-possible = false - -# Delay before unredirecting the window, in milliseconds. Defaults to 0. -# unredir-if-possible-delay = 0 - -# Conditions of windows that shouldn't be considered full-screen for unredirecting screen. -# unredir-if-possible-exclude = [] - -# Use 'WM_TRANSIENT_FOR' to group windows, and consider windows -# in the same group focused at the same time. -# -# detect-transient = false -detect-transient = true - -# Use 'WM_CLIENT_LEADER' to group windows, and consider windows in the same -# group focused at the same time. 'WM_TRANSIENT_FOR' has higher priority if -# detect-transient is enabled, too. -# -# detect-client-leader = false -detect-client-leader = true - -# Resize damaged region by a specific number of pixels. -# A positive value enlarges it while a negative one shrinks it. -# If the value is positive, those additional pixels will not be actually painted -# to screen, only used in blur calculation, and such. (Due to technical limitations, -# with use-damage, those pixels will still be incorrectly painted to screen.) -# Primarily used to fix the line corruption issues of blur, -# in which case you should use the blur radius value here -# (e.g. with a 3x3 kernel, you should use `--resize-damage 1`, -# with a 5x5 one you use `--resize-damage 2`, and so on). -# May or may not work with *--glx-no-stencil*. Shrinking doesn't function correctly. -# -# resize-damage = 1 - -# Specify a list of conditions of windows that should be painted with inverted color. -# Resource-hogging, and is not well tested. -# -# invert-color-include = [] - -# GLX backend: Avoid using stencil buffer, useful if you don't have a stencil buffer. -# Might cause incorrect opacity when rendering transparent content (but never -# practically happened) and may not work with blur-background. -# My tests show a 15% performance boost. Recommended. -# -# glx-no-stencil = false - -# GLX backend: Avoid rebinding pixmap on window damage. -# Probably could improve performance on rapid window content changes, -# but is known to break things on some drivers (LLVMpipe, xf86-video-intel, etc.). -# Recommended if it works. -# -# glx-no-rebind-pixmap = false - -# Disable the use of damage information. -# This cause the whole screen to be redrawn everytime, instead of the part of the screen -# has actually changed. Potentially degrades the performance, but might fix some artifacts. -# The opposing option is use-damage -# -# no-use-damage = false -#use-damage = true (Causing Weird Black semi opaque rectangles when terminal is opened) -#Changing use-damage to false fixes the problem -use-damage = false - -# Use X Sync fence to sync clients' draw calls, to make sure all draw -# calls are finished before picom starts drawing. Needed on nvidia-drivers -# with GLX backend for some users. -# -# xrender-sync-fence = false - -# GLX backend: Use specified GLSL fragment shader for rendering window contents. -# See `compton-default-fshader-win.glsl` and `compton-fake-transparency-fshader-win.glsl` -# in the source tree for examples. -# -# glx-fshader-win = '' - -# Force all windows to be painted with blending. Useful if you -# have a glx-fshader-win that could turn opaque pixels transparent. -# -# force-win-blend = false - -# Do not use EWMH to detect fullscreen windows. -# Reverts to checking if a window is fullscreen based only on its size and coordinates. -# -# no-ewmh-fullscreen = false - -# Dimming bright windows so their brightness doesn't exceed this set value. -# Brightness of a window is estimated by averaging all pixels in the window, -# so this could comes with a performance hit. -# Setting this to 1.0 disables this behaviour. Requires --use-damage to be disabled. (default: 1.0) -# -# max-brightness = 1.0 - -# Make transparent windows clip other windows like non-transparent windows do, -# instead of blending on top of them. -# -# transparent-clipping = false - -# Set the log level. Possible values are: -# "trace", "debug", "info", "warn", "error" -# in increasing level of importance. Case doesn't matter. -# If using the "TRACE" log level, it's better to log into a file -# using *--log-file*, since it can generate a huge stream of logs. -# -# log-level = "debug" -log-level = "info"; - -# Set the log file. -# If *--log-file* is never specified, logs will be written to stderr. -# Otherwise, logs will to written to the given file, though some of the early -# logs might still be written to the stderr. -# When setting this option from the config file, it is recommended to use an absolute path. -# -# log-file = '/path/to/your/log/file' - -# Show all X errors (for debugging) -# show-all-xerrors = false - -# Write process ID to a file. -# write-pid-path = '/path/to/your/log/file' - -# Window type settings -# -# 'WINDOW_TYPE' is one of the 15 window types defined in EWMH standard: -# "unknown", "desktop", "dock", "toolbar", "menu", "utility", -# "splash", "dialog", "normal", "dropdown_menu", "popup_menu", -# "tooltip", "notification", "combo", and "dnd". -# -# Following per window-type options are available: :: -# -# fade, shadow::: -# Controls window-type-specific shadow and fade settings. -# -# opacity::: -# Controls default opacity of the window type. -# -# focus::: -# Controls whether the window of this type is to be always considered focused. -# (By default, all window types except "normal" and "dialog" has this on.) -# -# full-shadow::: -# Controls whether shadow is drawn under the parts of the window that you -# normally won't be able to see. Useful when the window has parts of it -# transparent, and you want shadows in those areas. -# -# redir-ignore::: -# Controls whether this type of windows should cause screen to become -# redirected again after been unredirected. If you have unredir-if-possible -# set, and doesn't want certain window to cause unnecessary screen redirection, -# you can set this to `true`. -# +## Window-Specific Behavior wintypes: { normal = { fade = true; shadow = true; } - tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; }; + tooltip = { fade = true; shadow = true; opacity = 0.9; focus = true; full-shadow = false; }; dock = { shadow = true; } dnd = { shadow = true; } - popup_menu = { opacity = 0.8; shadow = false; } - dropdown_menu = { opacity = 0.8; }, + popup_menu = { opacity = 0.9; shadow = false; } + dropdown_menu = { opacity = 0.9; shadow = false; } }; diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi index c03867e..99edd06 100644 --- a/.config/rofi/config.rasi +++ b/.config/rofi/config.rasi @@ -1,5 +1,5 @@ configuration { - modi: "drun,run,window,combi,windowcd,ssh,filebrowser,keys"; + modi: "drun,run,window,combi,windowcd,ssh,filebrowser,keys,calc"; font: "jetbrains mono nerd font 12"; display-drun: ">"; sidebar-mode: false; @@ -32,7 +32,7 @@ prompt { border: 2px; border-color: @fg; border-radius: 10px; - font: "hasklug nerd font 14"; + font: "jetbrains mono nerd font 14"; padding: 0 1% 0; } diff --git a/.config/rofi/themes/nord.rasi b/.config/rofi/themes/nord.rasi deleted file mode 100644 index 44babeb..0000000 --- a/.config/rofi/themes/nord.rasi +++ /dev/null @@ -1,149 +0,0 @@ -* { - nord0: #2e3440; - nord1: #3b4252; - nord2: #434c5e; - nord3: #4c566a; - nord4: #d8dee9; - nord5: #e5e9f0; - nord6: #eceff4; - nord7: #8fbcbb; - nord8: #88c0d0; - nord9: #81a1c1; - nord10: #5e81ac; - nord11: #bf616a; - nord12: #d08770; - nord13: #ebcb8b; - nord14: #a3be8c; - nord15: #b48ead; - - spacing: 2; - background-color: var(nord1); - - background: var(nord1); - foreground: var(nord4); - - normal-background: var(background); - normal-foreground: var(foreground); - alternate-normal-background: var(background); - alternate-normal-foreground: var(foreground); - selected-normal-background: var(nord8); - selected-normal-foreground: var(background); - - active-background: var(background); - active-foreground: var(nord10); - alternate-active-background: var(background); - alternate-active-foreground: var(nord10); - selected-active-background: var(nord10); - selected-active-foreground: var(background); - - urgent-background: var(background); - urgent-foreground: var(nord11); - alternate-urgent-background: var(background); - alternate-urgent-foreground: var(nord11); - selected-urgent-background: var(nord11); - selected-urgent-foreground: var(background); -} -element { - padding: 0px 0px 0px 7px; - spacing: 5px; - border: 0; - cursor: pointer; -} -element normal.normal { - background-color: var(normal-background); - text-color: var(normal-foreground); -} -element normal.urgent { - background-color: var(urgent-background); - text-color: var(urgent-foreground); -} -element normal.active { - background-color: var(active-background); - text-color: var(active-foreground); -} -element selected.normal { - background-color: var(selected-normal-background); - text-color: var(selected-normal-foreground); -} -element selected.urgent { - background-color: var(selected-urgent-background); - text-color: var(selected-urgent-foreground); -} -element selected.active { - background-color: var(selected-active-background); - text-color: var(selected-active-foreground); -} -element alternate.normal { - background-color: var(alternate-normal-background); - text-color: var(alternate-normal-foreground); -} -element alternate.urgent { - background-color: var(alternate-urgent-background); - text-color: var(alternate-urgent-foreground); -} -element alternate.active { - background-color: var(alternate-active-background); - text-color: var(alternate-active-foreground); -} -element-text { - background-color: rgba(0, 0, 0, 0%); - text-color: inherit; - highlight: inherit; - cursor: inherit; -} -element-icon { - background-color: rgba(0, 0, 0, 0%); - size: 1.0000em; - text-color: inherit; - cursor: inherit; -} -window { - padding: 0; - border: 0; - background-color: var(background); -} -mainbox { - padding: 0; - border: 0; -} -message { - margin: 0px 7px; -} -textbox { - text-color: var(foreground); -} -listview { - margin: 0px 0px 5px; - scrollbar: true; - spacing: 8px; - fixed-height: 0; -} -scrollbar { - padding: 0; - handle-width: 14px; - border: 0; - handle-color: var(nord3); -} -button { - spacing: 0; - text-color: var(normal-foreground); - cursor: pointer; -} -button selected { - background-color: var(selected-normal-background); - text-color: var(selected-normal-foreground); -} -inputbar { - padding: 5px; - margin: 5px; - spacing: 0; - text-color: var(normal-foreground); - background-color: var(nord3); - children: [ entry ]; -} -entry { - spacing: 2; - cursor: text; - text-color: var(normal-foreground); - background-color: var(nord3); -} diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc index 23f6618..4170a74 100644 --- a/.config/zathura/zathurarc +++ b/.config/zathura/zathurarc @@ -1,35 +1,6 @@ set adjust-open "width" set font "jetbrains mono 10" -# set notification-error-bg "#2b3339" -# set notification-error-fg "#e67e80" -# set notification-warning-bg "#2b3339" -# set notification-warning-fg "#dbbc74" -# set notification-bg "#2b3339" -# set notification-fg "#7fbbb3" -# set completion-bg "#4b565c" -# set completion-fg "#d3c6aa" -# set completion-group-bg "#4b565c" -# set completion-group-fg "#d3c6aa" -# set completion-highlight-bg "#a7c080" -# set completion-highlight-fg "#4b565c" -# set index-bg "#2b3339" -# set index-fg "#d3c6aa" -# set inputbar-bg "#2b3339" -# set inputbar-fg "#d3c6aa" -# set statusbar-bg "#2b3339" -# set statusbar-fg "#d3c6aa" -# set highlight-color "#83c092" -# set highlight-active-color "#83c092" -# set default-bg "#2b3339" -# set default-fg "#d3c6aa" -# set render-loading-bg "#2b3339" -# set render-loading-fg "#d3c6aa" -# set recolor-lightcolor "#2b3339" -# set recolor-darkcolor "#d3c6aa" -# set recolor "true" -# set render-loading "true" - set notification-error-bg "#1a1b26" # storm: 24283b set notification-error-fg "#f7768e" set notification-warning-bg "#1a1b26" # storm: 24283b diff --git a/.doom.d/config.el b/.doom.d/config.el deleted file mode 100644 index c861cb6..0000000 --- a/.doom.d/config.el +++ /dev/null @@ -1,57 +0,0 @@ -;;; $DOOMDIR/config.el -*- lexical-binding: t; -*- - -;; Place your private configuration here! Remember, you do not need to run 'doom -;; sync' after modifying this file! - - -;; Some functionality uses this to identify you, e.g. GPG configuration, email -;; clients, file templates and snippets. -(setq user-full-name "Darren Yap" - user-mail-address "darrenyap08@gmail.com") - -;; Doom exposes five (optional) variables for controlling fonts in Doom. Here -;; are the three important ones: -;; -;; + `doom-font' -;; + `doom-variable-pitch-font' -;; + `doom-big-font' -- used for `doom-big-font-mode'; use this for -;; presentations or streaming. - -;; (setq doom-font (font-spec :family "Liga SFMono Nerd Font" :size 18) - ;; doom-big-font (font-spec :family "Liga SFMono Nerd Font" :size 20) -(setq doom-font (font-spec :family "JetBrains Mono" :size 18) - doom-big-font (font-spec :family "JetBrains Mono" :size 20) - doom-variable-pitch-font (font-spec :family "Inter" :size 18)) - -;; There are two ways to load a theme. Both assume the theme is installed and -;; available. You can either set `doom-theme' or manually load a theme with the -;; `load-theme' function. This is the default: -(setq doom-theme 'doom-one) - -;; Indentation -(setq standard-indent 2) - -;; If you use `org' and don't want your org files in the default location below, -;; change `org-directory'. It must be set before org loads! -(setq org-directory "~/Documents/org/") - -;; This determines the style of line numbers in effect. If set to `nil', line -;; numbers are disabled. For relative line numbers, set this to `relative'. -(setq display-line-numbers-type 'relative) - -;; Here are some additional functions/macros that could help you configure Doom: -;; -;; - `load!' for loading external *.el files relative to this one -;; - `use-package!' for configuring packages -;; - `after!' for running code after a package has loaded -;; - `add-load-path!' for adding directories to the `load-path', relative to -;; this file. Emacs searches the `load-path' when you load packages with -;; `require' or `use-package'. -;; - `map!' for binding new keys -;; -;; To get information about any of these functions/macros, move the cursor over -;; the highlighted symbol at press 'K' (non-evil users must press 'C-c c k'). -;; This will open documentation for it, including demos of how they are used. -;; -;; You can also try 'gd' (or 'C-c c d') to jump to their definition and see how -;; they are implemented. diff --git a/.doom.d/init.el b/.doom.d/init.el deleted file mode 100644 index 2459c44..0000000 --- a/.doom.d/init.el +++ /dev/null @@ -1,191 +0,0 @@ -;;; init.el -*- lexical-binding: t; -*- - -;; This file controls what Doom modules are enabled and what order they load -;; in. Remember to run 'doom sync' after modifying it! - -;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's -;; documentation. There you'll find a "Module Index" link where you'll find -;; a comprehensive list of Doom's modules and what flags they support. - -;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or -;; 'C-c c k' for non-vim users) to view its documentation. This works on -;; flags as well (those symbols that start with a plus). -;; -;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its -;; directory (for easy access to its source code). - -(doom! :input - chinese - ;;japanese - ;;layout ; auie,ctsrnm is the superior home row - - :completion - company ; the ultimate code completion backend - ;;helm ; the *other* search engine for love and life - ;;ido ; the other *other* search engine... - ;;ivy ; a search engine for love and life - vertico ; the search engine of the future - - :ui - ;;deft ; notational velocity for Emacs - doom ; what makes DOOM look the way it does - doom-dashboard ; a nifty splash screen for Emacs - doom-quit ; DOOM quit-message prompts when you quit Emacs - ;;(emoji +unicode) ; 🙂 - hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW - ;;hydra - indent-guides ; highlighted indent columns - ;;ligatures ; ligatures and symbols to make your code pretty again - ;;minimap ; show a map of the code on the side - modeline ; snazzy, Atom-inspired modeline, plus API - ;;nav-flash ; blink cursor line after big motions - neotree ; a project drawer, like NERDTree for vim - ophints ; highlight the region an operation acts on - (popup +defaults) ; tame sudden yet inevitable temporary windows - tabs ; a tab bar for Emacs - ;;treemacs ; a project drawer, like neotree but cooler - unicode ; extended unicode support for various languages - vc-gutter ; vcs diff in the fringe - vi-tilde-fringe ; fringe tildes to mark beyond EOB - ;;window-select ; visually switch windows - workspaces ; tab emulation, persistence & separate workspaces - zen ; distraction-free coding or writing - - :editor - (evil +everywhere); come to the dark side, we have cookies - file-templates ; auto-snippets for empty files - fold ; (nigh) universal code folding - (format +onsave) ; automated prettiness - ;;god ; run Emacs commands without modifier keys - ;;lispy ; vim for lisp, for people who don't like vim - multiple-cursors ; editing in many places at once - ;;objed ; text object editing for the innocent - ;;parinfer ; turn lisp into python, sort of - ;;rotate-text ; cycle region at point between text candidates - snippets ; my elves. They type so I don't have to - word-wrap ; soft wrapping with language-aware indent - - :emacs - dired ; making dired pretty [functional] - electric ; smarter, keyword-based electric-indent - ibuffer ; interactive buffer management - undo ; persistent, smarter undo for your inevitable mistakes - vc ; version-control and Emacs, sitting in a tree - - :term - eshell ; the elisp shell that works everywhere - ;;shell ; simple shell REPL for Emacs - term ; basic terminal emulator for Emacs - vterm ; the best terminal emulation in Emacs - - :checkers - syntax ; tasing you for every semicolon you forget - ;;(spell +flyspell) ; tasing you for misspelling mispelling - ;;grammar ; tasing grammar mistake every you make - - :tools - ;;ansible - ;;biblio ; Writes a PhD for you (citation needed) - ;;debugger ; FIXME stepping through code, to help you add bugs - ;;direnv - ;;docker - editorconfig ; let someone else argue about tabs vs spaces - ;;ein ; tame Jupyter notebooks with emacs - (eval +overlay) ; run code, run (also, repls) - ;;gist ; interacting with github gists - lookup ; navigate your code and its documentation - lsp ; M-x vscode - magit ; a git porcelain for Emacs - make ; run make tasks from Emacs - ;;pass ; password manager for nerds - pdf ; pdf enhancements - ;;prodigy ; FIXME managing external services & code builders - ;;rgb ; creating color strings - ;;taskrunner ; taskrunner for all your projects - ;;terraform ; infrastructure as code - ;;tmux ; an API for interacting with tmux - ;;upload ; map local to remote projects via ssh/ftp - - :os - (:if IS-MAC macos) ; improve compatibility with macOS - ;;tty ; improve the terminal Emacs experience - - :lang - ;;agda ; types of types of types of types... - ;;beancount ; mind the GAAP - cc ; C > C++ == 1 - ;;clojure ; java with a lisp - ;;common-lisp ; if you've seen one lisp, you've seen them all - ;;coq ; proofs-as-programs - ;;crystal ; ruby at the speed of c - ;;csharp ; unity, .NET, and mono shenanigans - data ; config/data formats - ;;(dart +flutter) ; paint ui and not much else - ;;dhall - ;;elixir ; erlang done right - ;;elm ; care for a cup of TEA? - emacs-lisp ; drown in parentheses - ;;erlang ; an elegant language for a more civilized age - ;;ess ; emacs speaks statistics - ;;factor - ;;faust ; dsp, but you get to keep your soul - ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) - ;;fsharp ; ML stands for Microsoft's Language - ;;fstar ; (dependent) types and (monadic) effects and Z3 - ;;gdscript ; the language you waited for - (go +lsp) ; the hipster dialect - ;;(haskell +lsp) ; a language that's lazier than I am - ;;hy ; readability of scheme w/ speed of python - ;;idris ; a language you can depend on - json ; At least it ain't XML - ;;(java +meghanada) ; the poster child for carpal tunnel syndrome - javascript ; all(hope(abandon(ye(who(enter(here)))))) - ;;julia ; a better, faster MATLAB - ;;kotlin ; a better, slicker Java(Script) - latex ; writing papers in Emacs has never been so fun - ;;lean ; for folks with too much to prove - ;;ledger ; be audit you can be - lua ; one-based indices? one-based indices - markdown ; writing docs for people to ignore - ;;nim ; python + lisp at the speed of c - ;;nix ; I hereby declare "nix geht mehr!" - ;;ocaml ; an objective camel - (org +pretty +roam2) ; organize your plain life in plain text - ;;php ; perl's insecure younger brother - ;;plantuml ; diagrams for confusing people more - ;;purescript ; javascript, but functional - python ; beautiful is better than ugly - ;;qt ; the 'cutest' gui framework ever - ;;racket ; a DSL for DSLs - ;;raku ; the artist formerly known as perl6 - ;;rest ; Emacs as a REST client - ;;rst ; ReST in peace - ;; (ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} - ;; rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() - ;;scala ; java, but good - ;;(scheme +guile) ; a fully conniving family of lisps - sh ; she sells {ba,z,fi}sh shells on the C xor - ;;sml - ;;solidity ; do you need a blockchain? No. - ;;swift ; who asked for emoji variables? - ;;terra ; Earth and Moon in alignment for performance. - web ; the tubes - yaml ; JSON, but readable - ;;zig ; C, but simpler - - :email - ;;(mu4e +org +gmail) - ;;notmuch - ;;(wanderlust +gmail) - - :app - calendar - emms - ;;everywhere ; *leave* Emacs!? You must be joking - ;;irc ; how neckbeards socialize - ;;(rss +org) ; emacs as an RSS reader - ;;twitter ; twitter client https://twitter.com/vnought - - :config - ;;literate - (default +bindings +smartparens)) diff --git a/.doom.d/packages.el b/.doom.d/packages.el deleted file mode 100644 index b80e9cc..0000000 --- a/.doom.d/packages.el +++ /dev/null @@ -1,50 +0,0 @@ -;; -*- no-byte-compile: t; -*- -;;; $DOOMDIR/packages.el - -;; To install a package with Doom you must declare them here and run 'doom sync' -;; on the command line, then restart Emacs for the changes to take effect -- or -;; use 'M-x doom/reload'. - - -;; To install SOME-PACKAGE from MELPA, ELPA or emacsmirror: -;(package! some-package) - -;; To install a package directly from a remote git repo, you must specify a -;; `:recipe'. You'll find documentation on what `:recipe' accepts here: -;; https://github.com/raxod502/straight.el#the-recipe-format -;(package! another-package -; :recipe (:host github :repo "username/repo")) - -;; If the package you are trying to install does not contain a PACKAGENAME.el -;; file, or is located in a subdirectory of the repo, you'll need to specify -;; `:files' in the `:recipe': -;(package! this-package -; :recipe (:host github :repo "username/repo" -; :files ("some-file.el" "src/lisp/*.el"))) - -;; If you'd like to disable a package included with Doom, you can do so here -;; with the `:disable' property: -;(package! builtin-package :disable t) - -;; You can override the recipe of a built in package without having to specify -;; all the properties for `:recipe'. These will inherit the rest of its recipe -;; from Doom or MELPA/ELPA/Emacsmirror: -;(package! builtin-package :recipe (:nonrecursive t)) -;(package! builtin-package-2 :recipe (:repo "myfork/package")) - -;; Specify a `:branch' to install a package from a particular branch or tag. -;; This is required for some packages whose default branch isn't 'master' (which -;; our package manager can't deal with; see raxod502/straight.el#279) -;(package! builtin-package :recipe (:branch "develop")) - -;; Use `:pin' to specify a particular commit to install. -;(package! builtin-package :pin "1a2b3c4d5e") - - -;; Doom's packages are pinned to a specific commit and updated from release to -;; release. The `unpin!' macro allows you to unpin single packages... -;(unpin! pinned-package) -;; ...or multiple packages -;(unpin! pinned-package another-pinned-package) -;; ...Or *all* packages (NOT RECOMMENDED; will likely break things) -;(unpin! t) diff --git a/.zshrc b/.zshrc index 3752cae..c94111a 100644 --- a/.zshrc +++ b/.zshrc @@ -86,12 +86,7 @@ alias galias="alias | grep git" # bat theme export BAT_THEME="base16" -export EDITOR="emacsclient -c -a emacs" # use emacs as default editor -# export FZF_DEFAULT_OPTS=$FZF_DEFAULT_OPTS' -# --color=fg:#c5cdd9,bg:#2b2d37,hl:#6cb6eb -# --color=fg+:#c5cdd9,bg+:#2b2d37,hl+:#5dbbc1 -# --color=info:#88909f,prompt:#ec7279,pointer:#d38aea -# --color=marker:#a0c980,spinner:#ec7279,header:#5dbbc1' +export EDITOR="nvim" # startup script (choose one) # colorscript -r # shell-color-scripts diff --git a/README.md b/README.md index cd5b166..4ff5838 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,8 @@ A place to store my dotfiles. ## What You'll Find -1. My [Doom Emacs](https://github.com/hlissner/doom-emacs) configuration. -2. `.bashrc` and `.zshrc`. -3. My playlist of Lofi music. +1. Some music. +2. My `~/.zshrc`. ### The .config Directory @@ -18,7 +17,7 @@ This directory contains most of the configuration files for the applications I u - [lunarvim](https://lunarvim.org) - [mpd](https://www.musicpd.org/) - [neovim](https://neovim.io/) (requires >= v0.5.0 to work) -- [picom](https://github.com/jonaburg/picom) (patched by [@jonaburg](https://github.com/jonaburg)) +- [picom](https://github.com/jonaburg/picom) (patched by [@ibhagwan](https://github.com/ibhagwan)) - [polybar](https://github.com/polybar/polybar) - [ranger](https://github.com/ranger/ranger) - [rofi](https://github.com/davatorium/rofi)