diff options
-rw-r--r-- | config/alacritty.yml | 89 | ||||
-rw-r--r-- | config/sway/bar | 12 | ||||
-rw-r--r-- | config/sway/bindsym-layout | 13 | ||||
-rw-r--r-- | config/sway/bindsym-system | 6 | ||||
-rw-r--r-- | config/sway/config | 3 | ||||
-rw-r--r-- | config/sway/gsettings | 8 | ||||
-rw-r--r-- | config/sway/inputs | 14 | ||||
-rw-r--r-- | config/sway/theme | 19 | ||||
-rw-r--r-- | utils/inst | 3 | ||||
-rw-r--r-- | vimrc | 6 |
10 files changed, 103 insertions, 70 deletions
diff --git a/config/alacritty.yml b/config/alacritty.yml index 75b2cd1..034843d 100644 --- a/config/alacritty.yml +++ b/config/alacritty.yml @@ -15,48 +15,53 @@ font: size: 8 colors: - primary: - background: '#000000' - foreground: '#ffffff' - normal: - black: '#000000' - red: '#cd0000' - green: '#00cd00' - yellow: '#cdcd00' - blue: '#6060ee' - magenta: '#cd00cd' - cyan: '#00cdcd' - white: '#e5e5e5' - bright: - black: '#7f7f7f' - red: '#ff0000' - green: '#00ff00' - yellow: '#ffff00' - blue: '#5c5cff' - magenta: '#ff00ff' - cyan: '#00ffff' - white: '#ffffff' - #search: - # Allowed values are CellForeground and CellBackground, which reference the - # affected cell, or hexadecimal colors like #ff00ff. - #matches: - # foreground: '#000000' - # background: '#ffffff' - #bar: - # background: '#c5c8c6' - # foreground: '#1d1f21' - #selection: - # text: CellBackground - # background: CellForeground - - -#selection: - #semantic_escape_chars: ",│`|:\"' ()[]{}<>\t" - # When set to `true`, selected text will be copied to the primary clipboard. - #save_to_clipboard: false - -#mouse: -# hide_when_typing: true + primary: + background: '#2e3440' + foreground: '#d8dee9' + dim_foreground: '#a5abb6' + cursor: + text: '#2e3440' + cursor: '#d8dee9' + vi_mode_cursor: + text: '#2e3440' + cursor: '#d8dee9' + selection: + text: CellForeground + background: '#4c566a' + search: + matches: + foreground: CellBackground + background: '#88c0d0' + bar: + background: '#434c5e' + foreground: '#d8dee9' + normal: + black: '#3b4252' + red: '#bf616a' + green: '#a3be8c' + yellow: '#ebcb8b' + blue: '#81a1c1' + magenta: '#b48ead' + cyan: '#88c0d0' + white: '#e5e9f0' + bright: + black: '#4c566a' + red: '#bf616a' + green: '#a3be8c' + yellow: '#ebcb8b' + blue: '#81a1c1' + magenta: '#b48ead' + cyan: '#8fbcbb' + white: '#eceff4' + dim: + black: '#373e4d' + red: '#94545d' + green: '#809575' + yellow: '#b29e75' + blue: '#68809a' + magenta: '#8c738c' + cyan: '#6d96a5' + white: '#aeb3bb' key_bindings: - { key: Return, mods: Control|Shift, action: SpawnNewInstance } diff --git a/config/sway/bar b/config/sway/bar index c09e832..ff9d0f0 100644 --- a/config/sway/bar +++ b/config/sway/bar @@ -3,4 +3,16 @@ bar { status_command i3blocks position top font pango:DejaVu Sans Mono 8 + colors { + separator #1f222d + background #1f222d + statusline #81a1c1 + + # border background text + focused_workspace #1f222d #1f222d #81a1c1 + active_workspace #1f222d #252936 #5e81ac + inactive_workspace #1f222d #1f222d #4c566a + urgent_workspace #1f222d #1f222d #ee829f + binding_mode #1f222d #81a1c1 #2e3440 + } } diff --git a/config/sway/bindsym-layout b/config/sway/bindsym-layout deleted file mode 100644 index 5b075ac..0000000 --- a/config/sway/bindsym-layout +++ /dev/null @@ -1,13 +0,0 @@ -# vim: ft=swayconfig -set $mode_layout Set keyboard layout (u)s or (c)z -mode "$mode_layout" { - bindsym u input type:keyboard xkb_layout us, mode "default" - bindsym c input type:keyboard xkb_layout cz_qwerty, mode "default" - bindsym Return mode "default" - bindsym Escape mode "default" -} -bindsym --to-code $mod+slash mode "$mode_layout" - -# Type emoji -bindsym --to-code $mod+period exec rofimoji --selector wofi --skin-tone neutral -bindsym --to-code $mod+Shift+period exec rofimoji --selector wofi --skin-tone neutral --action copy diff --git a/config/sway/bindsym-system b/config/sway/bindsym-system index 1c8eea4..96c8c0a 100644 --- a/config/sway/bindsym-system +++ b/config/sway/bindsym-system @@ -3,9 +3,9 @@ set $mode_system System (l) lock, (e) logout, (s) suspend, (r) reboot, (Shift+s) mode "$mode_system" { bindsym l exec --no-startup-id loginctl lock-session $XDG_SESSION_ID, mode "default" bindsym e exec --no-startup-id swaymsg exit, mode "default" - bindsym s exec --no-startup-id loginctl suspend, mode "default" - bindsym r exec --no-startup-id loginctl reboot, mode "default" - bindsym Shift+s exec --no-startup-id loginctl poweroff, mode "default" + bindsym s exec --no-startup-id systemctl suspend, mode "default" + bindsym r exec --no-startup-id systemctl reboot, mode "default" + bindsym Shift+s exec --no-startup-id systemctl poweroff, mode "default" bindsym Return mode "default" bindsym Escape mode "default" diff --git a/config/sway/config b/config/sway/config index 14341d2..4f2a548 100644 --- a/config/sway/config +++ b/config/sway/config @@ -1,11 +1,10 @@ # vim: ft=swayconfig exec --no-startup-id dbus-update-activation-environment --all -exec --no-startup-id gentoo-pipewire-launcher exec --no-startup-id myswaylock exec --no-startup-id swaybackground ################################################################################ include inputs -include gsettings +include theme ################################################################################ include bar diff --git a/config/sway/gsettings b/config/sway/gsettings deleted file mode 100644 index c3ea34c..0000000 --- a/config/sway/gsettings +++ /dev/null @@ -1,8 +0,0 @@ -# vim: ft=swayconfig -exec_always { - gsettings set org.gnome.desktop.interface gtk-theme 'Adwaita' - gsettings set org.gnome.desktop.interface cursor-theme 'Adwaita' - gsettings set org.gnome.desktop.interface icon-theme 'Delft' - gsettings set org.gnome.desktop.interface font-name 'DejaVu Sans 8' - gsettings set org.gnome.desktop.interface gtk-key-theme 'Emacs' -} diff --git a/config/sway/inputs b/config/sway/inputs index 235105e..3569df9 100644 --- a/config/sway/inputs +++ b/config/sway/inputs @@ -17,6 +17,20 @@ seat '*' { hide_cursor when-typing disable } +## Layout switching ############################################################ +set $mode_layout Set keyboard layout (u)s or (c)z +mode "$mode_layout" { + bindsym u input type:keyboard xkb_layout us, mode "default" + bindsym c input type:keyboard xkb_layout cz_qwerty, mode "default" + bindsym Return mode "default" + bindsym Escape mode "default" +} +bindsym --to-code $mod+slash mode "$mode_layout" + +# Type emoji +bindsym --to-code $mod+period exec rofimoji --selector wofi --skin-tone neutral +bindsym --to-code $mod+Shift+period exec rofimoji --selector wofi --skin-tone neutral --action copy + ## Susan inputs ################################################################ input '9610:33:HAILUCK_CO.,LTD_USB_KEYBOARD_Mouse' { middle_emulation enabled diff --git a/config/sway/theme b/config/sway/theme new file mode 100644 index 0000000..54b4a23 --- /dev/null +++ b/config/sway/theme @@ -0,0 +1,19 @@ +# vim: ft=swayconfig + +client.background #242424 +# class border backgr. text indicator +client.focused #81a1c1 #81a1c1 #ffffff #81a1c1 +client.unfocused #2e3440 #1f222d #888888 #1f222d +client.focused_inactive #2e3440 #1f222d #888888 #1f222d +client.placeholder #2e3440 #1f222d #888888 #1f222d +client.urgent #900000 #900000 #ffffff #900000 + + +exec_always { + gsettings set org.gnome.desktop.interface gtk-theme 'Nordic-darker-standard-buttons' + gsettings set org.gnome.desktop.wm.preferences theme "Nordic-darker-standard-buttons" + gsettings set org.gnome.desktop.interface cursor-theme 'Adwaita' + gsettings set org.gnome.desktop.interface icon-theme 'Delft' + gsettings set org.gnome.desktop.interface font-name 'DejaVu Sans 8' + gsettings set org.gnome.desktop.interface gtk-key-theme 'Emacs' +} @@ -117,6 +117,9 @@ doinst() { } inst() { + if [ ! -e "$1" ]; then + echo "Missing file to be installed: $1" >&2 + fi if [ -e "$2" ]; then # If output exists, execute diff instead checkdiff $1 $2 @@ -16,6 +16,7 @@ call vundle#begin() Plugin 'VundleVim/Vundle.vim' Plugin 'jasonccox/vim-wayland-clipboard' " Visual +Plugin 'arcticicestudio/nord-vim' Plugin 'itchyny/lightline.vim' Plugin 'nathanaelkane/vim-indent-guides' Plugin 'airblade/vim-gitgutter' @@ -69,7 +70,6 @@ set modeline set encoding=utf-8 set foldmethod=syntax -highlight Folded ctermbg=Black ctermfg=Yellow set foldtext=FoldText() function FoldText() return getline(v:foldstart) . ' ' @@ -78,10 +78,12 @@ endfunction set backspace=indent,eol,start +colorscheme nord +let g:lightline = { 'colorscheme': 'nord' } + set number set colorcolumn=80 set textwidth=80 -highlight ColorColumn ctermbg=DarkGray " Tabs setting. In default we want 4 spaces tab, but allows also 8 spaced tabs set noexpandtab |