ivabus/dotfiles
1
0
Fork 0
mirror of https://github.com/ivabus/dotfiles synced 2024-11-22 08:05:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change theme to Catpputin Macchiato and some few more chages

Browse source
This commit is contained in:
Ivan Bushchik 2022-12-08 12:18:45 +03:00
parent 04ea2b6318
commit 17117171fc
No known key found for this signature in database
GPG key ID: 3E4E9C7D66E44BF7
10 changed files with 185 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
configs/alacritty.yml
View file

@ -27,27 +27,83 @@ cursor:
shape: Block shape: Block
blinking: on blinking: on
# Colors (Solarized Dark)
colors: colors:
# Default colors # Default colors
primary: primary:
background: '#002b36' # base03 background: "#24273A" # base
foreground: '#839496' # base0 foreground: "#CAD3F5" # text
# Bright and dim foreground colors
dim_foreground: "#CAD3F5" # text
bright_foreground: "#CAD3F5" # text
# Cursor colors # Cursor colors
cursor: cursor:
text: '#002b36' # base03 text: "#24273A" # base
cursor: '#839496' # base0 cursor: "#F4DBD6" # rosewater
vi_mode_cursor:
text: "#24273A" # base
cursor: "#B7BDF8" # lavender
# Search colors
search:
matches:
foreground: "#24273A" # base
background: "#A5ADCB" # subtext0
focused_match:
foreground: "#24273A" # base
background: "#A6DA95" # green
footer_bar:
foreground: "#24273A" # base
background: "#A5ADCB" # subtext0
# Keyboard regex hints
hints:
start:
foreground: "#24273A" # base
background: "#EED49F" # yellow
end:
foreground: "#24273A" # base
background: "#A5ADCB" # subtext0
# Selection colors
selection:
text: "#24273A" # base
background: "#F4DBD6" # rosewater
# Normal colors # Normal colors
normal: normal:
black: '#073642' # base02 black: "#494D64" # surface1
red: '#dc322f' # red red: "#ED8796" # red
green: '#859900' # green green: "#A6DA95" # green
yellow: '#b58900' # yellow yellow: "#EED49F" # yellow
blue: '#268bd2' # blue blue: "#8AADF4" # blue
magenta: '#d33682' # magenta magenta: "#F5BDE6" # pink
cyan: '#2aa198' # cyan cyan: "#8BD5CA" # teal
white: '#eee8d5' # base2 white: "#B8C0E0" # subtext1
# Bright colors
bright:
black: "#5B6078" # surface2
red: "#ED8796" # red
green: "#A6DA95" # green
yellow: "#EED49F" # yellow
blue: "#8AADF4" # blue
magenta: "#F5BDE6" # pink
cyan: "#8BD5CA" # teal
white: "#A5ADCB" # subtext0
# Dim colors
dim:
black: "#494D64" # surface1
red: "#ED8796" # red
green: "#A6DA95" # green
yellow: "#EED49F" # yellow
blue: "#8AADF4" # blue
magenta: "#F5BDE6" # pink
cyan: "#8BD5CA" # teal
white: "#B8C0E0" # subtext1
indexed_colors:
- { index: 16, color: "#F5A97F" }
- { index: 17, color: "#F4DBD6" }

6
configs/nvim.vim
View file

@ -3,9 +3,9 @@ set showmatch
set hlsearch set hlsearch
set incsearch set incsearch
set autoindent set autoindent
set noexpandtab set expandtab
set tabstop=2 set tabstop=4
set shiftwidth=2 set shiftwidth=4
set number set number
set wildmode=longest, list set wildmode=longest, list
set cc=80 set cc=80

18
configs/sway/config
View file

