diff --git a/linux/Code/User/settings.json b/linux/Code/User/settings.json index ae0729b..906b43d 100644 --- a/linux/Code/User/settings.json +++ b/linux/Code/User/settings.json @@ -56,24 +56,24 @@ "textLink.foreground": "#dd5555", "extensionButton.prominentBackground": "#dd5555", - "terminal.foreground": "#d0d0d0", - "terminal.background": "#212121", - "terminal.ansiBlack": "#151515", - "terminal.ansiBlue": "#6c99bb", - "terminal.ansiCyan": "#7dd6cf", - "terminal.ansiGreen": "#7e8e50", - "terminal.ansiMagenta": "#9f4e85", - "terminal.ansiRed": "#ac4142", - "terminal.ansiWhite": "#d0d0d0", - "terminal.ansiYellow": "#e5b567", - "terminal.ansiBrightBlack": "#505050", - "terminal.ansiBrightBlue": "#6c99bb", - "terminal.ansiBrightCyan": "#7dd6cf", - "terminal.ansiBrightGreen": "#7e8e50", - "terminal.ansiBrightMagenta": "#9f4e85", - "terminal.ansiBrightRed": "#ac4142", - "terminal.ansiBrightWhite": "#f5f5f5", - "terminal.ansiBrightYellow": "#e5b567" + "terminal.foreground": "#4d4d4c", + "terminal.background": "#ffffff", + "terminal.ansiBlack": "#000000", + "terminal.ansiBlue": "#4271ae", + "terminal.ansiCyan": "#3e999f", + "terminal.ansiGreen": "#718c00", + "terminal.ansiMagenta": "#8959a8", + "terminal.ansiRed": "#c82829", + "terminal.ansiWhite": "#ffffff", + "terminal.ansiYellow": "#eab700", + "terminal.ansiBrightBlack": "#000000", + "terminal.ansiBrightBlue": "#4271ae", + "terminal.ansiBrightCyan": "#3e999f", + "terminal.ansiBrightGreen": "#718c00", + "terminal.ansiBrightMagenta": "#8959a8", + "terminal.ansiBrightRed": "#c82829", + "terminal.ansiBrightWhite": "#ffffff", + "terminal.ansiBrightYellow": "#eab700" }, "editor.formatOnSave": true, "vim.enableNeovim": true, diff --git a/linux/alacritty/alacritty.yml b/linux/alacritty/alacritty.yml index f321370..a387321 100644 --- a/linux/alacritty/alacritty.yml +++ b/linux/alacritty/alacritty.yml @@ -171,10 +171,39 @@ font: #draw_bold_text_with_bright_colors: false # Colors (Tomorrow Night Bright) -#colors: +colors: # Default colors - #primary: - # background: '#000000' + primary: + background: '#FFFFFF' + + bright: + black: '#000000' + blue: '#4271ae' + cyan: '#8abeb7' + green: '#718c00' + magenta: '#8959a8' + red: '#c82829' + white: '#ffffff' + yellow: '#eab700' + cursor: + cursor: '#4d4d4c' + text: '#ffffff' + normal: + black: '#000000' + blue: '#4271ae' + cyan: '#8abeb7' + green: '#718c00' + magenta: '#8959a8' + red: '#c82829' + white: '#ffffff' + yellow: '#eab700' + primary: + background: '#ffffff' + foreground: '#4d4d4c' + selection: + background: '#d6d6d6' + text: '#4d4d4c' + # foreground: '#eaeaea' # Bright and dim foreground colors @@ -278,7 +307,7 @@ font: # # Window opacity as a floating point number from `0.0` to `1.0`. # The value `0.0` is completely transparent and `1.0` is opaque. -background_opacity: 0.8 +background_opacity: 0.6 #selection: #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" diff --git a/linux/bin/ufetch b/linux/bin/ufetch index 9ff170c..df9efac 100755 --- a/linux/bin/ufetch +++ b/linux/bin/ufetch @@ -54,10 +54,10 @@ if [ -x "$(command -v tput)" ]; then fi # you can change these -lc="${reset}${bold}${red}" # labels -nc="${reset}${bold}${red}" # user and hostname +lc="${reset}${bold}${cyan}" # labels +nc="${reset}${bold}${cyan}" # user and hostname ic="${reset}" # info -c0="${reset}${red}" # first color +c0="${reset}${cyan}" # first color ## OUTPUT diff --git a/linux/bspwm/bspwmrc b/linux/bspwm/bspwmrc index 335a025..939fa9f 100755 --- a/linux/bspwm/bspwmrc +++ b/linux/bspwm/bspwmrc @@ -9,7 +9,7 @@ function kill_program { bspc monitor -d      -bspc config border_width $(echo 1 \* $SCALE | bc) +bspc config border_width $(echo 3 \* $SCALE | bc) bspc config window_gap $(echo 12 \* $SCALE | bc) bspc config split_ratio 0.52 @@ -17,15 +17,15 @@ bspc config borderless_monocle true bspc config gapless_monocle true bspc config single_monocle true bspc config focus_follows_pointer true -bspc config focused_border_color '#eb564d' -bspc config normal_border_color '#ccc' +bspc config focused_border_color '#8abeb7' +bspc config normal_border_color '#cceeee' bspc rule -a Nextcloud desktop='^1' state=floating follow=on bspc rule -a "*:transgui" desktop='^1' state=floating follow=on -bspc rule -a TelegramDesktop desktop='^1' state=floating follow=on bspc rule -a Google-chrome desktop='^3' follow=on bspc rule -a Code desktop='^4' follow=on bspc rule -a Org.gnome.Nautilus desktop='^5' follow=on +bspc rule -a TelegramDesktop state=floating sticky=on bspc rule -a baka-mplayer state=floating sticky=on bspc rule -a smplayer state=floating sticky=on diff --git a/linux/dconf/user b/linux/dconf/user index d704e1e..48d08e8 100644 Binary files a/linux/dconf/user and b/linux/dconf/user differ diff --git a/linux/dunst/dunstrc b/linux/dunst/dunstrc index 6f7fe6b..e3fc0fe 100644 --- a/linux/dunst/dunstrc +++ b/linux/dunst/dunstrc @@ -51,7 +51,7 @@ # Draw a line of "separator_height" pixel height between two # notifications. # Set to 0 to disable. - separator_height = 2 + separator_height = 3 # Padding between text and separator. padding = 8 @@ -61,10 +61,10 @@ # Defines width in pixels of frame around the notification window. # Set to 0 to disable. - frame_width = 0 + frame_width = 3 # Defines color of the frame around the notification window. - frame_color = "#aaaaaa" + frame_color = "#8abeb7" # Define a color for the separator. # possible values are: @@ -282,8 +282,8 @@ #icon = /path/to/icon [urgency_normal] - background = "#eb564dcc" - foreground = "#fff" + background = "#ffffffcc" + foreground = "#335555cc" timeout = 10 # Icon for notifications with normal urgency, uncomment to enable #icon = /path/to/icon diff --git a/linux/nvim/.netrwhist b/linux/nvim/.netrwhist new file mode 100644 index 0000000..7feb970 --- /dev/null +++ b/linux/nvim/.netrwhist @@ -0,0 +1,4 @@ +let g:netrw_dirhistmax =10 +let g:netrw_dirhistcnt =2 +let g:netrw_dirhist_2='/home/vbalien/.config/gtk-3.0' +let g:netrw_dirhist_1='/home/vbalien/.config/bspwm' diff --git a/linux/nvim/init.vim b/linux/nvim/init.vim new file mode 100644 index 0000000..11eaf08 --- /dev/null +++ b/linux/nvim/init.vim @@ -0,0 +1,153 @@ +call plug#begin('~/.local/share/nvim/plugged') + +" Prettier +Plug 'prettier/vim-prettier', { + \ 'do': 'yarn install', + \ 'for': ['javascript', 'typescript', 'css', 'less', 'scss', 'json', 'graphql', 'markdown', 'vue', 'yaml', 'html'] } + +" 아이콘 폰트 사용 +Plug 'ryanoasis/vim-devicons' +" NERDTree +" NERDTree git +Plug 'preservim/nerdtree' +" NERDTree icon color +Plug 'tiagofumo/vim-nerdtree-syntax-highlight' + +" fuzzy finder +Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } +Plug 'junegunn/fzf.vim' + +" Airline +Plug 'vim-airline/vim-airline' +Plug 'vim-airline/vim-airline-themes' + +" 컬러 테마 +Plug 'tomasiser/vim-code-dark' +Plug 'NLKNguyen/papercolor-theme' +Plug 'scheakur/vim-scheakur' +Plug 'junegunn/seoul256.vim' + +" Language Pack +Plug 'sheerun/vim-polyglot' + +" indent 표시 +Plug 'Yggdroot/indentLine' + +" 코딩시간 측정 +Plug 'wakatime/vim-wakatime' + +" git status +Plug 'airblade/vim-gitgutter' + +" Auto Complete +Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } +Plug 'Shougo/echodoc.vim' + +" LSP +Plug 'autozimu/LanguageClient-neovim', { + \ 'branch': 'next', + \ 'do': 'bash install.sh', + \ } + +Plug 'vim-scripts/SyntaxComplete' + +" TypeScript +Plug 'HerringtonDarkholme/yats.vim' +Plug 'mhartington/nvim-typescript', {'do': './install.sh'} +Plug 'Shougo/denite.nvim' + +call plug#end() + +set smartindent +set backspace=2 +set cindent +set tabstop=2 +set shiftwidth=2 +set expandtab +set nu +set ruler +set title +set hlsearch +set cursorline +syntax on + +set clipboard+=unnamedplus + +set laststatus=2 +set shell=/bin/bash +set fillchars+=vert:┃ + +set mouse=a +set encoding=UTF-8 + + +" 단축키 설정 +nmap :FZF +nmap :NERDTreeToggle + +inoremap pumvisible() ? "\" : "\" +inoremap pumvisible() ? "\" : "\" + + +" theme config +let g:PaperColor_Theme_Options = { + \ 'theme': { + \ 'default': { + \ 'transparent_background': 1 + \ } + \ } + \ } + +set background=light +colorscheme seoul256-light + +hi Normal guibg=NONE ctermbg=NONE +hi EndOfBuffer guibg=NONE ctermbg=NONE + +" devicons +let g:WebDevIconsUnicodeDecorateFolderNodes = 1 +let g:DevIconsEnableFoldersOpenClose = 1 + +" airline +let g:airline_theme = 'base16' +let g:airline_powerline_fonts=0 +let g:airline#extensions#tabline#enabled = 1 +let g:airline#extensions#tabline#tab_nr_type = 1 " tab number +let g:airline#extensions#tabline#show_tab_nr = 1 +let g:airline#extensions#tabline#formatter = 'default' +let g:airline#extensions#tabline#buffer_nr_show = 1 +let g:airline#extensions#tabline#fnametruncate = 16 +let g:airline#extensions#tabline#fnamecollapse = 2 + +" cpp syntax highlight +let g:cpp_class_scope_highlight = 1 +let g:cpp_member_variable_highlight = 1 +let g:cpp_class_decl_highlight = 1 +let g:cpp_concepts_highlight = 1 +let g:cpp_experimental_template_highlight = 1 + +" LSP +let g:LanguageClient_serverCommands = { + \ 'rust': ['~/.cargo/bin/rustup', 'run', 'stable', 'rls'], + \ 'c': ['clangd'], + \ 'cpp': ['clangd'], + \ } +execute 'autocmd FileType ' + \ . join(keys(g:LanguageClient_serverCommands), ',') + \ . ' autocmd BufWritePre call LanguageClient#textDocument_formatting_sync()' + +" deoplete +let g:deoplete#enable_at_startup = 1 +inoremap pumvisible() ? "\" : "\" +inoremap pumvisible() ? "\" : "\" +set shortmess+=c +set completeopt-=preview + +" echodoc +let g:echodoc#enable_at_startup = 1 +let g:echodoc#type = 'floating' +highlight link EchoDocFloat Pmenu + +" prettier +let g:prettier#autoformat = 1 +let g:prettier#autoformat_require_pragma = 0 diff --git a/linux/omz/vbalien.zsh-theme b/linux/omz/vbalien.zsh-theme index f749eee..b60bbc9 100644 --- a/linux/omz/vbalien.zsh-theme +++ b/linux/omz/vbalien.zsh-theme @@ -39,6 +39,8 @@ case ${SOLARIZED_THEME:-dark} in *) CURRENT_FG='black';; esac +CURRENT_FG='white' + # Special Powerline characters () { @@ -89,7 +91,7 @@ prompt_end() { # Context: user@hostname (who am I and where am I) prompt_context() { if [[ "$USER" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then - prompt_segment black default "%(!.%{%F{yellow}%}.)%n@%m" + prompt_segment none default "%(!.%{%F{yellow}%}.)%n@%m" fi } @@ -204,7 +206,7 @@ prompt_hg() { # Dir: current working directory prompt_dir() { - prompt_segment red $CURRENT_FG '%~' + prompt_segment cyan $CURRENT_FG '%~' } # Virtualenv: current working virtualenv @@ -226,7 +228,7 @@ prompt_status() { [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡" [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙" - [[ -n "$symbols" ]] && prompt_segment black default "$symbols" + [[ -n "$symbols" ]] && prompt_segment none default "$symbols" } #AWS Profile: diff --git a/linux/pam_environment b/linux/pam_environment index f106b4b..94f914e 100644 --- a/linux/pam_environment +++ b/linux/pam_environment @@ -2,11 +2,11 @@ GTK_IM_MODULE DEFAULT=fcitx QT_IM_MODULE DEFAULT=fcitx XMODIFIERS DEFAULT=@im=fcitx -GTK_THEME DEFAULT=Numix:dark -GTK2_RC_FILES DEFAULT=/usr/share/themes/Numix/gtk-2.0/gtkrc +GTK_THEME DEFAULT=Lumiere +GTK2_RC_FILES DEFAULT=/usr/share/themes/Lumiere/gtk-2.0/gtkrc BROWSER DEFAULT=google-chrome-stable QT_STYLE_OVERRIDE DEFAULT=GTK+ QT_QPA_PLATFORMTHEME DEFAULT=gtk2 -GDK_SCALE DEFAULT=1 \ No newline at end of file +GDK_SCALE DEFAULT=1 diff --git a/linux/picom/picom.conf b/linux/picom/picom.conf index fc1bda4..365e9d0 100644 --- a/linux/picom/picom.conf +++ b/linux/picom/picom.conf @@ -2,7 +2,7 @@ # Corners # ################################# # requires: https://github.com/sdhand/compton -corner-radius = 10.0; +corner-radius = 0; rounded-corners-exclude = [ #"window_type = 'normal'", #"class_g = 'Rofi'", @@ -24,13 +24,13 @@ round-borders-exclude = [ ################################# # Enabled client-side shadows on windows. -shadow = false; +shadow = true; # The blur radius for shadows. (default 12) -shadow-radius = 18; +shadow-radius = 10; # The left offset for shadows. (default -15) -shadow-offset-x = -15; +shadow-offset-x = -10; # The top offset for shadows. (default -15) -shadow-offset-y = -15; +shadow-offset-y = -10; # The translucency for shadows. (default .75) shadow-opacity = 0.25; @@ -41,7 +41,8 @@ shadow-exclude = [ "class_g = 'Cairo-clock'", "class_g = 'slop'", "class_g = 'Polybar'", - "_GTK_FRAME_EXTENTS@:c" + "_GTK_FRAME_EXTENTS@:c", + "_PICOM_ROUNDED@:32c = 0" ]; # Avoid drawing shadow on all shaped windows (see also: --detect-rounded-corners) diff --git a/linux/polybar/config b/linux/polybar/config index 985b554..3491d90 100644 --- a/linux/polybar/config +++ b/linux/polybar/config @@ -18,16 +18,16 @@ [colors] ;background = ${xrdb:color0:#222} -background = #cc000000 -background-focused = #ccdd5555 -background-label = #cc000000 +background = #008abeb7 +background-focused = #335555 +background-label = #008abeb7 ;foreground = ${xrdb:color7:#222} -foreground = #ccc -foreground-focused = #fff -foreground-alt = #ccc +foreground = #FFFFFF +foreground-focused = #FFFFFF +foreground-alt = #FFFFFF primary = #ffb52a -secondary = #dd5555 -alert = #ccbd2c40 +secondary = #FFFFFF +alert = #bd2c40 [bar/mybar] ;monitor = ${env:MONITOR:HDMI-1} @@ -65,7 +65,7 @@ modules-right = mpd pulseaudio eth wlan battery date tray-position = right tray-padding = 2 tray-scale = 1.0 -tray-maxsize = 32 +tray-maxsize = 16 cursor-click = pointer cursor-scroll = ns-resize @@ -99,7 +99,7 @@ label-urgent-padding = 2 label-empty = %name% :%index% label-empty-background = ${colors.background-label} -label-empty-foreground = #888888 +label-empty-foreground = #9bc7c7 label-empty-padding = 2 [module/wlan] @@ -146,7 +146,7 @@ interval = 5 date = " %Y年%m月%d日 %A" -time = %{F#dd5555}%{F-} %H時%M分 +time = %{F#FFFFFF}%{F-} %H時%M分 format-prefix = "" format-prefix-foreground = ${colors.secondary} diff --git a/linux/sxhkd/sxhkdrc b/linux/sxhkd/sxhkdrc index 312ef77..ca61890 100644 --- a/linux/sxhkd/sxhkdrc +++ b/linux/sxhkd/sxhkdrc @@ -130,7 +130,7 @@ super + {Left,Down,Up,Right} super + p bspc node -g sticky; \ bspc node --state \~floating; \ - xdotool getactivewindow windowsize $(expr 512 \* $SCALE) $(expr 288 \* $SCALE) windowmove $(expr $XSIZE - $(expr 512 + 45) \* $SCALE) $(expr $YSIZE - $(expr 288 + 30) \* $SCALE) + xdotool getactivewindow windowsize $(expr 620 \* $SCALE) $(expr 349 \* $SCALE) windowmove $(expr $XSIZE - $(expr 620 + 45) \* $SCALE) $(expr $YSIZE - $(expr 349 + 30) \* $SCALE) XF86AudioMute diff --git a/linux/zshrc b/linux/zshrc index 1f21b06..306de4b 100644 --- a/linux/zshrc +++ b/linux/zshrc @@ -8,6 +8,8 @@ export PATH="$HOME/.yarn/bin:$PATH" # Path to your oh-my-zsh installation. export ZSH="/home/vbalien/.oh-my-zsh" +export FZF_DEFAULT_COMMAND='fd --type f' + # Set name of the theme to load --- if set to "random", it will # load a random theme each time oh-my-zsh is loaded, in which case, # to know which specific one was loaded, run: echo $RANDOM_THEME diff --git a/mapping.ts b/mapping.ts index 85f6f6e..fbeda43 100644 --- a/mapping.ts +++ b/mapping.ts @@ -2,8 +2,8 @@ import { dot, DotOption } from "./scripts/dot.ts"; const common: DotOption = { link: { - ".gitconfig": "gitconfig", - }, + ".gitconfig": "gitconfig" + } }; const linux: DotOption = { @@ -19,8 +19,8 @@ const linux: DotOption = { gnome-settings-daemon nitrogen dex sassc ttf-nanum fcitx5 fcitx5-qt fcitx5-gtk fcitx5-hangul fcitx5-anthy kcm-fcitx5 numix-gtk-theme-git numix-circle-icon-theme-git - telegram-desktop nautilus eog smplayer smplayer-skin transgui-qt - qt5-styleplugins xdg-user-dirs slim network-manager-applet bc`, + telegram-desktop nautilus eog smplayer smplayer-skins transgui-qt + qt5-styleplugins xdg-user-dirs slim network-manager-applet bc` ], link: { ...common.link, @@ -38,12 +38,13 @@ const linux: DotOption = { ".config/dconf": "linux/dconf", ".config/systemd": "linux/systemd", ".config/wallpaper": "wallpaper", + ".config/nvim": "linux/nvim", ".xinitrc": "linux/xinitrc", ".pam_environment": "linux/pam_environment", ".zshrc": "linux/zshrc", ".Xmodmap": "linux/Xmodmap", - ".Xresources": "linux/Xresources", - }, + ".Xresources": "linux/Xresources" + } }; const linuxHiDPI: DotOption = { @@ -55,8 +56,8 @@ const linuxHiDPI: DotOption = { ".config/dunst": "linux-hidpi/dunst", ".config/picom": "linux-hidpi/picom", ".pam_environment": "linux-hidpi/pam_environment", - ".Xresources": "linux-hidpi/Xresources", - }, + ".Xresources": "linux-hidpi/Xresources" + } }; try { diff --git a/wallpaper/kitsune_girl.png b/wallpaper/kitsune_girl.png deleted file mode 100644 index 722a6a9..0000000 Binary files a/wallpaper/kitsune_girl.png and /dev/null differ diff --git a/wallpaper/millimas.png b/wallpaper/millimas.png deleted file mode 100644 index 6b588c2..0000000 Binary files a/wallpaper/millimas.png and /dev/null differ diff --git a/wallpaper/sagiri_izumi_light.png b/wallpaper/sagiri_izumi_light.png new file mode 100644 index 0000000..adf2bd3 Binary files /dev/null and b/wallpaper/sagiri_izumi_light.png differ