From ac1c15d1283b42662b040a613c2f8e56dbf4e23b Mon Sep 17 00:00:00 2001 From: Marco Thomas Date: Mon, 9 Nov 2020 18:11:41 +0100 Subject: [PATCH] Update Dots --- README.md | 4 +- files/.config/i3/config | 3 +- files/.config/polybar/config | 2 +- .../.config/polybar/scripts/spotify_status.py | 2 +- files/.vimrc | 8 +- fonts/copyfonts.sh | 4 +- themes/MinimalCord.theme.css | 34 ++ themes/Onepunch/color.ini | 19 + themes/Onepunch/user.css | 347 ++++++++++++++++++ themes/pimp_spotify.sh | 10 + 10 files changed, 424 insertions(+), 9 deletions(-) create mode 100644 themes/MinimalCord.theme.css create mode 100644 themes/Onepunch/color.ini create mode 100644 themes/Onepunch/user.css create mode 100755 themes/pimp_spotify.sh diff --git a/README.md b/README.md index 4b80eb0..f69fe12 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,8 @@ + Image-Viewer: sxiv + Info: [fet.sh](https://github.com/6gk/fet.sh) and neofetch + Launcher: dmenu -+ Pdf-Viewer: epdfview or zathura ++ Music: spotify with [Onepunch-Theme](https://github.com/morpheusthewhite/spicetify-themes/tree/master/Onepunch) ++ Pdf-Viewer: zathura with mupdf + Screenshots: Flameshot + Video-Player: vlc or mpv @@ -25,6 +26,7 @@ + [vim-plug](https://github.com/junegunn/vim-plug) + fcitx + mozc: Japanese Keyboard + fzf ++ spicetify-cli ### Nvim LSP diff --git a/files/.config/i3/config b/files/.config/i3/config index e50c086..e6d14a9 100644 --- a/files/.config/i3/config +++ b/files/.config/i3/config @@ -75,10 +75,11 @@ bindsym XF86AudioNext exec playerctl next bindsym XF86AudioPrev exec playerctl previous # ======================================== Open Applications +bindsym $mod+e exec thunar + mode "Open" { bindsym c exec google-calendar-dark bindsym d exec discord; exec Discord - bindsym e exec thunar bindsym f exec firefox bindsym m exec thunderbird bindsym n exec notion-app diff --git a/files/.config/polybar/config b/files/.config/polybar/config index 9e44474..029d406 100644 --- a/files/.config/polybar/config +++ b/files/.config/polybar/config @@ -13,7 +13,7 @@ accent-alt = #98c379 monitor = ${env:MONITOR} font-0 = "Heebo Medium:pixelsize=10;1" -font-1 = "Noto Sans CJK JP:antialiase=false:pixelsize=9;1" +font-1 = "Noto Sans CJK JP:antialiase=false:pixelsize=10;0" font-2 = "Siji:size=7;1" font-3 = "Wuncon Siji:size=7;1" diff --git a/files/.config/polybar/scripts/spotify_status.py b/files/.config/polybar/scripts/spotify_status.py index 7199f4e..b8f613e 100755 --- a/files/.config/polybar/scripts/spotify_status.py +++ b/files/.config/polybar/scripts/spotify_status.py @@ -68,7 +68,7 @@ def truncate(name, trunclen): # Default parameters output = fix_string(u'{play_pause} {artist}: {song}') -trunclen = 35 +trunclen = 60 play_pause = fix_string(u'\u25B6,\u23F8') # first character is play, second is paused label_with_font = '%{{T{font}}}{label}%{{T-}}' diff --git a/files/.vimrc b/files/.vimrc index 312ab39..4d68918 100644 --- a/files/.vimrc +++ b/files/.vimrc @@ -127,7 +127,7 @@ nmap :Files " ============================== LSP -" ++++++++++ completion-nvim Settings +" ---------- completion-nvim Settings if has ("nvim") " Use completion-nvim in every buffer autocmd BufEnter * lua require'completion'.on_attach() @@ -160,7 +160,7 @@ if has ("nvim") set pumheight=10 endif -" ++++++++++ lsp Settings +" ---------- lsp Settings if has ("nvim") " Show definition nnoremap gd lua vim.lsp.buf.definition() @@ -169,14 +169,14 @@ if has ("nvim") nnoremap K lua vim.lsp.buf.hover() endif -" ++++++++++ neosnippet Settings +" ---------- neosnippet Settings if has ("nvim") imap (neosnippet_expand_or_jump) smap (neosnippet_expand_or_jump) xmap (neosnippet_expand_target) endif -" ++++++++++ Enable Language Servers +" ---------- Enable Language Servers if has ("nvim") if executable("pyls") lua << EOF diff --git a/fonts/copyfonts.sh b/fonts/copyfonts.sh index d340a2c..3b41e14 100755 --- a/fonts/copyfonts.sh +++ b/fonts/copyfonts.sh @@ -2,8 +2,10 @@ # Make sure the paths are correct path=$(pwd) +fontpattern="*.*tf" + +cp $path/$fontpattern $HOME/.local/share/fonts/. -cp $path/*.ttf $HOME/.local/share/fonts/. echo "Fonts copied, reloading cache..." fc-cache -v diff --git a/themes/MinimalCord.theme.css b/themes/MinimalCord.theme.css new file mode 100644 index 0000000..c88ce2c --- /dev/null +++ b/themes/MinimalCord.theme.css @@ -0,0 +1,34 @@ +/** + * @name MinimalCord + * @author Gibbu#1211 + * @version 1.0.0 + * @description Changes Discord enough to give it a fresh feel while also making it darker. Supports both Light and Dark themes. + * @source https://github.com/Gibbu/BetterDiscord-Themes/tree/master/MinimalCord + * @website https://www.gibbu.me +*/ + +@import url('https://fonts.googleapis.com/css?family=Roboto:300,400,500,700,900'); +@import url("https://gibbu.github.io/BetterDiscord-Themes/MinimalCord/base.css"); + +/* Black Box user tags */ +@import url('https://monstrousdev.github.io/themes/addons/user-tags.css'); + +:root { + /* + Accent variable + Use this website: https://htmlcolorcodes.com/color-picker/ + to get your desired RGB numbers. Then simply put each number in their respective area. + R,G,B + */ + --accent: 152, 195, 121; /* DEFAULT: 22, 188, 249 */ + --search-results-width: 25vw; /* Width of server results. For a fixed width use px. | DEFAULT: 25vw */ + --emoji-picker-height: 260px; /* Height of Emoji picker | DEFAULT: 260px */ + --chat-message-padding: 20px; /* Spacing around messages | DEFAULT: 20px */ + --chat-message-spacing: 20px; /* Spacing between message | DEFAULT: 20px */ + + /* + To use a custom font. Visit https://fonts.google.com and select one to your liking. + Now just follow this tutorial: https://imgur.com/a/CNbw7xC + */ + --font: 'Roboto'; +} diff --git a/themes/Onepunch/color.ini b/themes/Onepunch/color.ini new file mode 100644 index 0000000..8ca86d5 --- /dev/null +++ b/themes/Onepunch/color.ini @@ -0,0 +1,19 @@ +[Base] +main_fg = 1DB954 +secondary_fg = DEDEDE +main_bg = 111111 +main_bg_second = 282828 +sidebar_and_player_bg = 111111 +cover_overlay_and_shadow = 212121 +indicator_fg_and_button_bg = 1DB954 +pressing_fg = FF5C86 +slider_bg = 3F3C45 +sidebar_indicator_and_hover_button_bg = 1DC954 +scrollbar_fg_and_selected_row_bg = 3B3B3B +pressing_button_fg = DEDEDE +pressing_button_bg = 383145 +selected_button = 1DB954 +miscellaneous_bg = 3F3C45 +miscellaneous_hover_bg = 3B3B3B +primary_text = FAFAFA +preserve_1 = FAFAFA diff --git a/themes/Onepunch/user.css b/themes/Onepunch/user.css new file mode 100644 index 0000000..df05ca8 --- /dev/null +++ b/themes/Onepunch/user.css @@ -0,0 +1,347 @@ +:root {} +/* +* +* RESIZING THE ICONS +* +*/ +/* pause button no hover */ +.card.playing .view-player .player-controls-container .controls .button-play.button-play:not(:hover):before, +.tl-row.playing .view-player .player-controls-container .controls .button-play.button-play:not(:hover):before, +.view-player .player-controls-container .controls .button-play.button-play.playing:not(:hover):before { + font-size: 38px !important; +} +/* pause button hover */ +.card.playing .view-player .player-controls-container .controls .button-play.button-play:hover:before, +.tl-row.playing .view-player .player-controls-container .controls .button-play.button-play:hover:before, +.view-player .player-controls-container .controls .button-play.button-play.playing:hover:before { + font-size: 33px !important; +} +/* play button */ +.view-player .player-controls-container .controls .button-play.button-play:before { + font-size: 33px !important; +} +/* +* +* OTHER UI CHANGES +* +*/ +/* NAVIGATION MENU EDITS */ +/* #menu-wrapper { + width: 250px; + height: 100%; + top: 0; + left: 10; + position: fixed; + z-index: ; +} */ +.sidebar .sidebar-navbar { + padding-top: 12px; +} + +.RootlistItem--is-active, +.SidebarListItem--is-active { + background : #3b3b3b; + border-radius: 10px; + width : 70%; + position : relative; + right : -30px; +} + +.SidebarListItem { + padding-left : 15px; + padding-right: 40px; + right : -30px; +} + +.SidebarListItem { + font-weight: var(--glue-font-weight-normal); + font-size : 13px; +} + +.SidebarListItem--is-active:after { + display: none; +} + +.SidebarListItemLink--is-highlighted:hover, +.SidebarListItemLink--is-highlighted:link, +.SidebarListItemLink--is-highlighted:visited { + font-weight: var(--glue-font-weight-bold); +} + +html .SidebarList__title { + font-size : 13px; + line-height : 40px; + font-weight : var(--glue-font-weight-black); + text-transform: uppercase; + letter-spacing: 0.16em; +} +/* the spotify logo and layout fix */ +.sidebar .sidebar-navbar { + background-image : url("https://local_resource_host/images/spotify-logo-green.png"); + background-repeat : no-repeat; + background-size : 150px; + background-position-x: 25px; +} + +#view-buddy-list { + padding-top: 50px; +} + +.LeftSidebar { + margin-top: 45px; +} + +.LeftSidebar__section { + margin-bottom: 20px; +} + +/* .resizer { + display: none !important; +} */ +/* playlist items */ +.RootlistItem { + padding-left : 30px; + padding-right: 30px; +} + +.RootlistItem--is-active:before { + display: none; +} +/*for now I have hidden the new playlist button but I've an idea for it and will add in future*/ +.LeftSidebarNewPlaylistButton__button { + display: none !important; +} +/* HOME PAGE EDITS */ +/*Round corner cover image*/ +.Card:not(.Card--artist) .Card__image, +.Card:not(.Card--artist) .Card__image-wrapper, +.card-image, +.card-image-content-wrapper, +.card-placeholder-wrapper { + border-radius: 10px !important; + overflow : hidden !important; +} + +.Card__info-title a, +.GlueSectionDivider__title { + line-height : 30px; + letter-spacing: 0; + color : var(--modspotify_primary_text); +} +/* CARD INFO DETAILS EDIT */ +/*.Card__info-subtitle-description, .Card__info-subtitle-metadata{ + display:none !important; + }*/ +.Button--style-icon:not(.Button--is-drop-target-active) { + height: 30px !important; + width : 30px !important; +} +/*scroll bar edits*/ +/*Thinner scrollbar*/ +::-webkit-scrollbar { + height : 6px !important; + width : 6px !important; + background-color: transparent; +} +/*Hide top and bottom buttons of scrollbar */ +::-webkit-scrollbar-button { + display: none !important; +} +/* PLAY AREA EDITS */ +/*main frame*/ +#view-player { + padding-left : 10px; + padding-right : 10px; + padding-bottom: 10px; +} + +.view-player, +body.remotebar .view-player .player-bar-wrapper { + height : 85px !important; + border-radius: 20px !important; + background : var(--modspotify_main_bg_second) !important; + position : relative; + padding-left : 2px !important; + padding-right: 2px !important; +} +/*buttons and play progress*/ +.view-player .player-controls-container .controls .button-play { + height : 35px !important; + width : 35px !important; + border-radius: 40px !important; + box-shadow : 0 0 0 0 !important; + transition : none 0.3s cubic-bezier(.3, 0, .7, 1); + overflow : visible !important; +} + +.view-player .player-controls-container .controls .button-play:before { + padding-left: 0 !important; + padding-top : 1px !important; +} + +.view-player .player-controls-container .controls { + margin-top: -14px !important; +} + +.view-player .player-controls-container .progress-container { + margin-top: 2px !important; +} + +.view-player .player-controls-container .controls .button-play:after { + box-shadow: unset !important; +} + +.view-player .now-playing .cover-image-container .cover-image { + border-radius: 6px; +} + +.view-player .text-container .text-item-container .text-item .scroll-text-container:after { + background: #282828 !important; + right : 0; +} +/* BROWSE TAB EDITS */ +/* Add round corner for Gerne and Mood cards */ +.gc-image, +.gc-image-container { + border-radius: 10px !important; +} + +.gc-label-text { + color: var(--modspotify_primary_text); +} +/* FULL SCREEN MODE EDITS */ +#view-player .album-art .album-art__image { + border-radius: 30px !important; + box-shadow : 0 10px 70px rgba(var(--modspotify_rgb_cover_overlay_and_shadow), .5) !important; +} + +#view-player .album-art .album-art__image .card-image-content-wrapper, +#view-player .album-art .album-art__image .card-image-content-wrapper .card-image { + border-radius: 30px !important; +} + +#video-player .album-art__foreground { + flex-direction: row; + text-align : left; +} + +#video-player .album-art__background { + background-color: initial; +} + +#video-player .album-art__track-details { + padding-left: 40px; + line-height : initial; +} + +#video-player .album-art__track-title { + font-size : 80px; + margin-top : 0; + line-height: initial; +} + +#video-player .album-art__artist-name { + font-size : 50px; + margin-top : 0; + line-height: initial; +} +/* PROGRESS BAR EDITS */ +.progress-container .inner { + border-radius : 50px !important; + background-color: var(--modspotify_main_fg) !important; +} + +.progress-bar, +.progress-bar .inner { + background : #3b3b3b; + border-radius: 100px; +} + +.progress-container .inner, +.progress-container .progress-bar { + border-radius: 100px !important; + height : 4.5px; +} + +.progress-container { + border-radius: 100px !important; + position : absolute !important; + right : 25%; + width : 50% !important; +} +/* INSIDE THE ALBUM AND PLAYLIST EDITS */ +/*album edits*/ +.Button__alt-text, +.Button__text { + color: var(--modspotify_primary_text) !important; +} + +.Button--style-green { + font-size: 14px; +} + +.TableCell--is-emphasized { + color: var(--modspotify_primary_text) !important; +} +/*playlist edits*/ +.b-add-text, +.b-added-text, +.b-pause-text, +.b-play-text, +.b-remove-text { + color: var(--modspotify_primary_text) !important; +} + +.tl-highlight { + color: var(--modspotify_primary_text) !important; +} +/* +* +* EXPERIMENTS +* +* MIGHT CHANGE IN FUTURE RELEASE +*/ +/*search bar edits*/ +.SearchInput__input { + color : var(--modspotify_secondary_fg) !important; + background-color: var(--modspotify_main_bg) !important; + border-style : solid !important; + border-width : 1px !important; + border-radius : 0 !important; + border-color : var(--modspotify_sidebar_and_player_bg) !important; +} + +.SearchInput__searchIcon { + color: var(--modspotify_secondary_fg) !important; +} + +.content-top-bar__search-input { + max-width: unset !important; + height : auto !important; +} +/*change header colors*/ +.GlueHeader__background-color { + border-color : var(--modspotify_sidebar_and_player_bg) !important; + background-color: var(--modspotify_sidebar_and_player_bg) !important; + background-image: unset !important; +} + +.Header__background-color { + border-color : var(--modspotify_sidebar_and_player_bg) !important; + background-color: var(--modspotify_sidebar_and_player_bg) !important; + background-image: unset !important; +} +/*scrubbing bar ball thingy*/ +.handle { + background: var(--modspotify_indicator_fg_and_button_bg) !important; + border : 3px solid var(--modspotify_indicator_fg_and_button_bg) !important; +} + +.progress-bar-wrapper.progress-bar-wrapper--ltr.handle { + background: unset !important; + border : unset !important; +} +/*hide a few elements*/ +.view-player .remote-playback-bar { + display: none !important; +} diff --git a/themes/pimp_spotify.sh b/themes/pimp_spotify.sh new file mode 100755 index 0000000..7a7f039 --- /dev/null +++ b/themes/pimp_spotify.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +path=$(pwd) + +cp -r $path/Onepunch ~/.config/spicetify/Themes/. + +spicetify config current_theme Onepunch +spicetify config inject_css 1 replace_colors 1 overwrite_assets 1 +spicetify backup apply +spicetify apply