diff --git a/Code/User/settings.json b/Code/User/settings.json deleted file mode 100644 index 6a2d522..0000000 --- a/Code/User/settings.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "editor.fontFamily": "'TerminessTTF Nerd Font Mono', 'Noto Color Emoji', 'Droid Sans Mono', 'monospace', monospace, 'Droid Sans Fallback'", - "editor.tabSize": 2, - "explorer.confirmDelete": false, - "workbench.sideBar.location": "right", - "vim.neovimPath": "/usr/bin/nvim", - "[typescriptreact]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "vim.useSystemClipboard": true, - "files.encoding": "utf8", - "[javascript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[json]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[typescript]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[rust]": { - "editor.tabSize": 4 - }, - "[c]": { - "editor.wordBasedSuggestions": false, - "editor.suggest.insertMode": "replace" - }, - "[cpp]": { - "editor.wordBasedSuggestions": false, - "editor.suggest.insertMode": "replace" - }, - "eslint.alwaysShowStatus": true, - "eslint.packageManager": "yarn", - "eslint.validate": [ - "javascript", - "javascriptreact", - "typescript", - "typescriptreact" - ], - "typescript.updateImportsOnFileMove.enabled": "always", - "workbench.iconTheme": "material-icon-theme", - "workbench.colorTheme": "GitHub Light", - "workbench.colorCustomizations": { - "statusBar.noFolderBackground": "#8abeb7", - "statusBar.background": "#8abeb7", - "statusBar.foreground": "#fff", - "statusBar.border": "#8abeb7", - "list.activeSelectionBackground": "#8abeb7", - "badge.background": "#8abeb7", - "activityBarBadge.background": "#8abeb7", - "menu.background": "#fff", - "menu.selectionBackground": "#8abeb7", - "list.focusBackground": "#8abeb7", - "activityBar.activeBorder": "#8abeb7", - "activityBar.foreground": "#335555", - "activityBar.background": "#8abeb7", - "activityBar.inactiveForeground": "#fff", - "focusBorder": "#8abeb7", - "button.background": "#8abeb7", - "textLink.foreground": "#8abeb7", - "extensionButton.prominentBackground": "#8abeb7", - - "terminal.foreground": "#4d4d4c", - "terminal.background": "#ffffff", - "terminal.ansiBlack": "#000000", - "terminal.ansiBlue": "#4271ae", - "terminal.ansiCyan": "#8abeb7", - "terminal.ansiGreen": "#718c00", - "terminal.ansiMagenta": "#8959a8", - "terminal.ansiRed": "#c82829", - "terminal.ansiWhite": "#ffffff", - "terminal.ansiYellow": "#eab700", - "terminal.ansiBrightBlack": "#000000", - "terminal.ansiBrightBlue": "#4271ae", - "terminal.ansiBrightCyan": "#8abeb7", - "terminal.ansiBrightGreen": "#718c00", - "terminal.ansiBrightMagenta": "#8959a8", - "terminal.ansiBrightRed": "#c82829", - "terminal.ansiBrightWhite": "#ffffff", - "terminal.ansiBrightYellow": "#eab700" - }, - "editor.formatOnSave": true, - "vim.enableNeovim": true, - "vim.handleKeys": { - "": false - }, - "editor.fontSize": 14, - "javascript.updateImportsOnFileMove.enabled": "always" -} \ No newline at end of file diff --git a/linux/alacritty/alacritty.yml b/linux/alacritty/alacritty.yml index 6dfb0d8..f558326 100644 --- a/linux/alacritty/alacritty.yml +++ b/linux/alacritty/alacritty.yml @@ -161,35 +161,35 @@ font: # If `true`, bold text is drawn using the bright color variants. #draw_bold_text_with_bright_colors: false -# Colors (Tomorrow Night Bright) +# Colors (Tomorrow) colors: bright: - black: "#000000" - blue: "#4271ae" - cyan: "#8abeb7" - green: "#718c00" - magenta: "#8959a8" - red: "#c82829" - white: "#ffffff" - yellow: "#eab700" + black: '#000000' + blue: '#4271ae' + cyan: '#3e999f' + green: '#718c00' + magenta: '#e6b1b1' + red: '#c82829' + white: '#ffffff' + yellow: '#eab700' cursor: - cursor: "#4d4d4c" - text: "#ffffff" + cursor: '#4d4d4c' + text: '#ffffff' normal: - black: "#000000" - blue: "#4271ae" - cyan: "#8abeb7" - green: "#718c00" - magenta: "#8959a8" - red: "#c82829" - white: "#ffffff" - yellow: "#eab700" + black: '#000000' + blue: '#4271ae' + cyan: '#3e999f' + green: '#718c00' + magenta: '#e6b1b1' + red: '#c82829' + white: '#ffffff' + yellow: '#eab700' primary: - background: "#ffffff" - foreground: "#4d4d4c" + background: '#ffffff' + foreground: '#4d4d4c' selection: - background: "#d6d6d6" - text: "#4d4d4c" + background: '#d6d6d6' + text: '#4d4d4c' # foreground: '#eaeaea' # Bright and dim foreground colors @@ -287,7 +287,7 @@ colors: # # 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.75 +background_opacity: 0.65 #selection: #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" diff --git a/linux/bin/ufetch b/linux/bin/ufetch index df9efac..8f53c90 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}${cyan}" # labels -nc="${reset}${bold}${cyan}" # user and hostname +lc="${reset}${bold}${magenta}" # labels +nc="${reset}${bold}${magenta}" # user and hostname ic="${reset}" # info -c0="${reset}${cyan}" # first color +c0="${reset}${magenta}" # first color ## OUTPUT diff --git a/linux/bspwm/bspwmrc b/linux/bspwm/bspwmrc index 56fe319..98f0bff 100755 --- a/linux/bspwm/bspwmrc +++ b/linux/bspwm/bspwmrc @@ -17,8 +17,8 @@ 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 '#8abeb7' -bspc config normal_border_color '#cceeee' +bspc config focused_border_color '#cd9e9e' +bspc config normal_border_color '#f3d6d6' bspc rule -a Nextcloud desktop='^1' state=floating follow=on bspc rule -a "*:transgui" state=floating follow=on diff --git a/linux/conkyrc b/linux/conkyrc index d190522..2597d00 100644 --- a/linux/conkyrc +++ b/linux/conkyrc @@ -16,8 +16,8 @@ draw_borders=false, ------------------------------------- -- Window Specifications ------------------------------------- -gap_x=530, -gap_y=450, +gap_x=410, +gap_y=380, minimum_height=250, minimum_width=360, diff --git a/linux/dconf/user b/linux/dconf/user index 146a558..3787d7c 100644 Binary files a/linux/dconf/user and b/linux/dconf/user differ diff --git a/linux/dunst/dunstrc b/linux/dunst/dunstrc index e3fc0fe..045202c 100644 --- a/linux/dunst/dunstrc +++ b/linux/dunst/dunstrc @@ -64,7 +64,7 @@ frame_width = 3 # Defines color of the frame around the notification window. - frame_color = "#8abeb7" + frame_color = "#cd9e9e" # Define a color for the separator. # possible values are: @@ -213,7 +213,7 @@ # corners. # The radius will be automatically lowered if it exceeds half of the # notification height to avoid clipping text and/or icons. - corner_radius = 0 + corner_radius = 18 ### Legacy @@ -236,8 +236,8 @@ # invoke it. If there are multiple and no default, open the context menu. # * close_current: Close current notification. # * close_all: Close all notifications. - mouse_left_click = close_current - mouse_middle_click = do_action + mouse_left_click = do_action + mouse_middle_click = close_current mouse_right_click = close_all # Experimental features that may or may not work correctly. Do not expect them diff --git a/linux/fcitx5/conf/hangul.conf b/linux/fcitx5/conf/hangul.conf index 3727998..0e060d7 100644 --- a/linux/fcitx5/conf/hangul.conf +++ b/linux/fcitx5/conf/hangul.conf @@ -1,10 +1,10 @@ -# キーボードレイアウト +# Keyboard Layout Keyboard=Dubeolsik -# 自動並び替え +# Auto Reorder AutoReorder=True -# 単語確定 +# Word Commit WordCommit=False -# 朝鮮漢字モード +# Hanja Mode HanjaMode=False [HanjaModeToggleKey] diff --git a/linux/glava/radial.glsl b/linux/glava/radial.glsl index 69dfa16..99e6906 100755 --- a/linux/glava/radial.glsl +++ b/linux/glava/radial.glsl @@ -1,6 +1,6 @@ /* center radius (pixels) */ -#define C_RADIUS 440 +#define C_RADIUS 340 /* center line thickness (pixels) */ #define C_LINE 0 /* outline color */ @@ -30,7 +30,7 @@ /* Offset (Y) of the visualization */ #define CENTER_OFFSET_Y 0 /* Offset (X) of the visualization */ -#define CENTER_OFFSET_X 0 +#define CENTER_OFFSET_X 400 /* Gravity step, override from `smooth_parameters.glsl` */ #request setgravitystep 5.0 diff --git a/linux/picom/picom.conf b/linux/picom/picom.conf index ca371d3..9850f97 100644 --- a/linux/picom/picom.conf +++ b/linux/picom/picom.conf @@ -2,7 +2,7 @@ # Corners # ################################# # requires: https://github.com/sdhand/compton -corner-radius = 0; +corner-radius = 18; rounded-corners-exclude = [ #"window_type = 'normal'", #"class_g = 'Rofi'", @@ -13,6 +13,7 @@ rounded-corners-exclude = [ #"class_g = 'TelegramDesktop'", #"class_g = 'firefox'", #"class_g = 'Thunderbird'" + #"_PICOM_ROUNDED@:32c = 0" ]; round-borders = 1; round-borders-exclude = [ @@ -24,13 +25,13 @@ round-borders-exclude = [ ################################# # Enabled client-side shadows on windows. -shadow = true; +shadow = false; # The blur radius for shadows. (default 12) -shadow-radius = 10; +shadow-radius = 20; # The left offset for shadows. (default -15) -shadow-offset-x = -10; +shadow-offset-x = -18; # The top offset for shadows. (default -15) -shadow-offset-y = -10; +shadow-offset-y = -18; # The translucency for shadows. (default .75) shadow-opacity = 0.25; @@ -44,7 +45,7 @@ shadow-exclude = [ "class_g = 'conky'", "class_g = 'GLava'", "_GTK_FRAME_EXTENTS@:c", -# "_PICOM_ROUNDED@:32c = 0" + # "_PICOM_ROUNDED@:32c = 0" ]; # Avoid drawing shadow on all shaped windows (see also: --detect-rounded-corners) @@ -105,7 +106,7 @@ frame-opacity = 1; inactive-opacity-override = false; # Default opacity for active windows. (0.0 - 1.0, defaults to 1.0) -active-opacity = 0.95; +active-opacity = 1; # Dim inactive windows. (0.0 - 1.0, defaults to 0.0) # inactive-dim = 0.0 @@ -196,6 +197,7 @@ blur-background-exclude = [ "class_g = 'slop'", "class_g = 'conky'", "class_g = 'GLava'", + "class_g = 'Polybar'", "_GTK_FRAME_EXTENTS@:c", ]; diff --git a/linux/polybar/config b/linux/polybar/config index 2e9aa14..37595d4 100644 --- a/linux/polybar/config +++ b/linux/polybar/config @@ -19,7 +19,7 @@ [colors] ;background = ${xrdb:color0:#222} background = #008abeb7 -background-focused = #335555 +background-focused = #cd9e9e background-label = #008abeb7 ;foreground = ${xrdb:color7:#222} foreground = #FFFFFF @@ -100,7 +100,7 @@ label-urgent-padding = 2 label-empty = %name% :%index% label-empty-background = ${colors.background-label} -label-empty-foreground = #9bc7c7 +label-empty-foreground = #f3d6d6 label-empty-padding = 2 [module/wlan] diff --git a/linux/rofi/numix.rasi b/linux/rofi/numix.rasi index 7e8f6b1..ae7efbd 100644 --- a/linux/rofi/numix.rasi +++ b/linux/rofi/numix.rasi @@ -12,8 +12,8 @@ lightbg: rgba ( 238, 232, 213, 100 % ); selected-active-foreground: #fff; alternate-active-background: rgba ( 0, 0, 0, 3 % ); - background: rgba ( 255, 255, 255, 90 % ); - bordercolor: #8abeb7; + background: rgba ( 255, 255, 255, 70 % ); + bordercolor: #cd9e9e; alternate-normal-foreground: @foreground; normal-background: rgba ( 0, 0, 0, 0 % ); lightfg: rgba ( 88, 104, 117, 100 % ); @@ -31,8 +31,8 @@ } #window { background-color: @background; - border: 0.75mm; - border-radius: 0; + border: 1mm; + border-radius: 4.7mm; padding: 2.5mm; } #mainbox { diff --git a/mapping.ts b/mapping.ts index 6975a81..1e35901 100644 --- a/mapping.ts +++ b/mapping.ts @@ -4,7 +4,6 @@ const common: DotOption = { link: { ".gitconfig": "gitconfig", ".config/omz": "omz", - ".config/Code/User/settings.json": "Code/User/settings.json", ".config/nvim": "nvim", ".tmux.conf": "tmux.conf", ".tmux/themes": "tmux/themes", @@ -22,7 +21,7 @@ const darwin: DotOption = { }; const linux: DotOption = { - hostname: ["office2", "T490s"], + hostname: ["office", "T490s"], install: [ `sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"`, `sh -c "git clone https://github.com/addy-dclxvi/gtk-theme-collections ~/.themes"`, @@ -37,7 +36,7 @@ const linux: DotOption = { kcm-fcitx5 numix-gtk-theme-git numix-circle-icon-theme-git telegram-desktop nautilus eog smplayer smplayer-skins transgui-qt qt5-styleplugins xdg-user-dirs slim network-manager-applet bc - glava conky jq xdo ttf-roboto` + glava conky jq xdo ttf-roboto xorg-xsetroot xorg-xinput noto-fonts-cjk` ], link: { ...common.link, @@ -57,7 +56,6 @@ const linux: DotOption = { ".xinitrc": "linux/xinitrc", ".conkyrc": "linux/conkyrc", ".jelly-conky": "linux/jelly-conky", - ".themes": "linux/themes", ".bash_profile": "linux/bash_profile", ".pam_environment": "linux/pam_environment", ".Xmodmap": "linux/Xmodmap", diff --git a/omz/vbalien.zsh-theme b/omz/vbalien.zsh-theme index b60bbc9..de3ed4a 100644 --- a/omz/vbalien.zsh-theme +++ b/omz/vbalien.zsh-theme @@ -206,7 +206,7 @@ prompt_hg() { # Dir: current working directory prompt_dir() { - prompt_segment cyan $CURRENT_FG '%~' + prompt_segment magenta $CURRENT_FG '%~' } # Virtualenv: current working virtualenv diff --git a/wallpaper/matou_sakura.png b/wallpaper/matou_sakura.png new file mode 100644 index 0000000..dba2195 Binary files /dev/null and b/wallpaper/matou_sakura.png differ diff --git a/wallpaper/sagiri_izumi_light.png b/wallpaper/sagiri_izumi_light.png deleted file mode 100644 index adf2bd3..0000000 Binary files a/wallpaper/sagiri_izumi_light.png and /dev/null differ diff --git a/zshrc b/zshrc index 1c0c4c6..41076d6 100644 --- a/zshrc +++ b/zshrc @@ -108,3 +108,5 @@ export GPG_TTY=$(tty) alias vim=nvim alias open=xdg-open ufetch + +[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh