Everything: Switch to MATE, Arc, and Solarized

TODO: Add MATE configs, wherever those are
This commit is contained in:
Salt 2019-02-01 03:07:24 -06:00
parent 8c7ba3673d
commit 4f9311163c
14 changed files with 170 additions and 138 deletions

View File

@ -6,7 +6,7 @@ conky.config = {
own_window_class = 'Conky',
own_window_type = 'override',
own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager',
own_window_colour = '282828',
own_window_colour = '383c4a',
double_buffer = true,
cpu_avg_samples = 2,
@ -15,16 +15,16 @@ conky.config = {
update_interval = 1,
use_xft = true,
font = 'Inconsolata:style=Light:size=10',
default_color = '#ebdbb2',
color1 = '282828', -- Background
color2 = 'ebdbb2', -- Foreground
color3 = '3c3836', -- Background-alt
color4 = 'b8bb26', -- Green (Battery)
color6 = '8ec07c', -- Cyan (Network)
color7 = 'fabd2f', -- Yellow (Disk)
color8 = '83a598', -- Blue (CPU)
color9 = 'd3869b', -- Magenta (Memory)
font = 'Noto Sans:style=Light:size=9',
default_color = '#fffcf6',
color1 = '383c4a', -- Background
color2 = 'fffcf6', -- Foreground
color3 = '4b5162', -- Background-alt
color4 = '859900', -- Green (Battery)
color6 = '2aa198', -- Cyan (Network)
color7 = 'b58900', -- Yellow (Disk)
color8 = '268bd2', -- Blue (CPU)
color9 = 'd33682', -- Magenta (Memory)
alignment = 'bottom_right',
xinerama_head = 2,
@ -46,11 +46,11 @@ conky.config = {
}
conky.text = [[
${image ~/.face -s 64x64}${font Inconsolata:style=Medium:size=30}$alignr${no_update $nodename_short}$font
${font Inconsolata:style=Light:size=17}$alignr${time %I:%M %p}$font
${font Inconsolata:style=Light:size=12}$alignr${time %A, %B %d, %Y}$font
${image ~/.face -s 64x64}${font Noto Sans:style=Medium:size=30}$alignr${no_update $nodename_short}$font
${font Noto Sans:style=Light:size=17}$alignr${time %I:%M %p}$font
${font Noto Sans:style=Light:size=12}$alignr${time %A, %B %d, %Y}$font
${color3}$hr$color
${font Inconsolata:style=Medium:size=10}CPU$font: $freq_g GHz$alignr$cpu%
${font Noto Sans:style=Medium:size=9}CPU$font: $freq_g GHz$alignr$cpu%
${color8}${cpugraph cpu1 20,200} ${cpugraph cpu2 20,200}
${cpugraph cpu3 20,200} ${cpugraph cpu4 20,200}$color
${color8}${top name 1}$color$alignr${top cpu 1}%
@ -58,7 +58,7 @@ ${color8}${top name 2}$color$alignr${top cpu 2}%
${color8}${top name 3}$color$alignr${top cpu 3}%
${color8}${top name 4}$color$alignr${top cpu 4}%
${color3}$hr$color
${font Inconsolata:style=Medium:size=10}Memory$font: $mem / $memmax used$alignr$memperc%
${font Noto Sans:style=Medium:size=9}Memory$font: $mem / $memmax used$alignr$memperc%
${color9}${memgraph}$color
Memory$alignr$memeasyfree free ${color9}${membar}$color
Swap$alignr$swapfree ${color9}${swapbar}$color
@ -67,7 +67,7 @@ ${color9}${top_mem name 2}$color$alignr${top_mem mem 2}%
${color9}${top_mem name 3}$color$alignr${top_mem mem 3}%
${color9}${top_mem name 4}$color$alignr${top_mem mem 4}%
${color3}$hr$color
${font Inconsolata:style=Medium:size=10}Disk$font (R/W):$alignr${diskio /dev/sda}
${font Noto Sans:style=Medium:size=9}Disk$font (R/W):$alignr${diskio /dev/sda}
${color7}${diskiograph_read /dev/sda 20,200} ${diskiograph_write /dev/sda 20,200}$color
/$alignr${fs_free /} ${color7}${fs_bar /}$color
/home$alignr${fs_free /home} ${color7}${fs_bar /home}$color
@ -78,7 +78,7 @@ ${color7}${top_io name 2}$color$alignr${top_io io_perc 2}%
${color7}${top_io name 3}$color$alignr${top_io io_perc 3}%
${color7}${top_io name 4}$color$alignr${top_io io_perc 4}%
${color3}$hr$color
${font Inconsolata:style=Medium:size=10}Network$font:${alignr}Default $gw_iface${if_up wlp1s0}
${font Noto Sans:style=Medium:size=9}Network$font:${alignr}Default $gw_iface${if_up wlp1s0}
wlp1s0 (U/D):$alignr${addr wlp1s0} / ${wireless_essid wlp1s0}
${color6}${upspeedgraph wlp1s0 20,200} ${downspeedgraph wlp1s0 20,200}$color$endif${if_up wlp5s0}
wlp5s0 (U/D):$alignr${addr wlp5s0} / ${wireless_essid wlp5s0}

View File

@ -7,8 +7,8 @@
# Put your basic configuration in here
#
export XDG_CURRENT_DESKTOP="KDE"
for term in konsole xfce4-terminal urxvt xterm; do
export XDG_CURRENT_DESKTOP="MATE"
for term in konsole mate-terminal lxterminal xfce4-terminal urxvt xterm; do
if command -v "$term" > /dev/null 2>&1; then
export TERMINAL="$term"
break
@ -42,7 +42,7 @@ esac
# Background setting
if command -v hsetroot > /dev/null 2>&1; then
hsetroot -solid "#282828" -tile "$HOME/.wptile" -center "$HOME/.wpcenter"
hsetroot -solid "#383c4a" -tile "$HOME/.wptile" -center "$HOME/.wpcenter"
elif command -v nitrogen > /dev/null 2>&1; then
nitrogen --restore
fi

0
.config/dsk/run/kded5 Executable file → Normal file
View File

View File

@ -30,6 +30,7 @@
# The width can be negative. In this case the actual width is the
# screen width minus the width defined in within the geometry option.
geometry = "500x8-0-48"
corner_radius = 4
# Show how many messages are currently hidden (because of geometry).
indicate_hidden = yes
@ -61,11 +62,11 @@
# Defines width in pixels of frame around the notification window.
# Set to 0 to disable.
frame_width = 0
frame_width = 1
# Defines color of the frame around the notification window.
#frame_color = "#aaaaaa"
frame_color = "#3c3836"
frame_color = "#2b2e39"
# Define a color for the separator.
# possible values are:
@ -86,7 +87,7 @@
### Text ###
#font = Monospace 8
font = Roboto 10
font = Noto Sans 10
# The spacing between lines. If the height is smaller than the
# font height, it will get raised to the font height.
@ -241,22 +242,22 @@
[urgency_low]
# IMPORTANT: colors have to be defined in quotation marks.
# Otherwise the "#" and following would be interpreted as a comment.
background = "#282828"
foreground = "#a89984"
background = "#383c4a"
foreground = "#7c818c"
timeout = 10
# Icon for notifications with low urgency, uncomment to enable
#icon = /path/to/icon
[urgency_normal]
background = "#282828"
foreground = "#ebdbb2"
background = "#383c4a"
foreground = "#fffcf6"
timeout = 10
# Icon for notifications with normal urgency, uncomment to enable
#icon = /path/to/icon
[urgency_critical]
background = "#282828"
foreground = "#fabd2f"
background = "#383c4a"
foreground = "#b58900"
timeout = 0
# Icon for notifications with critical urgency, uncomment to enable
#icon = /path/to/icon

View File

@ -7,5 +7,12 @@ gtk-font-name=Noto Sans Regular 10
gtk-icon-theme-name=Papirus-Dark
gtk-menu-images=1
gtk-primary-button-warps-slider=0
gtk-theme-name=gruvbox-gtk
gtk-theme-name=Arc-Dark
gtk-toolbar-style=GTK_TOOLBAR_ICONS
gtk-cursor-theme-size=0
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
gtk-enable-event-sounds=1
gtk-enable-input-feedback-sounds=1
gtk-xft-antialias=1
gtk-xft-hinting=1
gtk-xft-hintstyle=hintfull

View File

@ -28,29 +28,6 @@ set $w8 8
## Cosmetcs
###################
# Set up our colors
# Note: fallbacks are copied from gruvbox-dark
# Source: https://github.com/morhetz/gruvbox-generalized
set_from_resource $bg background #282828
set_from_resource $bgm bg2 #3c3836
set_from_resource $bg_soft bg3 #32302f
set_from_resource $black color0 #282828
set_from_resource $red color1 #cc241d
set_from_resource $green color2 #98971a
set_from_resource $yellow color3 #d79921
set_from_resource $blue color4 #458588
set_from_resource $purple color5 #b16286
set_from_resource $cyan color6 #689d6a
set_from_resource $gray color7 #a89984
set_from_resource $gray2 color8 #928374
set_from_resource $red2 color9 #fb4934
set_from_resource $green2 color10 #b8bb26
set_from_resource $yellow2 color11 #fabd2f
set_from_resource $blue2 color12 #83a598
set_from_resource $purple2 color13 #d3869b
set_from_resource $cyan2 color14 #8ec07c
set_from_resource $fg color15 #ebdbb2
# Set up titlebar and i3bar fonts
font pango:Roboto 10
@ -59,6 +36,7 @@ hide_edge_borders smart
new_window pixel 2
for_window [class=".*"] border pixel 2
for_window [class="konsole"] border normal 2
for_window [class="mate-terminal"] border normal 2
for_window [class=".*"] title_format "%title"
# Miscellaneous window rules
@ -74,19 +52,28 @@ for_window [title="Minecraft 1.7.10"] fullscreen enable
for_window [class="explorer.exe"] fullscreen enable
for_window [class="plasmashell"] kill, floating enable, border none
for_window [class="pavucontrol-qt"] floating enable, sticky enable
for_window [class="pavucontrol"] floating enable, sticky enable
no_focus [class="Conky"]
no_focus [class="plasmashell"]
focus_on_window_activation none
# Set up colors
set $bg #383c4a
set $bg2 #404552
set $bg3 #4b5162
set $hi #5294e2
set $urg #5294e2
set $inac #4b5162
# Apply colors to i3
# <colorclass> <border> <backgrd> <text> <indicator> <child_border>
client.focused $blue2 $blue2 $bg $bgm $blue2
client.focused_inactive $bgm $bgm $blue $bgm $bgm
client.unfocused $bgm $bgm $fg $bgm $bgm
client.urgent $yellow2 $yellow2 $bg $bgm $yellow2
client.placeholder $purple2 $bgm $purple2 $purple $purple2
client.focused $hi $bg $bg $bg $hi
client.focused_inactive $inac $inac $fg $inac $inac
client.unfocused $bg2 $bg2 $fg $bg2 $bg2
client.urgent $urg $urg $bg $bg2 $urg
client.placeholder $hi $inac $bg $bg $bg
client.background $bg
###################

View File

@ -19,45 +19,53 @@ configuration {
}
* {
background: #282828;
background-alt: #3c3836;
foreground: #ebdbb2;
foreground-alt: #a89984;
blue-dark: #458588;
blue: #83a598;
yellow: #fabd2f;
background: #383c4a;
background-alt: #404552;
border: #2b2e39;
foreground: #fffcf6;
foreground-alt: #7c818c;
blue-dark: #457dbf;
blue: #5294e2;
yellow: #b58900;
text-color: @foreground;
background-color: @background;
font: "Roboto 10";
background-color: @background-alt;
font: "Noto Sans 10";
}
#window {
location: southwest;
anchor: southwest;
border-color: @background;
background-color: @background;
border-color: @border;
background-color: @background-alt;
border: 4px;
border: 1px 1px 0px 0px;
border-radius: 0px 3px 0px 0px;
height: 60%;
width: 520px;
}
#inputbar {
padding: 9px;
padding: 14px;
border: 0px 0px 1px 0px;
border-color: @background-alt;
border-color: @border;
background-color: @background;
}
#case-indicator {
text-color: @foreground-alt;
background-color: @background;
}
#prompt {
font: "Roboto Bold 10";
padding: 0px 8px 0px 0px;
text-color: @foreground;
background-color: @background;
}
#entry {
background-color: @background;
}
#message {
@ -75,6 +83,7 @@ configuration {
}
#element {
border-radius: 3px;
padding: 4px;
}
@ -88,17 +97,14 @@ configuration {
#element selected normal {
background-color: @blue;
text-color: @background;
}
#element selected active {
background-color: @blue-dark;
text-color: @background;
}
#element selected urgent {
background-color: @yellow;
text-color: @background;
}
#sidebar {

