diff --git a/.config/sway/config b/.config/sway/config index 21c1fdf..c79257a 100644 --- a/.config/sway/config +++ b/.config/sway/config @@ -188,36 +188,60 @@ bindsym $mod+r mode "resize" # --------------------------------------------------- # -set $base00 #151515 -set $base01 #202020 -set $base02 #303030 -set $base03 #505050 -set $base04 #b0b0b0 -set $base05 #d0d0d0 -set $base06 #e0e0e0 -set $base07 #f5f5f5 -set $base08 #fb9fb1 -set $base09 #eda987 -set $base0A #ddb26f -set $base0B #acc267 -set $base0C #12cfc0 -set $base0D #6fc2ef -set $base0E #e1a3ee -set $base0F #deaf8f -# Property Name Border BG Text Indicator Child Border -client.focused $base05 $base0D $base00 $base0D $base0D -client.focused_inactive $base01 $base01 $base05 $base03 $base01 -client.unfocused $base01 $base00 $base05 $base01 $base01 -client.urgent $base08 $base08 $base00 $base08 $base08 -client.placeholder $base00 $base00 $base05 $base00 $base00 -client.background $base07 +#set $base00 #151515 +#set $base01 #202020 +#set $base02 #303030 +#set $base03 #505050 +#set $base04 #b0b0b0 +#set $base05 #d0d0d0 +#set $base06 #e0e0e0 +#set $base07 #f5f5f5 +#set $base08 #fb9fb1 +#set $base09 #eda987 +#set $base0A #ddb26f +#set $base0B #acc267 +#set $base0C #12cfc0 +#set $base0D #6fc2ef +#set $base0E #e1a3ee +#set $base0F #deaf8f +## Property Name Border BG Text Indicator Child Border +#client.focused $base05 $base0D $base00 $base0D $base0D +#client.focused_inactive $base01 $base01 $base05 $base03 $base01 +#client.unfocused $base01 $base00 $base05 $base01 $base01 +#client.urgent $base08 $base08 $base00 $base08 $base08 +#client.placeholder $base00 $base00 $base05 $base00 $base00 +#client.background $base07 + +# +# gaps +# +gaps outer 5 +gaps inner 5 +smart_gaps on + +# +# Titlebars +# +font pango:monospace 12px +default_border pixel 2 +titlebar_border_thickness 2 +hide_edge_borders smart +# +# Colors #93cee9 +# +# class border backgr. text indicator child_border + client.focused #5e81ac #2e3440 #d8dee9 #5e81ac #5e81ac + client.focused_inactive #3b4252 #3b4252 #d8dee9 #4c566a #4c566a + client.unfocused #434c5e #434c5e #d8dee9 #4c566a #4c566a + client.urgent #bf616a #bf616a #d8dee9 #d08770 #d08770 + # --------------------------------------------------- # # Screensaver + Locking # --------------------------------------------------- # exec swayidle -w \ - timeout 300 'swaylock -f -c 000000' \ - timeout 600 'swaymsg "output * dpms off"' \ + timeout 600 'swaylock -f -c 000000' \ + timeout 900 'swaymsg "output * dpms off"' \ resume 'swaymsg "output * dpms on"' \ before-sleep 'swaylock -f -c 000000' set $lockman exec bash ~/.config/sway/lockman.sh @@ -231,6 +255,7 @@ include ~/.config/sway/config.d/* # Autostart exec mako exec albert +exec nm-applet --indicator workspace 9 exec slack @@ -241,14 +266,31 @@ exec xrdb -load ~/.Xresources workspace 1 -set $gnome-schema org.gnome.desktop.interface +#set $gnome-schema org.gnome.desktop.interface +# +#exec_always { +# gsettings set $gnome-schema gtk-theme 'Adwaita-dark' +# gsettings set $gnome-schema icon-theme 'Adwaita' +# gsettings set $gnome-schema cursor-theme 'Adwaita' +#} +### Gnome settings +set $gnome-schema org.gnome.desktop.interface exec_always { - gsettings set $gnome-schema gtk-theme 'Adwaita-dark' - gsettings set $gnome-schema icon-theme 'Adwaita' - gsettings set $gnome-schema cursor-theme 'Adwaita' + gsettings set $gnome-schema gtk-theme 'NordSur-dark' + gsettings set $gnome-schema icon-theme 'Tela-circle-grey-dark' + gsettings set $gnome-schema font-name 'Roboto 10' + gsettings set $gnome-schema monospace-font-name 'Roboto Mono 10' + gsettings set $gnome-schema document-font-name 'Roboto 10' + gsettings set org.gnome.desktop.wm.preferences titlebar-font 'Roboto Bold 10' + gsettings set org.gnome.desktop.wm.preferences button-layout '' + gsettings set org.gnome.desktop.default-applications.terminal exec $term + gsettings set org.gnome.desktop.default-applications.terminal exec-arg '' } + # # App Specific Styling for_window [app_id="termite"] border pixel +for_window [app_id=pavucontrol] floating enable +for_window [app_id=".*"] border pixel 4 diff --git a/.config/termite/config b/.config/termite/config index 88f6c20..14ff16c 100644 --- a/.config/termite/config +++ b/.config/termite/config @@ -1,105 +1,37 @@ +# Copyright (c) 2016-present Arctic Ice Studio +# Copyright (c) 2016-present Sven Greb + +# Project: Nord Termite +# Repository: https://github.com/arcticicestudio/nord-termite +# License: MIT + [options] -#allow_bold = true -#audible_bell = false -#bold_is_bright = true -#cell_height_scale = 1.0 -#cell_width_scale = 1.0 -#clickable_url = true -#dynamic_title = true -font = Hack 9 -#fullscreen = true -#icon_name = terminal -#mouse_autohide = false -#scroll_on_output = false -#scroll_on_keystroke = true -# Length of the scrollback buffer, 0 disabled the scrollback buffer -# and setting it to a negative value means "infinite scrollback" +#font = Roboto Mono 10 scrollback_lines = 10000 -#search_wrap = true -#urgent_on_bell = true -#hyperlinks = false - -# $BROWSER is used by default if set, with xdg-open as a fallback -#browser = xdg-open - -# "system", "on" or "off" -#cursor_blink = system - -# "block", "underline" or "ibeam" -#cursor_shape = block - -# Hide links that are no longer valid in url select overlay mode -#filter_unmatched_urls = true - -# Emit escape sequences for extra modified keys -#modify_other_keys = false - -# set size hints for the window -#size_hints = false - -# "off", "left" or "right" -#scrollbar = off [colors] -[colors] -# Base16 Monokai -# Author: Wimer Hazenberg (http://www.monokai.nl) +cursor = #d8dee9 +cursor_foreground = #2e344 -foreground = #f8f8f2 -foreground_bold = #f5f4f1 -cursor = #f5f4f1 -cursor_foreground = #272822 -background = #282828 +foreground = #d8dee9 +foreground_bold = #d8dee9 +background = #2e3440 -# 16 color space +highlight = #4c566a -# Black, Gray, Silver, White -color0 = #272822 -color8 = #75715e -color7 = #f8f8f2 -color15 = #f9f8f5 - -# Red -color1 = #f92672 -color9 = #f92672 - -# Green -color2 = #a6e22e -color10 = #a6e22e - -# Yellow -color3 = #f4bf75 -color11 = #f4bf75 - -# Blue -color4 = #66d9ef -color12 = #66d9ef - -# Purple -color5 = #ae81ff -color13 = #ae81ff - -# Teal -color6 = #a1efe4 -color14 = #a1efe4 - -# Extra colors -color16 = #fd971f -color17 = #cc6633 -color18 = #383830 -color19 = #49483e -color20 = #a59f85 -color21 = #f5f4f1 - -[hints] -#font = Monospace 12 -#foreground = #dcdccc -#background = #3f3f3f -#active_foreground = #e68080 -#active_background = #3f3f3f -#padding = 2 -#border = #3f3f3f -#border_width = 0.5 -#roundness = 2.0 - -# vim: ft=dosini cms=#%s +color0 = #3b4252 +color1 = #bf616a +color2 = #a3be8c +color3 = #ebcb8b +color4 = #81a1c1 +color5 = #b48ead +color6 = #88c0d0 +color7 = #e5e9f0 +color8 = #4c566a +color9 = #bf616a +color10 = #a3be8c +color11 = #ebcb8b +color12 = #81a1c1 +color13 = #b48ead +color14 = #8fbcbb +color15 = #eceff4 diff --git a/.config/waybar/config b/.config/waybar/config index c6a164a..b396e9a 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -1,56 +1,43 @@ { - // "layer": "top", // Waybar at top layer - // "position": "bottom", // Waybar position (top|bottom|left|right) - "height": 26, // Waybar height (to be removed for auto height) - // "width": 1280, // Waybar width - // Choose the order of the modules - "modules-left": ["sway/workspaces", "sway/mode"], + "layer": "bottom", + "position": "top", + "height": 30, + + "modules-left": [ + "sway/workspaces", + "sway/mode" + ], "modules-center": ["sway/window"], - "modules-right": ["idle_inhibitor", "pulseaudio", "network", "cpu", "memory", "temperature", "backlight", "battery", "battery#bat2", "clock", "tray"], + "modules-right": [ + "idle_inhibitor", + "pulseaudio", + "custom/headset", + "network", + "cpu", + "memory", + "backlight", + "battery", + "clock", + "tray" + ], // Modules configuration - // "sway/workspaces": { - // "disable-scroll": true, - // "all-outputs": true, - // "format": "{name}: {icon}", - // "format-icons": { - // "1": "", - // "2": "", - // "3": "", - // "4": "", - // "5": "", - // "urgent": "", - // "focused": "", - // "default": "" - // } - // }, - "sway/mode": { - "format": "{}" + "sway/workspaces": { + "disable-scroll": true, + "all-outputs": true, + "format": "{icon}", + "format-icons": { + "1": "", + "2": "", + "3": "", + "4": "", + "9": "", + "urgent": "", + "focused": "", + "default": "" + } }, - "mpd": { - "format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ", - "format-disconnected": "Disconnected ", - "format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ", - "unknown-tag": "N/A", - "interval": 2, - "consume-icons": { - "on": " " - }, - "random-icons": { - "off": " ", - "on": " " - }, - "repeat-icons": { - "on": " " - }, - "single-icons": { - "on": "1 " - }, - "state-icons": { - "paused": "", - "playing": "" - }, - "tooltip-format": "MPD (connected)", - "tooltip-format-disconnected": "MPD (disconnected)" + "sway/mode": { + "format": "{}" }, "idle_inhibitor": { "format": "{icon}", @@ -60,20 +47,21 @@ } }, "tray": { - // "icon-size": 21, + "icon-size": 12, "spacing": 10 }, "clock": { // "timezone": "America/New_York", - "tooltip-format": "{:%Y %B}\n{calendar}", - "format-alt": "{:%Y-%m-%d}" + "tooltip-format": "{:%a %d %b %H:%M}", + "tooltip": true }, "cpu": { - "format": "{usage}% ", - "tooltip": false + "interval": 2, + "format": " {usage:2}%", }, "memory": { - "format": "{}% " + "interval": 5, + "format": " {}%" }, "temperature": { // "thermal-zone": 2, @@ -94,7 +82,7 @@ "warning": 30, "critical": 15 }, - "format": "{capacity}% {icon}", + "format": "{icon} {capacity}%", "format-charging": "{capacity}% ", "format-plugged": "{capacity}% ", "format-alt": "{time} {icon}", @@ -102,9 +90,6 @@ // "format-full": "", "format-icons": ["", "", "", "", ""] }, - "battery#bat2": { - "bat": "BAT2" - }, "network": { // "interface": "wlp2*", // (Optional) To force the use of this interface "format-wifi": "{essid} ({signalStrength}%) ", @@ -143,5 +128,16 @@ "escape": true, "exec": "$HOME/.config/waybar/mediaplayer.py 2> /dev/null" // Script in resources folder // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name + }, + "custom/headset": { + "format": "  {}", + "on-click": "$HOME/.config/waybar/connect_headset.sh", + "interval": 10, + "return-type": "json", + "exec": "$HOME/.config/waybar/check_headset.sh" + }, + "custom/separator": { + "format": "", + "tooltip": false } } diff --git a/.config/waybar/style.css b/.config/waybar/style.css index f1eecfa..03aecd2 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,65 +1,67 @@ * { border: none; border-radius: 0; - font-size: 13px; - font-family: "DejaVu Sans"; + font-family: monospace; + font-size: 14px; min-height: 0; } window#waybar { - background: transparent; + background: #3b4252; color: white; } -#window { - font-weight: bold; - font-family: "DejaVu Sans"; -} -/* #workspaces { - padding: 0 5px; + background-color: #4c566a; + margin: 5px; + margin-left: 10px; + border-radius: 5px; } -*/ - #workspaces button { - padding: 0 5px; - background: transparent; - color: white; - border-top: 2px solid transparent; + padding: 0 10px; + color: #eceff4; } #workspaces button.focused { - color: #c9545d; - border-top: 2px solid #ee6c4d; + color: #2e3440; + background-color: #88c0d0; + border-radius: 5px; } -#workspaces button.urgent { - border-top: 2px solid #9CEC5B; +#workspaces button:hover { + background-color: #5e81ac; + border-radius: 5px; } -#mode { - background: #64727D; - border-bottom: 3px solid white; +#custom-headset, #cpu, #memory, #backlight, #clock, #battery, #pulseaudio, #network { + background-color: #4c566a; + padding: 0px 10px; + margin: 5px 0px; } -#clock, #battery, #cpu, #memory, #network, #pulseaudio, #custom-spotify, #tray, #mode { - padding: 0 3px; - margin: 0 2px; +#custom-date { + color: #8fbcbb; +} + +#custom-power { + color: #2e3440; + background-color: #bf616a; + border-radius: 5px; + margin-right: 10px; + margin-top: 5px; + margin-bottom: 5px; + margin-left: 0px; + padding: 0px 10px; } #clock { - font-weight: bold; + color: #b48ead; + border-radius: 0px 5px 5px 0px; + margin-right: 10px; } #battery { -} - -#battery icon { - color: #ee6c4d; -} - -#battery.charging { - color: #9cec5b; + color: #a3be8c; } @keyframes blink { @@ -69,8 +71,13 @@ window#waybar { } } -#battery.warning:not(.charging) { - color: white; +#battery.charging { + color: #a3be8c; +} + +#battery.critical:not(.charging) { + background-color: #f53c3c; + color: #ffffff; animation-name: blink; animation-duration: 0.5s; animation-timing-function: linear; @@ -78,45 +85,22 @@ window#waybar { animation-direction: alternate; } -#cpu { -} - -#memory { -} - #network { -} - -#network.disconnected { - background: #f53c3c; + color: #d08770; } #pulseaudio { + color: #ebcb8b; + border-radius: 5px 0px 0px 5px; } -#pulseaudio.muted { -} - -#custom-spotify { - color: rgb(102, 220, 105); +#idle_inhibitor { + background-color: #4c566a; + border-radius: 5px ; + margin: 5px; + padding: 0 10px; } #tray { - -} -#clock, -#battery, -#cpu, -#memory, -#temperature, -#backlight, -#network, -#pulseaudio, -#custom-media, -#tray, -#mode, -#idle_inhibitor, -#mpd { - padding: 0 10px; - margin: 0 4px; + margin-right: 10px; } diff --git a/.tmux.conf b/.tmux.conf index c2a997b..9c2b38b 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -75,79 +75,10 @@ setw -g mouse on bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'copy-mode -e'" bind -n WheelDownPane select-pane -t= \; send-keys -M -# Force support for 24bit coloring -set -ga terminal-overrides ",xterm-256color:Tc" +# List of plugins +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-sensible' +set -g @plugin "arcticicestudio/nord-tmux" -###################### -#### DESIGN CHANGES ### -####################### - -# panes -set -g pane-border-style fg=black -set -g pane-active-border-style fg=brightred - -## Status bar design -# status line -set -g status-justify left -set -g status-style bg=default,fg=colour21 -set -g status-interval 2 - -# messaging -set -g message-style fg=black,bg=yellow -set -g message-command-style fg=blue,bg=black - -#window mode -setw -g mode-style bg=colour6,fg=colour0 - -# window status -setw -g window-status-format " #F#I:#W#F " -setw -g window-status-current-format " #F#I:#W#F " -setw -g window-status-format "#[fg=magenta]#[bg=black] #I #[bg=cyan]#[fg=colour8] #W " -setw -g window-status-current-format "#[bg=brightmagenta]#[fg=colour8] #I #[fg=colour8]#[bg=colour14] #W " -setw -g window-status-current-style bg=colour0,fg=colour11,dim -setw -g window-status-style bg=green,fg=black,reverse - -# Info on left (I don't have a session display for now) -set -g status-left '' - -# loud or quiet? -set-option -g visual-activity off -set-option -g visual-bell off -set-option -g visual-silence off -set-window-option -g monitor-activity off -set-option -g bell-action none - -# The modes { -setw -g clock-mode-colour colour135 -setw -g mode-style fg=colour196,bg=colour238,bold - -# } -# The panes { - -set -g pane-border-style bg=colour235,fg=colour238 -set -g pane-active-border-style bg=colour236,fg=colour51 - -# } -# The statusbar { - -set -g status-position bottom -set -g status-style bg=colour234,fg=colour137,dim -set -g status-left '' -set -g status-right '#[fg=colour233,bg=colour241,bold] %d/%m #[fg=colour233,bg=colour245,bold] %H:%M:%S ' -set -g status-right-length 50 -set -g status-left-length 20 - -setw -g window-status-current-style fg=colour81,bg=colour238,bold -setw -g window-status-current-format ' #I#[fg=colour250]:#[fg=colour255]#W#[fg=colour50]#F ' - -setw -g window-status-style fg=colour138,bg=colour235,none -setw -g window-status-format ' #I#[fg=colour237]:#[fg=colour250]#W#[fg=colour244]#F ' - -setw -g window-status-bell-style fg=colour255,bg=colour1,bold - -# } -# The messages { - -set -g message-style fg=colour232,bg=colour166,bold - -# } +# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) +run '~/.tmux/plugins/tpm/tpm' diff --git a/.vimrc b/.vimrc index 60f0938..1040516 100644 --- a/.vimrc +++ b/.vimrc @@ -14,18 +14,21 @@ Plug 'junegunn/fzf.vim' Plug 'udalov/kotlin-vim' Plug 'rust-lang/rust.vim' Plug 'zivyangll/git-blame.vim' +Plug 'mfukar/robotframework-vim' +Plug 'dense-analysis/ale' +Plug 'arcticicestudio/nord-vim' " Initialize plugin system call plug#end() " Coloring syntax enable -colorscheme monokai +colorscheme nord " Airline let g:airline#extensions#tabline#enabled = 1 let g:airline_powerline_fonts = 1 -let g:airline_theme='badwolf' +let g:airline_theme='nord' " -- Buffer/Window Workflow " Allow hidden buffers @@ -147,3 +150,10 @@ let g:jsx_ext_required = 0 if filereadable(expand("~/.vimrc.local")) source ~/.vimrc.local endif + +" CTags +set tags+=.tags " We like hidden files +let g:fzf_tags_command = 'ctags -R -f .tags --exclude=@.ctagsignore' + +" ALE +highlight ALEWarning ctermbg=DarkGrey