diff --git a/files/.config/alacritty/alacritty.yml b/files/.config/alacritty/alacritty.yml index d4cfa25..a0058bb 100644 --- a/files/.config/alacritty/alacritty.yml +++ b/files/.config/alacritty/alacritty.yml @@ -9,6 +9,7 @@ import: - ~/.alacritty_local.yml + - ~/.config/alacritty/themes/nord.yml env: TERM: alacritty @@ -36,60 +37,6 @@ font: family: FiraCode Nerd Font Mono style: Regular -# Colors (Doom One) -colors: - # Default colors - primary: - background: '0x282c34' - foreground: '0xbbc2cf' - - # Normal colors - normal: - black: '0x282c34' - red: '0xff6c6b' - green: '0x98be65' - yellow: '0xecbe7b' - blue: '0x51afef' - magenta: '0xc678dd' - cyan: '0x46d9ff' - white: '0xbbc2cf' - -# Darker variant -#colors: -# primary: -# background: '#1C1B1D' -# foreground: '#D8D8D8' -# cursor: -# text: '#1C1B1D' -# cursor: '#D8D8D8' -# normal: -# black: '#24272a' -# red: '#E06C75' -# green: '#98C379' -# yellow: '#E5C07B' -# blue: '#61AFEF' -# magenta: '#C678DD' -# cyan: '#56B6C2' -# white: '#D8D8D8' -# bright: -# black: '#D8D8D8' -# red: '#E06C75' -# green: '#98C379' -# yellow: '#E5C07B' -# blue: '#61AFEF' -# magenta: '#C678DD' -# cyan: '#56B6C2' -# white: '#D8D8D8' -# dim: -# black: '#24272a' -# red: '#E06C75' -# green: '#98C379' -# yellow: '#E5C07B' -# blue: '#61AFEF' -# magenta: '#C678DD' -# cyan: '#56B6C2' -# white: '#D8D8D8' - background_opacity: 1 selection: diff --git a/files/.config/alacritty/themes/nord.yml b/files/.config/alacritty/themes/nord.yml new file mode 100644 index 0000000..3c98e0c --- /dev/null +++ b/files/.config/alacritty/themes/nord.yml @@ -0,0 +1,28 @@ +# Colors (Nord) +colors: + # Default colors + primary: + background: '#2E3440' + foreground: '#D8DEE9' + + # Normal colors + normal: + black: '#3B4252' + red: '#BF616A' + green: '#A3BE8C' + yellow: '#EBCB8B' + blue: '#81A1C1' + magenta: '#B48EAD' + cyan: '#88C0D0' + white: '#E5E9F0' + + # Bright colors + bright: + black: '#4C566A' + red: '#BF616A' + green: '#A3BE8C' + yellow: '#EBCB8B' + blue: '#81A1C1' + magenta: '#B48EAD' + cyan: '#8FBCBB' + white: '#ECEFF4' diff --git a/files/.config/alacritty/themes/one.yml b/files/.config/alacritty/themes/one.yml new file mode 100644 index 0000000..e342b20 --- /dev/null +++ b/files/.config/alacritty/themes/one.yml @@ -0,0 +1,17 @@ +# Colors (Doom One) +colors: + # Default colors + primary: + background: '0x282c34' + foreground: '0xbbc2cf' + + # Normal colors + normal: + black: '0x282c34' + red: '0xff6c6b' + green: '0x98be65' + yellow: '0xecbe7b' + blue: '0x51afef' + magenta: '0xc678dd' + cyan: '0x46d9ff' + white: '0xbbc2cf' diff --git a/files/.config/alacritty/themes/onedark.yml b/files/.config/alacritty/themes/onedark.yml new file mode 100644 index 0000000..8aa85cd --- /dev/null +++ b/files/.config/alacritty/themes/onedark.yml @@ -0,0 +1,35 @@ +# Onedark +colors: + primary: + background: '#1C1B1D' + foreground: '#D8D8D8' + cursor: + text: '#1C1B1D' + cursor: '#D8D8D8' + normal: + black: '#24272a' + red: '#E06C75' + green: '#98C379' + yellow: '#E5C07B' + blue: '#61AFEF' + magenta: '#C678DD' + cyan: '#56B6C2' + white: '#D8D8D8' + bright: + black: '#D8D8D8' + red: '#E06C75' + green: '#98C379' + yellow: '#E5C07B' + blue: '#61AFEF' + magenta: '#C678DD' + cyan: '#56B6C2' + white: '#D8D8D8' + dim: + black: '#24272a' + red: '#E06C75' + green: '#98C379' + yellow: '#E5C07B' + blue: '#61AFEF' + magenta: '#C678DD' + cyan: '#56B6C2' + white: '#D8D8D8' diff --git a/files/.tmux.conf b/files/.tmux.conf index 55ddbf1..cb269f6 100644 --- a/files/.tmux.conf +++ b/files/.tmux.conf @@ -28,8 +28,8 @@ set -g status-fg white set -g status-right '%Y.%m.%d %H:%M' set-window-option -g window-status-current-format ' #I:#W ' -set-window-option -g window-status-current-style "bg=#98c379,fg=#282c34" -set-window-option -g window-status-activity-style "bg=#ff6c6b,fg=#282c34" +set-window-option -g window-status-current-style "bg=#81A1C1,fg=#2E3440" +set-window-option -g window-status-activity-style "bg=#81A1C1,fg=#2E3440" set-window-option -g window-status-format ' #I:#W ' set-window-option -g window-status-separator '' diff --git a/files/.vimrc b/files/.vimrc index 99a47bb..3e04397 100644 --- a/files/.vimrc +++ b/files/.vimrc @@ -13,6 +13,7 @@ let mapleader = "\" call plug#begin() Plug 'joshdick/onedark.vim' " color scheme +Plug 'arcticicestudio/nord-vim' Plug 'tpope/vim-sleuth' " heuristic file indendation @@ -40,7 +41,7 @@ call plug#end() " ============================== Colors syntax on set background=dark -colorscheme onedark +colorscheme nord hi Normal ctermbg=NONE guibg=NONE set termguicolors diff --git a/files/init.el b/files/init.el index 9bb4e3f..f631a52 100644 --- a/files/init.el +++ b/files/init.el @@ -66,7 +66,7 @@ (use-package doom-themes :ensure t :init - (load-theme 'doom-vibrant t)) + (load-theme 'doom-nord t)) (use-package doom-modeline :ensure t @@ -407,6 +407,8 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. + '(custom-safe-themes + '("e074be1c799b509f52870ee596a5977b519f6d269455b84ed998666cf6fc802a" "8f5a7a9a3c510ef9cbb88e600c0b4c53cdcdb502cfe3eb50040b7e13c6f4e78e" "fce3524887a0994f8b9b047aef9cc4cc017c5a93a5fb1f84d300391fba313743" default)) '(package-selected-packages '(dashboard org-bullets ein fill-column-indicator lsp-haskell haskell-mode lsp-java auctex rust-mode flycheck yasnippet counsel-projectile projectile company-box company lsp-ivy lsp-ui lsp-mode magit counsel evil-collection evil which-key general all-the-icons doom-themes use-package))) (custom-set-faces diff --git a/screenshots/pc.png b/screenshots/pc.png index c74d215..02daf28 100644 Binary files a/screenshots/pc.png and b/screenshots/pc.png differ