Compare commits

...

9 Commits

14 changed files with 61 additions and 91 deletions

0
.config/concession/services/20_polybar.dtf Executable file → Normal file
View File

0
.config/concession/tasks/00_bspwm.sh Executable file → Normal file
View File

0
.config/concession/tasks/09_bspwm_monitorset.sh Executable file → Normal file
View File

0
.config/concession/tasks/20_nitrogen.sh Executable file → Normal file
View File

View File

@ -6,7 +6,7 @@ conky.config = {
own_window_class = 'Conky', own_window_class = 'Conky',
own_window_type = 'override', own_window_type = 'override',
own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager', own_window_hints = 'undecorated,below,sticky,skip_taskbar,skip_pager',
own_window_colour = '282828', own_window_colour = '000000',
double_buffer = true, double_buffer = true,
cpu_avg_samples = 2, cpu_avg_samples = 2,
@ -16,15 +16,15 @@ conky.config = {
use_xft = true, use_xft = true,
font = 'Inconsolata:style=Light:size=10', font = 'Inconsolata:style=Light:size=10',
default_color = '#ebdbb2', default_color = '#b2b2b2',
color1 = '282828', -- Background color1 = '000000', -- Background
color2 = 'ebdbb2', -- Foreground color2 = 'b2b2b2', -- Foreground
color3 = '3c3836', -- Background-alt color3 = '181818', -- Background-alt
color4 = 'b8bb26', -- Green (Battery) color4 = '54ff54', -- Green (Battery)
color6 = '8ec07c', -- Cyan (Network) color6 = '54ffff', -- Cyan (Network)
color7 = 'fabd2f', -- Yellow (Disk) color7 = 'ffff54', -- Yellow (Disk)
color8 = '83a598', -- Blue (CPU) color8 = '5454ff', -- Blue (CPU)
color9 = 'd3869b', -- Magenta (Memory) color9 = 'ff54ff', -- Magenta (Memory)
alignment = 'bottom_left', alignment = 'bottom_left',
xinerama_head = 2, xinerama_head = 2,
@ -32,7 +32,7 @@ conky.config = {
minimum_width = 304, minimum_width = 304,
border_width = 6, border_width = 6,
gap_x = 10, gap_x = 10,
gap_y = 46, gap_y = 40,
format_human_readable = true, format_human_readable = true,
if_up_strictness = "link", if_up_strictness = "link",

View File

@ -29,7 +29,7 @@
# the top and down respectively. # the top and down respectively.
# The width can be negative. In this case the actual width is the # The width can be negative. In this case the actual width is the
# screen width minus the width defined in within the geometry option. # screen width minus the width defined in within the geometry option.
geometry = "500x8-0-36" geometry = "500x8-0+0"
# Show how many messages are currently hidden (because of geometry). # Show how many messages are currently hidden (because of geometry).
indicate_hidden = yes indicate_hidden = yes
@ -51,7 +51,7 @@
# Draw a line of "separator_height" pixel height between two # Draw a line of "separator_height" pixel height between two
# notifications. # notifications.
# Set to 0 to disable. # Set to 0 to disable.
separator_height = 0 separator_height = 1
# Padding between text and separator. # Padding between text and separator.
padding = 8 padding = 8
@ -61,11 +61,11 @@
# Defines width in pixels of frame around the notification window. # Defines width in pixels of frame around the notification window.
# Set to 0 to disable. # Set to 0 to disable.
frame_width = 0 frame_width = 1
# Defines color of the frame around the notification window. # Defines color of the frame around the notification window.
#frame_color = "#aaaaaa" #frame_color = "#aaaaaa"
frame_color = "#3c3836" frame_color = "#181818"
# Define a color for the separator. # Define a color for the separator.
# possible values are: # possible values are:
@ -86,7 +86,7 @@
### Text ### ### Text ###
#font = Monospace 8 #font = Monospace 8
font = Roboto 10 font = Inconsolata 10
# The spacing between lines. If the height is smaller than the # The spacing between lines. If the height is smaller than the
# font height, it will get raised to the font height. # font height, it will get raised to the font height.
@ -125,7 +125,7 @@
# %p progress value if set ([ 0%] to [100%]) or nothing # %p progress value if set ([ 0%] to [100%]) or nothing
# %n progress value if set without any extra characters # %n progress value if set without any extra characters
# Markup is allowed # Markup is allowed
format = "<span font='Bold 14'>%s</span> <span font='Light'>(%a)</span>\n%b" format = "<span font='Bold 14'>%s</span> (%a)\n%b"
# Alignment of message text. # Alignment of message text.
# Possible values are "left", "center" and "right". # Possible values are "left", "center" and "right".
@ -241,22 +241,22 @@
[urgency_low] [urgency_low]
# IMPORTANT: colors have to be defined in quotation marks. # IMPORTANT: colors have to be defined in quotation marks.
# Otherwise the "#" and following would be interpreted as a comment. # Otherwise the "#" and following would be interpreted as a comment.
background = "#282828" background = "#000000"
foreground = "#a89984" foreground = "#686868"
timeout = 10 timeout = 10
# Icon for notifications with low urgency, uncomment to enable # Icon for notifications with low urgency, uncomment to enable
#icon = /path/to/icon #icon = /path/to/icon
[urgency_normal] [urgency_normal]
background = "#282828" background = "#000000"
foreground = "#ebdbb2" foreground = "#b2b2b2"
timeout = 10 timeout = 10
# Icon for notifications with normal urgency, uncomment to enable # Icon for notifications with normal urgency, uncomment to enable
#icon = /path/to/icon #icon = /path/to/icon
[urgency_critical] [urgency_critical]
background = "#282828" background = "#000000"
foreground = "#fabd2f" foreground = "#ffff54"
timeout = 0 timeout = 0
# Icon for notifications with critical urgency, uncomment to enable # Icon for notifications with critical urgency, uncomment to enable
#icon = /path/to/icon #icon = /path/to/icon

View File

@ -28,37 +28,14 @@ set $w8 8
## Cosmetcs ## 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 # Set up titlebar and i3bar fonts
font pango:Roboto 10 font pango:Roboto 10
# Titlebar and borders # Titlebar and borders
hide_edge_borders smart hide_edge_borders smart
new_window pixel 2 new_window pixel 1
for_window [class=".*"] border pixel 2 for_window [class=".*"] border pixel 1
for_window [class="konsole"] border normal 2 for_window [class="konsole"] border normal 1
for_window [class=".*"] title_format "%title" for_window [class=".*"] title_format "%title"
# Miscellaneous window rules # Miscellaneous window rules
@ -78,15 +55,6 @@ no_focus [class="plasmashell"]
focus_on_window_activation none focus_on_window_activation none
# 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 $bgm $yellow2 $yellow $bgm
client.placeholder $purple2 $bgm $purple2 $purple $purple2
client.background $bg
################### ###################
## Keybindings ## Keybindings
################### ###################
@ -219,26 +187,14 @@ bindsym $mod+r mode "resize"
## Bars ## Bars
################### ###################
#bar { bar {
# id bar-primary id bar-primary
# position bottom position bottom
# status_command i3status status_command i3status
# tray_output primary tray_output primary
#
# font pango:Inconsolata 10 font pango:Inconsolata 10
# # This looks dumb, but it makes the separators one character wide # This looks dumb, but it makes the separators one character wide
# separator_symbol "|" separator_symbol "|"
# }
# colors {
# background $bg
# statusline $fg
# separator $bgm
#
# focused_workspace $bg $bg $blue
# active_workspace $bg $bg $bgm
# inactive_workspace $bg $bg $fg
# urgent_workspace $bg $bg $yellow
# binding_mode $bg $bg $fg
# }
#}

View File

@ -1,8 +1,5 @@
general { general {
colors = true colors = true
color_good = "#b8bb26"
color_degraded = "#fabd2f"
color_bad = "#fb4934"
interval = 1 interval = 1
} }

View File

@ -0,0 +1,24 @@
*background: #000000
*bg2: #181818
*bg3: #686868
*foreground: #b2b2b2
! Black Red Green Yellow Blue Magenta Cyan Grey
! Dim
*color0: #000000
*color1: #b21818
*color2: #18b218
*color3: #b26818
*color4: #1818b2
*color5: #b218b2
*color6: #18b2b2
*color7: #b2b2b2
! Intense
*color8: #686868
*color9: #ff5454
*color10: #54ff54
*color11: #ffff54
*color12: #5454ff
*color13: #ff54ff
*color14: #54ffff
*color15: #ffffff

3
.gitmodules vendored
View File

@ -1,9 +1,6 @@
[submodule ".vim/bundle/vim-closetag"] [submodule ".vim/bundle/vim-closetag"]
path = .vim/bundle/vim-closetag path = .vim/bundle/vim-closetag
url = https://github.com/alvan/vim-closetag.git url = https://github.com/alvan/vim-closetag.git
[submodule ".vim/bundle/gruvbox"]
path = .vim/bundle/gruvbox
url = https://github.com/morhetz/gruvbox.git
[submodule ".vim/bundle/SimpylFold"] [submodule ".vim/bundle/SimpylFold"]
path = .vim/bundle/SimpylFold path = .vim/bundle/SimpylFold
url = https://github.com/tmhedberg/SimpylFold.git url = https://github.com/tmhedberg/SimpylFold.git

View File

@ -1,5 +1,5 @@
[Appearance] [Appearance]
ColorScheme=Gruvbox_dark ColorScheme=Linux
Font=Inconsolata,10,-1,5,50,0,0,0,0,0,Regular Font=Inconsolata,10,-1,5,50,0,0,0,0,0,Regular
[General] [General]

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

3
.vimrc
View File

@ -1,8 +1,5 @@
execute pathogen#infect() execute pathogen#infect()
set background=dark
colorscheme gruvbox
syntax on syntax on
filetype plugin indent on filetype plugin indent on