From 4f42b14dd2ad149624d35e105f8155783ab12cf1 Mon Sep 17 00:00:00 2001 From: neodarz Date: Mon, 5 Oct 2020 21:19:31 +0200 Subject: Little update --- dotfiles/cheat/nodejs | 2 + dotfiles/config/cava/config | 2 +- dotfiles/config/i3/config | 120 +++++++++++++++++---------- dotfiles/config/i3pystatus/conf.py | 28 ++++--- dotfiles/config/kitty/kitty.conf | 5 ++ dotfiles/config/terminator/config | 2 +- dotfiles/zsh/09-prompt.zsh | 34 ++++---- dotfiles/zsh/banner.zsh_ | 162 ------------------------------------- dotfiles/zsh/nodejs.zsh | 24 ------ dotfiles/zshrc | 4 + 10 files changed, 123 insertions(+), 260 deletions(-) create mode 100644 dotfiles/cheat/nodejs delete mode 100755 dotfiles/zsh/banner.zsh_ delete mode 100755 dotfiles/zsh/nodejs.zsh (limited to 'dotfiles') diff --git a/dotfiles/cheat/nodejs b/dotfiles/cheat/nodejs new file mode 100644 index 0000000..b89b971 --- /dev/null +++ b/dotfiles/cheat/nodejs @@ -0,0 +1,2 @@ +# Remove shit and install +sudo rm -rf node_modules && sudo npm cache clear && sudo npm cache clean && npm install diff --git a/dotfiles/config/cava/config b/dotfiles/config/cava/config index 219c95b..9d83d91 100644 --- a/dotfiles/config/cava/config +++ b/dotfiles/config/cava/config @@ -119,7 +119,7 @@ method = ncurses # default is to keep current terminal color ; background = default ; foreground = default -foreground = '#ff00ff' +foreground = "#711C91" # Gradient mode, only hex defined colors (and thereby ncurses mode) are supported, # background must also be defined in hex or remain commented out. 1 = on, 0 = off. diff --git a/dotfiles/config/i3/config b/dotfiles/config/i3/config index fd2c5cf..d5ff749 100644 --- a/dotfiles/config/i3/config +++ b/dotfiles/config/i3/config @@ -9,8 +9,9 @@ ### THEME ### -set $WHITE #ffffff -set $BLACK #000000 + +set $WHITE #711C91 +set $BLACK #1B0F1C # Layout colors bord bg text indicator (split) client.focused $WHITE $WHITE $BLACK $WHITE @@ -194,38 +195,71 @@ bindsym $WinKey+q focus parent # Set ~6 workspace par screen (20) {%@@ if profile=="pegasus" @@%} -workspace 1 output eDP1 -workspace 2 output eDP1 -workspace 3 output eDP1 -workspace 4 output eDP1 -workspace 5 output eDP1 -workspace 6 output eDP1 -workspace 7 output eDP1 -workspace 8 output eDP1 -workspace 9 output eDP1 -workspace 10 output eDP1 - -workspace 11 output DP3 -workspace 12 output DP3 -workspace 13 output DP3 -workspace 14 output DP3 -workspace 15 output DP3 -workspace 16 output DP3 -workspace 17 output DP3 -workspace 18 output DP3 -workspace 19 output DP3 -workspace 20 output DP3 - -workspace 21 output DP1-1 -workspace 22 output DP1-1 -workspace 23 output DP1-1 -workspace 24 output DP1-1 -workspace 25 output DP1-1 -workspace 26 output DP1-1 -workspace 27 output DP1-1 -workspace 28 output DP1-1 -workspace 29 output DP1-1 -workspace 30 output DP1-1 +workspace 1 output DisplayPort-0 +workspace 2 output DisplayPort-0 +workspace 3 output DisplayPort-0 +workspace 4 output DisplayPort-0 +workspace 5 output DisplayPort-0 +workspace 6 output DisplayPort-0 +workspace 7 output DisplayPort-0 +workspace 8 output DisplayPort-0 +workspace 9 output DisplayPort-0 +workspace 10 output DisplayPort-0 + +workspace 11 output HDMI-A-0 +workspace 12 output HDMI-A-0 +workspace 13 output HDMI-A-0 +workspace 14 output HDMI-A-0 +workspace 15 output HDMI-A-0 +workspace 16 output HDMI-A-0 +workspace 17 output HDMI-A-0 +workspace 18 output HDMI-A-0 +workspace 19 output HDMI-A-0 +workspace 20 output HDMI-A-0 + +workspace 21 output DVI-I-1 +workspace 22 output DVI-I-1 +workspace 23 output DVI-I-1 +workspace 24 output DVI-I-1 +workspace 25 output DVI-I-1 +workspace 26 output DVI-I-1 +workspace 27 output DVI-I-1 +workspace 28 output DVI-I-1 +workspace 29 output DVI-I-1 +workspace 30 output DVI-I-1 +{%@@ elif profile=="unicorn" @@%} +workspace 1 output DP-1 +workspace 2 output DP-1 +workspace 3 output DP-1 +workspace 4 output DP-1 +workspace 5 output DP-1 +workspace 6 output DP-1 +workspace 7 output DP-1 +workspace 8 output DP-1 +workspace 9 output DP-1 +workspace 10 output DP-1 + +workspace 11 output DP-5 +workspace 12 output DP-5 +workspace 13 output DP-5 +workspace 14 output DP-5 +workspace 15 output DP-5 +workspace 16 output DP-5 +workspace 17 output DP-5 +workspace 18 output DP-5 +workspace 19 output DP-5 +workspace 20 output DP-5 + +workspace 21 output DP-3 +workspace 22 output DP-3 +workspace 23 output DP-3 +workspace 24 output DP-3 +workspace 25 output DP-3 +workspace 26 output DP-3 +workspace 27 output DP-3 +workspace 28 output DP-3 +workspace 29 output DP-3 +workspace 30 output DP-3 {%@@ endif @@%} # move focused window between monitors @@ -406,12 +440,12 @@ bindsym $WinKey+r mode "resize" bar { #status_command i3blocks colors { - background #000000 - statusline #ffffff - inactive_workspace #000000 #000000 #ffffff - active_workspace #000000 #000000 #00ffff - focused_workspace #ffffff #000000 #ffffff - urgent_worKspace #ffffff #ffffff #000000 + background $BLACK + statusline $WHITE + inactive_workspace $BLACK $BLACK $WHITE + active_workspace $BLACK $BLACK #4d1363 + focused_workspace $WHITE $BLACK $WHITE + urgent_worKspace $WHITE $WHITE $BLACK } {%@@ if profile=="pegasus" @@%} font pango:Monoid Nerd Font Light Semi-Condensed 7.5 @@ -421,11 +455,11 @@ bar { status_command python ~/.config/i3pystatus/conf.py } exec /home/neodarz/.screenlayout/default.sh -#exec feh --bg-scale /home/neodarz/wallpaper_animated/black.png -#exec /home/neodarz/wallpaper_animated/wall.sh /home/neodarz/wallpaper_animated/8bit_battle_preparation.gif exec setxkbmap fr exec export XDG_RUNTIME_DIR=/run/user/`id -u` exec systemctl --user start twmnd.service +# Background image by https://www.furaffinity.net/view/22943365/ +exec feh --bg-scale ~/.wallpapers/eron_paint_1080.jpg; picom +#exec /home/neodarz/wallpaper_animated/wall.sh /home/neodarz/wallpaper_animated/8bit_battle_preparation.gif #exec terminator -e $HOME/.scripts/working.sh #exec ~/.scripts/mpvbg ~/.wallpapers/wallpaper_01.mp4 -exec feh --bg-scale ~/.wallpaper/Dragon_Purple_Landscape_Planets_fantasy_1920x1200.jpg diff --git a/dotfiles/config/i3pystatus/conf.py b/dotfiles/config/i3pystatus/conf.py index df663d8..4c26314 100644 --- a/dotfiles/config/i3pystatus/conf.py +++ b/dotfiles/config/i3pystatus/conf.py @@ -1,6 +1,6 @@ import logging from i3pystatus import Status -from i3pystatus.updates import pacman, yaourt +from i3pystatus.updates import pacman, yay status = Status(logfile='/home/neodarz/i3pystatus.log') @@ -9,8 +9,10 @@ status.register("text", status.register("updates", format = "{count}", + color="#ffff00", + color_no_updates="#711C91", format_no_updates = "", - backends = [pacman.Pacman(), yaourt.Yaourt()], + backends = [pacman.Pacman(), yay.Yay()], hints = {"markup": "pango", "separator": False, "separator_block_width": 0},) status.register("text", @@ -64,6 +66,7 @@ status.register("text", status.register("mem", format = "{used_mem}({percent_used_mem}%) [{avail_mem}]", + color='#711C91', hints = {"markup": "pango", "separator": False, "separator_block_width": 0},) status.register("text", @@ -129,8 +132,8 @@ status.register("network", color_down="#fff", end_color="#fff", interface="enp3s0", - format_up="I:{v4cidr}", - format_down="X", + format_up="{v4cidr}", + format_down="X", hints = {"markup": "pango", "separator": False, "separator_block_width": 0},) status.register("text", @@ -215,7 +218,8 @@ status.register("text", # # Note: requires libpulseaudio from PyPI status.register("pulseaudio", - format="{volume}%",format_muted="X", + format="{volume}%", format_muted="--%", + color_unmuted="#711C91", hints = {"separator": False, "separator_block_width": 0},) status.register("text", @@ -245,13 +249,13 @@ status.register("text", status.register("redshift", hints = {"separator": False, "separator_block_width": 0},) -status.register("text", - text="|", - hints = {"separator": False, "separator_block_width": 0},) - -status.register("taskwarrior", - format = "{next}({project})[{urgent}/{ready}]", - hints = {"separator": False, "separator_block_width": 0},) +#status.register("text", +# text="|", +# hints = {"separator": False, "separator_block_width": 0},) +# +#status.register("taskwarrior", +# format = "{next}({project})[{urgent}/{ready}]", +# hints = {"separator": False, "separator_block_width": 0},) status.register("text", text="|", diff --git a/dotfiles/config/kitty/kitty.conf b/dotfiles/config/kitty/kitty.conf index d242c20..db4d61d 100644 --- a/dotfiles/config/kitty/kitty.conf +++ b/dotfiles/config/kitty/kitty.conf @@ -6,3 +6,8 @@ bold_italic_font auto font_size 7 map ctrl+shift+enter no_op + +foreground #711C91 + +# fix for unicode char +box_drawing_scale 0.1, 0.1, 0.1, 0.1 diff --git a/dotfiles/config/terminator/config b/dotfiles/config/terminator/config index 351e593..8da02c5 100644 --- a/dotfiles/config/terminator/config +++ b/dotfiles/config/terminator/config @@ -18,7 +18,7 @@ {%@@ else @@%} font = Monoid Nerd Font Light Semi-Condensed 7 {%@@ endif @@%} - foreground_color = "#ffffff" + foreground_color = "#711c91" icon_bell = False palette = "#000000:#aa0000:#00aa00:#aa5500:#3465a4:#aa00aa:#00aaaa:#aaaaaa:#555555:#ff5555:#55ff55:#ffff55:#729fcf:#ff55ff:#55ffff:#ffffff" scrollback_infinite = True diff --git a/dotfiles/zsh/09-prompt.zsh b/dotfiles/zsh/09-prompt.zsh index 9c5fce6..ca892c3 100644 --- a/dotfiles/zsh/09-prompt.zsh +++ b/dotfiles/zsh/09-prompt.zsh @@ -27,20 +27,20 @@ ICO_BEHIND="↓" #ICO_BEHIND="🠛" #ICO_BEHIND="▼" ICO_DIVERGED="⥮" -COLOR_ROOT="%{$fg_bold[red]%}" -COLOR_USER="%F{white}" -COLOR_NORMAL="%F{white}" +COLOR_ROOT="%F{red}" +COLOR_USER="%F{527}" +COLOR_NORMAL="%F{527}" PROMPT_STYLE="classic" # Modify the colors and symbols in these variables as desired. -GIT_PROMPT_SYMBOL="%{$fg[blue]%}±" # plus/minus - clean repo -GIT_PROMPT_PREFIX="%{$fg[green]%} %{$reset_color%}" -GIT_PROMPT_SUFFIX="%{$fg[green]%}%{$reset_color%}" -GIT_PROMPT_AHEAD="%{$fg[red]%}ANUM%{$reset_color%}" # A"NUM" - ahead by "NUM" commits -GIT_PROMPT_BEHIND="%{$fg[white]%}BNUM%{$reset_color%}" # B"NUM" - behind by "NUM" commits -GIT_PROMPT_MERGING="%{$fg_bold[magenta]%}⚡%{$reset_color%}" # lightning bolt - merge conflict -GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}" # red circle - untracked files -GIT_PROMPT_MODIFIED="%{$fg_bold[yellow]%}●%{$reset_color%}" # yellow circle - tracked files modified -GIT_PROMPT_STAGED="%{$fg_bold[green]%}●%{$reset_color%}" # green circle - staged changes present = ready for "git push" +GIT_PROMPT_SYMBOL="%F{blue}±" # plus/minus - clean repo +GIT_PROMPT_PREFIX="%F{green} %F{527}" +GIT_PROMPT_SUFFIX="%F{green}%F{527}" +GIT_PROMPT_AHEAD="%F{red}ANUM%F{527}" # A"NUM" - ahead by "NUM" commits +GIT_PROMPT_BEHIND="%F{white}BNUM%F{527}" # B"NUM" - behind by "NUM" commits +GIT_PROMPT_MERGING="%F{magenta}⚡%F{527}" # lightning bolt - merge conflict +GIT_PROMPT_UNTRACKED="%F{red}●%F{527}" # red circle - untracked files +GIT_PROMPT_MODIFIED="%F{yellow}●%F{527}" # yellow circle - tracked files modified +GIT_PROMPT_STAGED="%F{green}●%F{527}" # green circle - staged changes present = ready for "git push" parse_git_branch() { # Show Git branch/tag, or name-rev if on detached head @@ -94,25 +94,25 @@ git_prompt_string() { local git_where="$(parse_git_branch)" # If inside a Git repository, print its branch and state - [ -n "$git_where" ] && echo "[$GIT_PROMPT_SYMBOL$(parse_git_state)$GIT_PROMPT_PREFIX%{$fg[yellow]%}${git_where#(refs/heads/|tags/)}$GIT_PROMPT_SUFFIX%F{white}]─" + [ -n "$git_where" ] && echo "[$GIT_PROMPT_SYMBOL$(parse_git_state)$GIT_PROMPT_PREFIX%F{yellow}${git_where#(refs/heads/|tags/)}$GIT_PROMPT_SUFFIX%F{527}]─" # If not inside the Git repo, print exit codes of last command (only if it failed) - #[ ! -n "$git_where" ] && echo "%{$fg[red]%}%(?..%?)" + #[ ! -n "$git_where" ] && echo "%F{red}%(?..%?)" } function error() { - echo "%(?..[$fg[red]%?%F{white}]─)" + echo "%(?..[%F{red}%?%F{527}]─)" } function host() { if [[ -n $SSH_CONNECTION ]]; then - echo "%{$fg_bold[red]%}!$reset_color%F{white}$HOST" + echo "%F{red}!%F{527}$HOST" else echo "$HOST" fi } -PROMPT='%F{white}┌─[${USER_LEVEL}$USER$reset_color%F{white}@$(host)]─$(git_prompt_string)$(error)[%~] +PROMPT='${COLOR_NORMAL}┌─[${USER_LEVEL}${USER}@$(host)]─$(git_prompt_string)$(error)[%~] └─ - %f' setfont lat0-08 diff --git a/dotfiles/zsh/banner.zsh_ b/dotfiles/zsh/banner.zsh_ deleted file mode 100755 index 9c2903b..0000000 --- a/dotfiles/zsh/banner.zsh_ +++ /dev/null @@ -1,162 +0,0 @@ -# ██ -# ░██ -# ██████ ██████░██ -# ░░░░██ ██░░░░ ░██████ -# ██ ░░█████ ░██░░░██ -# ██ ░░░░░██░██ ░██ -# ██████ ██████ ░██ ░██ -# ░░░░░░ ░░░░░░ ░░ ░░ -# -# ▓▓▓▓▓▓▓▓▓▓ -# ░▓ author ▓ xero -# ░▓ code ▓ http://code.xero.nu/dotfiles -# ░▓ mirror ▓ http://git.io/.files -# ░▓▓▓▓▓▓▓▓▓▓ -# ░░░░░░░░░░ -# -#█▓▒░ pick a random number -_RAND=`shuf -i1-10 -n1` - -#█▓▒░ display a random ascii banner -case $_RAND in -1) -cat << X0 - : - |\\____.____ .______._______. - ._____| / _/__ _|_ / \\ |__ - \\__ | _/_ _) Y _ _/__| __ / - / _ / \\ | | /| / | - / |___(__ |__| |_ | - \\_____l __ \\_____/__ l______/\\______/ - \\_____/ \\______/ \\______/\\______/ - x0^b7^imp! - -X0 -;; -2) -cat << X0 - : - |\\_____.____ /\\_____.________. - ._____| / _/___ _/_ / \\ _ |__ - \\__ | _/_ _) Y _ _/__| / / - / _ / \\ | | /| | - / :.. |____(__ ..:: |__| ..:: |_ ..:: | - \\_____l \\______/ l_______/\\_______/ - x0^b7^imp! - -X0 -;; -3) -cat << X0 - . - ____/|______.____ /\\_____.________. - \\ | / _/___ _/_ / \\ _ |__ - \\_ | __/ _) Y _ _/__| / / - / _ \\ \\ | | /| | - _/ .: | .: \\__ ..:: |__| ..:: |_ ..:: | - \\_____l____ /\\______/ l_______/\\_______/ - \\/ x0^b7^imp! - -X0 -;; -4) -cat << X0 - ____ _ . . _ ___ - \\ \\ - ___/\\ _____ /\\______ ____/\\ ___/\\ - \\ _ \\/ .://.:\\____//_\\_. \\ /./__ \\ - \\\\ / // ___// .\\/ _// \\ / \\ - /.: \\ \\_. // _. \\/ .:\\/ / - __/____/\\ __\\/__ //______| /\\_______/__ - \\ \\/ \\/ |/x0^b7^imp! / - _\\ | /_ - \\ / - -X0 -;; -5) -cat << X0 - - ___/\\ _____ /\\______ ____/\\ ___/\\ - \\ _ \\/ .://.:\\____//_\\_. \\ /./__ \\ - \\\\ / // ___// .\\/ _// \\ / \\ - /.: \\ \\_. // _. \\/ .:\\/ / - /____/\\ __\\/__ //______| /\\_______/ - \\/ \\/ |/x0^b7^imp! - -X0 -;; -6) -cat << X0 - - _________/\\________________________________/\\_______ - \\ / /\\_______ /______ /\\/ \\__ \\ - \\_ / _/ / _/ /\\_ _/ _/ / / / / - _/ _ \\_/ ______/_/ _ \\_/ / / / - \\ \\ / \\_ / \\ / \\/ / - \\______\\ /\\___________/______\\ /\\_________/ - \\ / \\ / x0^b7^imp! - \\/ \\/ - -X0 -;; -7) -cat << X0 - - ________ /\\________________________________/\\_______ - \\ / _________ _______ __/ \\__ \\ - \\_ / _/ / _/ /\\_ _/ _/ / / / / - _/ _ \\_/ ______/_/ _ \\_/ / / / - \\ \\ / \\_ / \\ / \\/ / - \\______\\ /\\___________/______\\ /\\_________/ - \\ / \\ / x0^b7^imp! - \\/ \\/ - -X0 -;; -8) -cat << X0 - - :_____ _________ __________ _______. - ______| \\__/ ___ \\ _/ ___ \\ / |__ - / | __/\\_ |/ \\\\_ |/ \\/ : \\_ - / : \\ | /_____/| / _/ __. __/\\ - \\___ \\/ \\/ \\ _ |/ \\ < - / . \\_ \\_ \\ \\ / / / - / | _ _ \\ / / / - \\ ______|______/\\_____________/\\_____ \\ __/\\________ / / - \\/ ____|_____/ \\____________/\\_______ \\/ /\\_______\\/ / - \\/ : x0^b7^imp! \\/ \\/ - -X0 -;; -9) -cat << X0 - - :_____ _________ __________ _______. - ______| \\__/ ___ \\ _/ ___ \\ / |__ - / | __/\\_ |/ \\\\_ |/ \\/ : \\_ - / : \\ | /_____/| / _/ __. __/\\ - \\___ \\/ \\/ \\ _ |/ \\_/ - / . /_ \\_ \\ \\ / /\\ - / | _ _ \\ / / / - \\ ______|______///\\_________///\\_____ \\ __///\\______ / / - \\/ ____|_____/ \\_______/ \\_____ \\/ / \\____\\/ / - \\/ : x0^b7^imp! \\/ \\/ - -X0 -;; -10) -cat << X0 - _____ _____ - \\ \\ / /_________ ___________ _____________ - \\ \\ / /\\\\ / _\\ __ /_\\\\ __ / - _ __\\ \\/ /_ __/ / _/ _/ / __ / __ _ - // /\\ \\\\ __\\__/ \\ \\/ / / / - / / \\ \\ //____/ \\ \\ / / - / / \\_____\\_______/ \\ \\__________// - \\_____\\\\ //_____/ x0^b7^imp! - -X0 -;; -esac diff --git a/dotfiles/zsh/nodejs.zsh b/dotfiles/zsh/nodejs.zsh deleted file mode 100755 index 4f95e1e..0000000 --- a/dotfiles/zsh/nodejs.zsh +++ /dev/null @@ -1,24 +0,0 @@ -# ██ -# ░██ -# ██████ ██████░██ -# ░░░░██ ██░░░░ ░██████ -# ██ ░░█████ ░██░░░██ -# ██ ░░░░░██░██ ░██ -# ██████ ██████ ░██ ░██ -# ░░░░░░ ░░░░░░ ░░ ░░ -# -# ▓▓▓▓▓▓▓▓▓▓ -# ░▓ author ▓ xero -# ░▓ code ▓ http://code.xero.nu/dotfiles -# ░▓ mirror ▓ http://git.io/.files -# ░▓▓▓▓▓▓▓▓▓▓ -# ░░░░░░░░░░ -# -#█▓▒░ node version manager -#source ~/.nvm/nvm.sh - -#█▓▒░ aliases -alias node="sudo node" -alias npm="sudo npm" -alias npminstall="sudo rm -rf node_modules && sudo npm cache clear && sudo npm cache clean && npm install" -# alias npminstall="sudo rm -rf node_modules && sudo npm cache clear && sudo npm cache clean && sudo PYTHON=/usr/bin/python2 npm install" diff --git a/dotfiles/zshrc b/dotfiles/zshrc index 0e034d4..358290e 100755 --- a/dotfiles/zshrc +++ b/dotfiles/zshrc @@ -17,7 +17,11 @@ #█▓▒░ load configs for config (~/.zsh/*.zsh) source $config +{%@@ if profile == "unicorn" @@%} +export TERM=xterm-kitty +{%@@ else @@%} export TERM=xterm-256color +{%@@ endif @@%} export CHEAT_EDITOR=nvim export VISUAL=nvim export EDITOR=nvim -- cgit v1.2.1