View File

@ -1,21 +1,21 @@
#---- Generated by tint2conf 9757 ----
#---- Generated by tint2conf 54d3 ----
# See https://gitlab.com/o9000/tint2/wikis/Configure for
# full documentation of the configuration options.
#-------------------------------------
# Gradients
#-------------------------------------
# Backgrounds
# Background 1: Active desktop name, Active task
rounded = 0
# Background 1: Active task
rounded = 3
border_width = 2
border_sides = B
border_sides =
border_content_tint_weight = 0
background_content_tint_weight = 0
background_color = #282828 100
border_color = #83a598 100
background_color_hover = #282828 100
background_color = #5294e2 100
border_color = #5294e2 100
background_color_hover = #404552 100
border_color_hover = #000000 0
background_color_pressed = #282828 100
background_color_pressed = #404552 100
border_color_pressed = #000000 0
# Background 2: Launcher, Launcher icon
@ -24,7 +24,7 @@ border_width = 0
border_sides = TBLR
border_content_tint_weight = 0
background_content_tint_weight = 0
background_color = #3c3836 100
background_color = #383c4a 100
border_color = #000000 0
background_color_hover = #83a598 100
border_color_hover = #000000 0
@ -37,33 +37,72 @@ border_width = 0
border_sides = TBLR
border_content_tint_weight = 0
background_content_tint_weight = 0
background_color = #fabd2f 100
background_color = #5294e2 100
border_color = #000000 0
background_color_hover = #83a598 100
border_color_hover = #000000 0
background_color_pressed = #458588 100
border_color_pressed = #000000 0
# Background 4: Inactive desktop name, Normal task
# Background 4: Normal task, Tooltip
rounded = 0
border_width = 2
border_sides = TBLR
border_content_tint_weight = 0
background_content_tint_weight = 0
background_color = #282828 100
border_color = #282828 100
background_color_hover = #282828 100
background_color = #383c4a 100
border_color = #383c4a 100
background_color_hover = #383c4a 100
border_color_hover = #000000 0
background_color_pressed = #282828 100
background_color_pressed = #383c4a 100
border_color_pressed = #000000 0
# Background 5: Active desktop name
rounded = 3
border_width = 1
border_sides = TBLR
border_content_tint_weight = 0
background_content_tint_weight = 0
background_color = #5294e2 0
border_color = #5294e2 100
background_color_hover = #404552 100
border_color_hover = #000000 0
background_color_pressed = #404552 100
border_color_pressed = #000000 0
# Background 6: Inactive desktop name
rounded = 0
border_width = 1
border_sides = LR
border_content_tint_weight = 0
background_content_tint_weight = 0
background_color = #5294e2 0
border_color = #2b2e39 0
background_color_hover = #404552 100
border_color_hover = #000000 0
background_color_pressed = #404552 100
border_color_pressed = #000000 0
# Background 7: Panel
rounded = 0
border_width = 1
border_sides = T
border_content_tint_weight = 0
background_content_tint_weight = 0
background_color = #5294e2 0
border_color = #2b2e39 100
background_color_hover = #404552 100
border_color_hover = #000000 0
background_color_pressed = #404552 100
border_color_pressed = #000000 0
#-------------------------------------
# Panel
panel_items = TSBC
panel_items = TSC
panel_size = 100% 3%
panel_margin = 0 0
panel_padding = 0 0 0
panel_background_id = 0
panel_padding = 0 0 2
panel_background_id = 7
wm_menu = 0
panel_dock = 0
panel_position = bottom center horizontal
@ -88,7 +127,7 @@ scale_relative_to_screen_height = 0
# Taskbar
taskbar_mode = multi_desktop
taskbar_hide_if_empty = 0
taskbar_padding = 0 0 8
taskbar_padding = 6 0 8
taskbar_background_id = 0
taskbar_active_background_id = 0
taskbar_name = 1
@ -96,12 +135,12 @@ taskbar_hide_inactive_tasks = 0
taskbar_hide_different_monitor = 1
taskbar_hide_different_desktop = 0
taskbar_always_show_all_desktop_tasks = 0
taskbar_name_padding = 16 0
taskbar_name_background_id = 4
taskbar_name_active_background_id = 1
taskbar_name_font = Inconsolata Medium 10
taskbar_name_font_color = #ebdbb2 100
taskbar_name_active_font_color = #ebdbb2 100
taskbar_name_padding = 12 0
taskbar_name_background_id = 6
taskbar_name_active_background_id = 5
taskbar_name_font = Noto Sans 10
taskbar_name_font_color = #fffcf6 100
taskbar_name_active_font_color = #fffcf6 100
taskbar_distribute_size = 0
taskbar_sort_order = center
task_align = left
@ -113,14 +152,12 @@ task_icon = 1
task_centered = 0
urgent_nb_of_blink = 3
task_maximum_size = 32 32
task_padding = 8 8 4
task_padding = 8 6 4
task_font = Inconsolata Medium 10
task_tooltip = 0
task_tooltip = 1
task_thumbnail = 0
task_thumbnail_size = 480
task_font_color = #ebdbb2 100
task_active_font_color = #282828 100
task_urgent_font_color = #282828 100
task_font_color = #fffcf6 100
task_normal_background_id = 4
task_active_background_id = 1
task_urgent_background_id = 3
@ -155,14 +192,14 @@ launcher_tooltip = 0
#-------------------------------------
# Clock
time1_format = %a %I:%M %p
time2_format = %b%e %Y
time1_font = Inconsolata 10
time2_format =
time1_font = Noto Sans 10
time1_timezone =
time2_timezone =
time2_font = Inconsolata Medium 10
time2_font = Noto Sans Light 10
clock_font_color = #ebdbb2 100
clock_padding = 10 0
clock_background_id = -1
clock_background_id = 0
clock_tooltip =
clock_tooltip_timezone =
clock_lclick_command =
@ -197,7 +234,7 @@ ac_disconnected_cmd =
tooltip_show_timeout = 0.2
tooltip_hide_timeout = 0
tooltip_padding = 4 4
tooltip_background_id = -1
tooltip_background_id = 4
tooltip_font_color = #ebdbb2 100
tooltip_font = Noto Sans 10

