From 62c4507e7e83e808932f217bb0fe5b1376732d2d Mon Sep 17 00:00:00 2001 From: Bartek Stalewski Date: Sun, 30 Oct 2022 13:53:34 +0100 Subject: [PATCH] Migration to ayu. --- _desktop/_scripts/sb-battery | 2 +- _desktop/_scripts/sb-network | 4 ++-- _desktop/_scripts/sb-yubikey | 2 +- _desktop/_suckless/st/config.h | 38 +++++++++++++++++----------------- _desktop/dunst/dunstrc | 2 +- _desktop/qtile/config.py | 17 +++++++-------- colors.txt | 25 ++++++++++++++++++++++ nvim/init.vim | 20 ++++++++++-------- 8 files changed, 68 insertions(+), 42 deletions(-) diff --git a/_desktop/_scripts/sb-battery b/_desktop/_scripts/sb-battery index d64d736..e50d677 100755 --- a/_desktop/_scripts/sb-battery +++ b/_desktop/_scripts/sb-battery @@ -13,5 +13,5 @@ for battery in /sys/class/power_supply/BAT?*; do esac capacity=$(cat "$battery/capacity") # Will make a warn variable if discharging and low - [ "$capacity" -le 20 ] && printf "${status} ${capacity}%%" || printf "${status} ${capacity}%%" + [ "$capacity" -le 20 ] && printf "${status} ${capacity}%%" || printf "${status} ${capacity}%%" done && exit 0 diff --git a/_desktop/_scripts/sb-network b/_desktop/_scripts/sb-network index f8ffa43..2cc7895 100755 --- a/_desktop/_scripts/sb-network +++ b/_desktop/_scripts/sb-network @@ -1,8 +1,8 @@ #!/bin/bash case "$(cat /sys/class/net/w*/operstate 2>/dev/null)" in - down) printf "no wifi" ;; + down) printf "no wifi" ;; up) - [ -n "$(ip address show dev wlan0 | grep 'inet ')" ] || printf "no ip" + [ -n "$(ip address show dev wlan0 | grep 'inet ')" ] || printf "no ip" # && printf "$icon $(iwgetid -r)" \ esac diff --git a/_desktop/_scripts/sb-yubikey b/_desktop/_scripts/sb-yubikey index 6170d13..8e39057 100755 --- a/_desktop/_scripts/sb-yubikey +++ b/_desktop/_scripts/sb-yubikey @@ -1,6 +1,6 @@ #!/bin/sh case $(cat $XDG_CACHE_HOME/yubikey.status) in - *_1) printf " touch the yubikey" ;; + *_1) printf " touch the yubikey" ;; *) printf "" ;; esac diff --git a/_desktop/_suckless/st/config.h b/_desktop/_suckless/st/config.h index a2ffaad..5272c98 100644 --- a/_desktop/_suckless/st/config.h +++ b/_desktop/_suckless/st/config.h @@ -96,29 +96,29 @@ unsigned int tabspaces = 8; /* Terminal colors (16 first used in escape sequence) */ static const char *colorname[] = { - "#272822", - "#fd4285", - "#a6e22d", - "#e5da72", - "#0094d8", - "#9a37ff", - "#50b6d8", - "#c7c7c7", - "#676767", - "#fa7fac", - "#bde271", - "#fff27f", - "#005577", - "#bd9eff", - "#5ed6fe", - "#feffff", + "#000000", + "#ff3333", + "#b8cc52", + "#e7c547", + "#36a3d9", + "#f07178", + "#95e6cb", + "#ffffff", + "#323232", + "#ff6565", + "#eafe84", + "#fff779", + "#68d5ff", + "#ffa3aa", + "#c7fffd", + "#ffffff", [255] = 0, /* more colors can be added after 255 to use with DefaultXX */ - "#272822", /* 256 -> background */ - "#c7c7c7", /* 257 -> foreground */ - "#c7c7c7", /* 258 -> cursor */ + "#0f1419", /* 256 -> background */ + "#e6e1cf", /* 257 -> foreground */ + "#f29718", /* 258 -> cursor */ "#272822", /* 259 -> cursor text */ }; diff --git a/_desktop/dunst/dunstrc b/_desktop/dunst/dunstrc index 5cf80ca..2e0be10 100644 --- a/_desktop/dunst/dunstrc +++ b/_desktop/dunst/dunstrc @@ -345,7 +345,7 @@ #icon = /path/to/icon [urgency_critical] - background = "#770000" + background = "#ff3333" foreground = "#feffff" frame_color = "#feffff" timeout = 2 diff --git a/_desktop/qtile/config.py b/_desktop/qtile/config.py index 36f0dbe..97942d3 100644 --- a/_desktop/qtile/config.py +++ b/_desktop/qtile/config.py @@ -94,7 +94,7 @@ dgroups_app_rules = [] # type: list layouts = [ layout.Columns( border_focus='#ffffff', - border_normal="#272822", + border_normal='#0f1419', border_on_single = False, border_width=2, insert_position=1, @@ -103,10 +103,10 @@ layouts = [ ] widget_defaults = dict( - foreground="#f8f8f2", - background="#272822", + foreground='#e6e1cf', + background='#0f1419', font="RobotoMono Nerd Font", - fontsize=13, + fontsize=14, ) extension_defaults = widget_defaults.copy() @@ -116,12 +116,11 @@ screens = [ [ widget.GroupBox( disable_drag=True, - highlight_method='block', + #highlight_method='block', rounded=False, - this_current_screen_border='#005577', - this_screen_border='#f8f8f2', - urgent_border='#770000', - urgent_text='#ffffff', + this_current_screen_border='#36a3d9', + urgent_alert_method='block', + urgent_border='#ff3333', ), widget.GenPollText( update_interval=0.5, diff --git a/colors.txt b/colors.txt index abe50c1..ec5f02a 100644 --- a/colors.txt +++ b/colors.txt @@ -23,6 +23,31 @@ color13: magenta: #bd9eff color14: cyan: #5ed6fe color15: white: #feffff +# ftpd ayu +foreground: #e6e1cf +background: #0f1419 +cursor: #f29718 +cursor text: #272822 +selection: #c1ddff +selection text: #000000 + +color0: black: #272822 // #161616 +color1: red: #fd4285 +color2: green: #a6e22d +color3: yellow: #e5da72 +color4: blue: #0094d8 +color5: magenta: #9a37ff +color6: cyan: #50b6d8 +color7: white: #c7c7c7 +color8: black: #676767 +color9: red: #fa7fac +color10: green: #bde271 +color11: yellow: #fff27f +color12: blue: #005577 +color13: magenta: #bd9eff +color14: cyan: #5ed6fe +color15: white: #feffff + # ftpd gruvbox foreground: #ebdbb2 background: #1d2021 diff --git a/nvim/init.vim b/nvim/init.vim index 64a6d26..46713d6 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -1,4 +1,5 @@ call plug#begin('$XDG_DATA_HOME/nvim/vim-plugins') +Plug 'ayu-theme/ayu-vim' Plug 'kamykn/skyknight' Plug 'junegunn/fzf' Plug 'junegunn/fzf.vim' @@ -47,18 +48,19 @@ map s :set spell! set bg=dark set termguicolors -colorscheme skyknight +let ayucolor='dark' +colorscheme ayu hi Comment gui=italic hi BadWhitespace guibg=#770000 hi ColorColumn guibg=#770000 -hi DiffChange guibg=#465457 -hi DiffText guifg=#ff8700 guibg=#465457 -hi FoldColumn guifg=#465457 guibg=#272822 -hi GitGutterChange guifg=#bbbb00 guibg=#272822 -hi LineNr guifg=#465457 guibg=#272822 -hi NonText guifg=#465457 guibg=#272822 -hi SignColumn guifg=#465457 guibg=#272822 +hi DiffChange guibg=#0f1419 +hi DiffText guifg=#ff8700 +" hi FoldColumn guifg=#465457 guibg=#272822 +" hi GitGutterChange guifg=#bbbb00 guibg=#272822 +" hi LineNr guifg=#465457 guibg=#272822 +" hi NonText guifg=#465457 guibg=#272822 +hi SignColumn guibg=#0f1419 hi Visual guibg=#005577 hi SpellBad guibg=#770000 @@ -74,7 +76,7 @@ let g:gitgutter_sign_modified = '~' let g:Hexokinase_highlighters = [ 'backgroundfull' ] let g:lightline = { - \ 'colorscheme': 'powerline', + \ 'colorscheme': 'ayu', \ 'active': { \ 'left': [ [ 'mode', 'paste' ], \ [ 'readonly', 'filename' ] ],