@ -8,7 +8,7 @@ for_window [app_id="^launcher$"] floating enable, sticky enable, resize set 30 p
set $menu exec $term --class=launcher -e env zsh -c "source ~/.profile && /usr/bin/sway-launcher-desktop" set $menu exec $term --class=launcher -e env zsh -c "source ~/.profile && /usr/bin/sway-launcher-desktop"
set $filemgr nemo set $filemgr nemo
output * bg #073642 solid_color output * bg #1e2030 solid_color
input * { input * {
xkb_layout us,ru xkb_layout us,ru
@ -23,18 +23,18 @@ smart_borders on
default_border pixel 1 default_border pixel 1
hide_edge_borders smart hide_edge_borders smart
smart_gaps on smart_gaps on
gaps inner 16 gaps inner 8
font "JetBrains Mono" 9 font "JetBrains Mono" 9
output * scale 2 output * scale 1.5
include ~/.config/sway/themes/solarized-dark include ~/.config/sway/themes/catppuccin-macchiato
# Start components # Start components
exec mako exec mako
exec poweralertd exec poweralertd
exec swayidle -w timeout 60 'swaylock -f -c 073642' timeout 70 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' before-sleep 'swaylock -f -c 073642' exec swayidle -w timeout 60 '$HOME/.config/sway/lock.sh'
# Screenshots # Screenshots
@ -135,13 +135,13 @@ bindsym XF86AudioPrev exec playerctl previous
bindsym XF86Search exec $menu bindsym XF86Search exec $menu
# Floating # Floating
for_window [app_id="pavucontrol"] floating enable for_window [app_id="pavucontrol"] floating enable, resize 600 300, move absolute position 25ppt 25ppt
for_window [app_id="pavucontrol"] resize set 600 300 for_window [app_id="iwgtk"] floating enable, resize 300 150, move absolute position 25ppt 25ppt
# Autostart # Autostart
exec alacritty --class bottom -e btm exec alacritty --class bottom -e btm
for_window [app_id="bottom"] move container to workspace number 10 for_window [app_id="bottom"] move container to workspace number 10
for_window [app_id="bottom"] fullscreen for_window [app_id="bottom"] fullscreen
exec keepassxc
for_window [class="KeePassXC"] move container to workspace 9

4
configs/sway/lock.sh
View file

@ -1,8 +1,8 @@
#!/bin/sh #!/bin/sh
# Times the screen off and puts it to background # Times the screen off and puts it to background
swayidle \ swayidle \
timeout 10 'swaymsg "output * dpms off"' \ timeout 10 'swaymsg "output * dpms off" && brightnessctl -d kbd_backlight set 0%' \
resume 'swaymsg "output * dpms on"' & resume 'swaymsg "output * dpms on" && brightnessctl -d kbd_backlight set 30%' &
# Locks the screen immediately # Locks the screen immediately
swaylock -c 073642 swaylock -c 073642
# Kills last background task so idle timer doesn't keep running # Kills last background task so idle timer doesn't keep running

15
configs/sway/themes/catppuccin-macchiato Normal file
View file

@ -0,0 +1,15 @@
seat seat0 xcursor_theme "Simp1e-Catppuccin-Macchiato"
set $gnome-schema org.gnome.desktop.interface
exec_always {
gsettings set $gnome-schema gtk-theme 'Catppuccin-Macchiato'
gsettings set $gnome-schema icon-theme 'Mint-Y-Dark'
gsettings set $gnome-schema cursor-theme 'Simp1e-Catppuccin-Macchiato'
gsettings set $gnome-schema font-name 'Noto Sans 9'
}
# Property Name Border BG Text Indicator Child_border
client.focused #cad3f5 #24273a #cad3f5 #cad3f5 #cad3f5
client.focused_inactive #494d64 #24273a #cad3f5 #494d64 #494d64
client.unfocused #363a4f #1e2030 #cad3f5 #363a4f #363a4f
client.urgent #d30102 #ed8796 #cad3f5 #d30102 #d30102

7
configs/sway/themes/solarized-dark
View file

@ -9,6 +9,7 @@ exec_always {
} }
# Property Name Border BG Text Indicator Child_border # Property Name Border BG Text Indicator Child_border
client.focused #839496 #002b36 #839496 #839496 #839496 client.focused #839496 #002b36 #839496 #839496 #fdf6e3
client.focused_inactive #002b36 #002b36 #839496 #839496 #002b36 client.focused_inactive #002b36 #002b36 #839496 #839496 #839496
client.unfocused #002b36 #002b36 #839496 #839496 #002b36 client.unfocused #002b36 #002b36 #839496 #839496 #839496
client.urgent #d30102 #073642 #839496 #839496 #d30102

1
configs/waybar/config
View file

@ -52,5 +52,6 @@
"tooltip-format": "{ipaddr}/{cidr}", "tooltip-format": "{ipaddr}/{cidr}",
"format-linked": "Network (No IP) via {ifname}", "format-linked": "Network (No IP) via {ifname}",
"format-disconnected": "No network", "format-disconnected": "No network",
"on-click": "GTK_THEME=Adwaita-dark iwgtk"
}, },
} }