View File

@ -1,18 +1,18 @@
# File created by KDE Gtk Config
# Configs for GTK2 programs
# DO NOT EDIT! This file will be overwritten by LXAppearance.
# Any customization should be done in ~/.gtkrc-2.0.mine instead.
include "/usr/share/themes/QtCurve/gtk-2.0/gtkrc"
style "user-font"
{
font_name="Noto Sans Regular"
}
widget_class "*" style "user-font"
gtk-font-name="Noto Sans Regular 10"
gtk-theme-name="QtCurve"
include "/home/salt/.gtkrc-2.0.mine"
gtk-theme-name="Arc-Dark"
gtk-icon-theme-name="Papirus-Dark"
gtk-fallback-icon-theme="hicolor"
gtk-font-name="Noto Sans Regular 10"
gtk-cursor-theme-name="breeze_cursors"
gtk-cursor-theme-size=0
gtk-toolbar-style=GTK_TOOLBAR_ICONS
gtk-menu-images=1
gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
gtk-button-images=1
gtk-primary-button-warps-slider=0
gtk-menu-images=1
gtk-enable-event-sounds=1
gtk-enable-input-feedback-sounds=1
gtk-xft-antialias=1
gtk-xft-hinting=1
gtk-xft-hintstyle="hintfull"

@ -1 +1 @@
Subproject commit fbe1e35e78468674394581cc2c5a8cbaea744532
Subproject commit 44430eb3e807d69a2b608d30daab3bb282d37ac9

