From 532d1ef6ca0c44ce8ed8f8561ce16ee257b96d0e Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Sun, 11 Sep 2022 14:26:57 +0300 Subject: [PATCH] Some changes to everything --- configs/alacritty.yml | 61 +++++++++++++----------------- configs/nvim.vim | 6 +-- configs/sway/config | 11 +++--- configs/sway/themes/solarized-dark | 8 ++-- configs/waybar/config | 2 +- configs/waybar/style.css | 23 ++++++----- tools/install.sh | 5 --- tools/relink.sh | 2 +- 8 files changed, 51 insertions(+), 67 deletions(-) diff --git a/configs/alacritty.yml b/configs/alacritty.yml index 9a35ebd..8dd29c0 100644 --- a/configs/alacritty.yml +++ b/configs/alacritty.yml @@ -10,7 +10,6 @@ scrolling: multiplier: 3 font: - normal: family: JetBrains Mono style: SemiBold @@ -22,51 +21,43 @@ font: italic: family: JetBrains Mono style: SemiBold Italic - size: 9.0 +cursor: + shape: Block + blinking: on + + # Colors (Solarized Dark) colors: # Default colors primary: - background: '0x002b36' - foreground: '0x93a1a1' + background: '#002b36' # base03 + foreground: '#839496' # base0 - # Colors the cursor will use if `custom_cursor_colors` is true + # Cursor colors cursor: - text: '0x002b36' - cursor: '0x93a1a1' + text: '#002b36' # base03 + cursor: '#839496' # base0 # Normal colors normal: - black: '0x002b36' - red: '0xdc322f' - green: '0x859900' - yellow: '0xb58900' - blue: '0x268bd2' - magenta: '0x6c71c4' - cyan: '0x2aa198' - white: '0x93a1a1' + black: '#073642' # base02 + red: '#dc322f' # red + green: '#859900' # green + yellow: '#b58900' # yellow + blue: '#268bd2' # blue + magenta: '#d33682' # magenta + cyan: '#2aa198' # cyan + white: '#eee8d5' # base2 # Bright colors bright: - black: '0x657b83' - red: '0xdc322f' - green: '0x859900' - yellow: '0xb58900' - blue: '0x268bd2' - magenta: '0x6c71c4' - cyan: '0x2aa198' - white: '0xfdf6e3' - - indexed_colors: - - { index: 16, color: '0xcb4b16' } - - { index: 17, color: '0xd33682' } - - { index: 18, color: '0x073642' } - - { index: 19, color: '0x586e75' } - - { index: 20, color: '0x839496' } - - { index: 21, color: '0xeee8d5' } -cursor: - shape: Block - blinking: on - + black: '#002b36' # base03 + red: '#cb4b16' # orange + green: '#586e75' # base01 + yellow: '#657b83' # base00 + blue: '#839496' # base0 + magenta: '#6c71c4' # violet + cyan: '#93a1a1' # base1 + white: '#fdf6e3' # base3 diff --git a/configs/nvim.vim b/configs/nvim.vim index 0154710..889e62a 100644 --- a/configs/nvim.vim +++ b/configs/nvim.vim @@ -3,9 +3,9 @@ set showmatch set hlsearch set incsearch set autoindent -set expandtab -set tabstop=4 -set shiftwidth=4 +set noexpandtab +set tabstop=2 +set shiftwidth=2 set number set wildmode=longest, list set cc=80 diff --git a/configs/sway/config b/configs/sway/config index 4fb3836..e0aa40f 100644 --- a/configs/sway/config +++ b/configs/sway/config @@ -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 $filemgr nemo -output * bg #002b36 solid_color +output * bg #073642 solid_color input * { xkb_layout us,ru @@ -29,7 +29,6 @@ output * scale 2 include ~/.config/sway/themes/solarized-dark - # Start components exec mako @@ -56,7 +55,7 @@ bindsym $mod+Shift+q kill bindsym $mod+d exec $menu floating_modifier $mod normal bindsym $mod+Shift+c reload -bindsym $mod+Shift+e exec swaynag -f 'JetBrains Mono 9' -e bottom -t warning -m "What would you like to do?" -B 'Exit sway' 'swaymsg exit' -B 'Power off' 'systemctl poweroff' -B 'Reboot' 'systemctl reboot' +bindsym $mod+Shift+e exec swaynag -f 'Ubuntu 9' -e bottom -t warning -m "What would you like to do?" -B 'Exit sway' 'swaymsg exit' -B 'Power off' 'systemctl poweroff' -B 'Reboot' 'systemctl reboot' bindsym $mod+$left focus left bindsym $mod+$down focus down bindsym $mod+$up focus up @@ -126,6 +125,6 @@ for_window [app_id="pavucontrol"] resize set 600 300 # Autostart -exec alacritty --class htop -e htop -for_window [app_id="htop"] move container to workspace number 10 -for_window [app_id="htop"] fullscreen +exec alacritty --class glances -e glances +for_window [app_id="glances"] move container to workspace number 10 +for_window [app_id="glances"] fullscreen diff --git a/configs/sway/themes/solarized-dark b/configs/sway/themes/solarized-dark index 1635cc3..9d57a77 100644 --- a/configs/sway/themes/solarized-dark +++ b/configs/sway/themes/solarized-dark @@ -1,10 +1,10 @@ -seat seat0 xcursor_theme "breeze_cursors" +seat seat0 xcursor_theme "Breeze_Snow" set $gnome-schema org.gnome.desktop.interface exec_always { - gsettings set $gnome-schema gtk-theme 'NumixSolarizedDarkGreen' - gsettings set $gnome-schema icon-theme 'Numix-Square' - gsettings set $gnome-schema cursor-theme 'Numix-Cursor' + gsettings set $gnome-schema gtk-theme 'Breeze-Dark' + gsettings set $gnome-schema icon-theme 'breeze-dark' + gsettings set $gnome-schema cursor-theme 'Breeze_Snow' gsettings set $gnome-schema font-name 'JetBrains Mono 9' } diff --git a/configs/waybar/config b/configs/waybar/config index fd1a625..8d3084f 100644 --- a/configs/waybar/config +++ b/configs/waybar/config @@ -3,7 +3,7 @@ "position": "top", "modules-left": ["sway/workspaces", "sway/mode"], "modules-center": ["sway/window"], - "modules-right": ["idle_inhibitor", "network", "pulseaudio", "cpu", "memory", "temperature", "battery", "sway/language", "clock", "tray"], + "modules-right": ["idle_inhibitor", "network", "cpu", "memory", "temperature", "battery", "sway/language", "clock", "tray"], "sway/mode": { "format": "{}" }, diff --git a/configs/waybar/style.css b/configs/waybar/style.css index 972a899..be527b4 100644 --- a/configs/waybar/style.css +++ b/configs/waybar/style.css @@ -1,8 +1,9 @@ * { font-family: JetBrains Mono; - font-size: 9pt; + font-size: 8pt; border: none; font-weight: 400; + padding: 1 1px; } window#waybar { @@ -12,19 +13,20 @@ window#waybar { } #workspaces button { - padding-left: 5px; background-color: transparent; - border: none; - border-radius: 0; + border-radius: 2px; color: #839496; + margin: 4px 2px; } #workspaces button:hover { color: #cb4b16; + background-color: #073642; } #workspaces button.focused { color: #b58900; + background-color: #073642; } #workspaces button.urgent { @@ -48,13 +50,11 @@ window#waybar { #mode, #idle_inhibitor, #mpd { - padding: 0 5px; + padding: 0 4px; color: #b58900; - background-color: #002b36; -} - -#idle_inhibitor { - padding-left: 10px; + background-color: #073642; + border-radius: 2px; + margin: 4px 2px; } #window { @@ -91,8 +91,7 @@ label:focus { } #language { - padding: 0 5px; - margin: 0 0px; + padding: 0 4px; min-width: 16px; } diff --git a/tools/install.sh b/tools/install.sh index 29d972f..f055f14 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -29,11 +29,6 @@ then /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/JetBrains/JetBrainsMono/master/install_manual.sh)" fi -# installing sway-launcher - -curl https://raw.githubusercontent.com/Biont/sway-launcher-desktop/master/sway-launcher-desktop.sh > $HOME/.dotfiles/utils/sway-launcher-desktop -chmod +x $HOME/.dotfiles/utils/sway-launcher-desktop - # linking dotfiles to their original locations echo "Linking dotfiles" diff --git a/tools/relink.sh b/tools/relink.sh index 6ac1d08..b32f29b 100755 --- a/tools/relink.sh +++ b/tools/relink.sh @@ -4,7 +4,7 @@ # do not run manually mkdir -p $HOME/.config/nvim $HOME/.config/alacritty $HOME/.config/mako >/dev/null 2>&1 -rm -rf $HOME/.zshrc $HOME/.config/nvim/init.vim $HOME/.config/alacritty/alacritty.yml $HOME/.config/sway $HOME/.config/waybar $HOME/.config/mako/config >/dev/null 2>&1 +rm -rf $HOME/.zshrc $HOME/.config/nvim/init.vim $HOME/.config/alacritty/alacritty.yml $HOME/.config/sway $HOME/.config/waybar $HOME/.config/mako/config >/dev/null 2>&1 ln -s $HOME/.dotfiles/configs/zshrc $HOME/.zshrc echo ".zshrc linked: $HOME/.dotfiles/configs/zshrc -> $HOME/.zshrc" ln -s $HOME/.dotfiles/configs/.profile $HOME/.profile