37
configs/waybar/macchiato.css Normal file
View file

@ -0,0 +1,37 @@
/*
*
* Catppuccin Mocha palette
* Maintainer: rubyowo
*
*/
@define-color base #24273a;
@define-color mantle #1e2030;
@define-color crust #181926;
@define-color text #cad3f5;
@define-color subtext0 #a5adcb;
@define-color subtext1 #b8c0e0;
@define-color surface0 #363a4f;
@define-color surface1 #494d64;
@define-color surface2 #5b6078;
@define-color overlay0 #6e738d;
@define-color overlay1 #8087a2;
@define-color overlay2 #939ab7;
@define-color blue #8aadf4;
@define-color lavender #b7bdf8;
@define-color sapphire #7dc4e4;
@define-color sky #91d7e3;
@define-color teal #8bd5ca;
@define-color green #a6da95;
@define-color yellow #eed49f;
@define-color peach #f5a97f;
@define-color maroon #ee99a0;
@define-color red #ed8796;
@define-color mauve #c6a0f6;
@define-color pink #f5bde6;
@define-color flamingo #f0c6c6;
@define-color rosewater #f4dbd6;

30
configs/waybar/style.css
View file

@ -1,49 +1,50 @@
@import "macchiato.css";
* { * {
font-family: "JetBrains Mono", "Noto Sans"; font-family: "JetBrains Mono", "Noto Sans";
font-size: 6pt; font-size: 9pt;
border: none; border: none;
font-weight: 400; font-weight: 400;
padding: 1 1px; padding: 1 1px;
} }
window#waybar { window#waybar {
background-color: #002b36; background-color: @base;
color: #839496; color: @yellow;
} }
#workspaces button { #workspaces button {
background-color: transparent; background-color: transparent;
border-radius: 2px; border-radius: 2px;
color: #839496; color: @subtext0;
margin: 4px 1px; margin: 4px 1px;
} }
#workspaces button:hover { #workspaces button:hover {
color: #cb4b16; color: @red;
background-color: #073642; background-color: @surface1;
} }
#workspaces button.focused { #workspaces button.focused {
color: #b58900; color: @yellow;
background-color: #073642; background-color: @mantle;
} }
#workspaces button.urgent { #workspaces button.urgent {
background-color: #eb4d4b; background-color: @pink;
} }
#mode { #mode {
background-color: #888888; background-color: @mantle;
} }
#language, #clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor, #mpd { #language, #clock, #battery, #cpu, #memory, #disk, #temperature, #backlight, #network, #pulseaudio, #custom-media, #tray, #mode, #idle_inhibitor, #mpd{
padding: 0 4px; padding: 0 4px;
color: #839496; color: @text;
background-color: #073642; background-color: @mantle;
border-radius: 2px; border-radius: 2px;
margin: 4px 1px; margin: 4px 1px;
} }
#window { #window {
color: #b58900; color: @yellow;
font-weight: 800; font-weight: 800;
} }
@ -81,3 +82,4 @@ label:focus {
} }