@ -1 +0,0 @@
Subproject commit cb4e7a5643f7d2dd40e694bcbd28c4b89b185e86

@ -1 +0,0 @@
Subproject commit 21659af1fc980ebe7de0f475e57c3fda9a82c2d3

14
.vimrc
View File

@ -1,7 +1,7 @@
execute pathogen#infect()
set background=dark
colorscheme gruvbox
set background=light
colorscheme solarized
syntax on
filetype plugin indent on
@ -24,7 +24,7 @@ let g:lightline = {
\ 'charvaluehex': 'char: 0x%B'
\ },
\}
let g:lightline.colorscheme = 'gruvbox'
let g:lightline.colorscheme = 'solarized'
" Automatically read when a file is changed outside of Vim
set autoread
@ -33,12 +33,8 @@ set autoread
set modeline
set modelines=5
" View tabs and trailing whitespace
set list
set listchars=tab:>·,trail
" Use XA_PRIMARY clipboard by default
set clipboard=unnamed
set clipboard=unnamedplus
" Python stuff
au BufNewFile,BufRead *.py " Set up nice PEP8 indentation
@ -57,7 +53,7 @@ set encoding=utf-8
set laststatus=2 " Always show statusbar
" For clang_complete
" Proper path for Debian Testing
" Proper path for Debian Buster
let g:clang_library_path='/usr/lib/llvm-4.0/lib/libclang.so.1'
" Enable 256-color support