42
configs/zshrc
View file

@ -5,29 +5,31 @@ ZSH_THEME="ivabus"
ENABLE_CORRECTION="true" ENABLE_CORRECTION="true"
plugins=(git zsh-syntax-highlighting) plugins=(git zsh-syntax-highlighting)
# putting motd before ohmyzsh for quickier first output # Function to quickly show stats on systemload, usage of filesystems, usage of ram/swap and uptime
AVLD=$(cut -d " " -f1-3 /proc/loadavg) stats () {
USEDMEM=$(free -h | grep Mem | awk '{print $3 " / " $2}') AVLD=$(cut -d " " -f1-3 /proc/loadavg)
USEDSWAP=$(free -h | grep Swap | awk '{ print $3 " / " $2}') USEDMEM=$(free -h | grep Mem | awk '{print $3 " / " $2}')
USEDSTRG=$(df / -h | tail -n 1 | awk '{print $3}') USEDSWAP=$(free -h | grep Swap | awk '{ print $3 " / " $2}')
USEDSTRGPERC=$(df / -h | tail -n 1 | awk '{print $5}') USEDSTRG=$(df / -h | tail -n 1 | awk '{print $3}')
STRG=$(df / -h | tail -n 1 | awk '{print $2}') USEDSTRGPERC=$(df / -h | tail -n 1 | awk '{print $5}')
USEDSTRGHOME=$(df /home -h | tail -n 1 | awk '{print $3}') STRG=$(df / -h | tail -n 1 | awk '{print $2}')
USEDSTRGPERCHOME=$(df /home -h | tail -n 1 | awk '{print $5}') USEDSTRGHOME=$(df /home -h | tail -n 1 | awk '{print $3}')
STRGHOME=$(df /home -h | tail -n 1 | awk '{print $2}') USEDSTRGPERCHOME=$(df /home -h | tail -n 1 | awk '{print $5}')
UPTIME=$(uptime -p) STRGHOME=$(df /home -h | tail -n 1 | awk '{print $2}')
UPTIME=$(uptime -p)
printf "\e[0;34msystem load:\e[m\t${AVLD}\n" printf "\e[0;34msystem load:\e[m\t${AVLD}\n"
printf "\e[0;34musage of /:\e[m\t${USEDSTRGPERC}% (${USEDSTRG}/${STRG})\n" printf "\e[0;34musage of /:\e[m\t${USEDSTRGPERC}% (${USEDSTRG}/${STRG})\n"
printf "\e[0;34musage of /home:\e[m\t${USEDSTRGPERCHOME}% (${USEDSTRGHOME}/${STRGHOME})\n" printf "\e[0;34musage of /home:\e[m\t${USEDSTRGPERCHOME}% (${USEDSTRGHOME}/${STRGHOME})\n"
printf "\e[0;34mmemory usage:\e[m\t${USEDMEM}\n" printf "\e[0;34mmemory usage:\e[m\t${USEDMEM}\n"
printf "\e[0;34mswap usage:\e[m\t${USEDSWAP}\n" printf "\e[0;34mswap usage:\e[m\t${USEDSWAP}\n"
printf "\e[0;34muptime:\e[m\t\t${UPTIME}\n" printf "\e[0;34muptime:\e[m\t\t${UPTIME}\n"
}
stats
source $ZSH/oh-my-zsh.sh source $ZSH/oh-my-zsh.sh
export REPORTTIME=10
alias vi="nvim" alias vi="nvim"
alias vim="nvim" alias vim="nvim"
alias upgrade_dotfiles="sh $HOME/.dotfiles/tools/upgrade.sh" alias upgrade_dotfiles="sh $HOME/.dotfiles/tools/upgrade.sh"
alias timestamp='date -u +%FT%TZ' alias timestamp='date -u +%FT%TZ'
export REPORTTIME=3