diff --git a/home/.Xresources b/home/.Xresources index 3de97dab..3e0a25be 100644 --- a/home/.Xresources +++ b/home/.Xresources @@ -1,7 +1,7 @@ ! Base colors *.foreground: #E1E1E1 *.background: #1c2023 -*.cursorColor: #707880 +*.cursorColor: #778899 *.color0: #1c2023 *.color1: #bf616a @@ -11,7 +11,7 @@ *.color5: #b48ead *.color6: #96b5b4 *.color7: #E1E1E1 -*.color8: #1c2023 +*.color8: #919ba0 *.color9: #bf616a *.color10: #a3be8c *.color11: #ebcb8b diff --git a/home/.config/conky/ArchLabs.conkyrc b/home/.config/conky/ArchLabs.conkyrc index 53bb28e9..62878d36 100644 --- a/home/.config/conky/ArchLabs.conkyrc +++ b/home/.config/conky/ArchLabs.conkyrc @@ -32,8 +32,8 @@ default_gauge_height = 25, default_gauge_width =40, default_graph_height = 40, default_graph_width = 153, -default_shade_color = '#000000', -default_outline_color = '#000000', +default_shade_color = '#1c2023', +default_outline_color = '#1c2023', draw_borders = false, draw_graph_borders = true, draw_shades = false, @@ -59,7 +59,7 @@ own_window = true, own_window_argb_value = 250, own_window_argb_visual = true, own_window_class = 'Conky', -own_window_colour = '#000000', +own_window_colour = '#1c2023', own_window_hints = 'undecorated,below,above,sticky,skip_taskbar,skip_pager', own_window_transparent = true, own_window_title = 'system_conky', @@ -97,8 +97,8 @@ ${hr} [S] + t${alignr}Terminal [S] + e${alignr}Text Editor [S] + f${alignr}File Manager -[S] + m${alignr}Music Player [S] + w${alignr}Web Browser +[S] + m${alignr}Music Player [S] + v${alignr}Audio Control [S] + x${alignr}Logout ]]; diff --git a/home/.config/networkmanager-dmenu/config.ini b/home/.config/networkmanager-dmenu/config.ini index 3d0c4f5a..f298f27b 100644 --- a/home/.config/networkmanager-dmenu/config.ini +++ b/home/.config/networkmanager-dmenu/config.ini @@ -1,5 +1,5 @@ [dmenu] -dmenu_command = rofi -location 3 -yoffset 35 -xoffset -10 -width 37 -font "DejaVu Sans Mono 11" -padding 20 -line-padding 4 -hide-scrollbar -password +dmenu_command = rofi -location 3 -yoffset 35 -xoffset -10 -width 37 -font "DejaVu Sans Mono 11" -padding 20 -line-padding 4 -password [editor] terminal = termite diff --git a/home/.config/ranger/colorschemes/jinx.py b/home/.config/ranger/colorschemes/jinx.py new file mode 100755 index 00000000..d1e9c423 --- /dev/null +++ b/home/.config/ranger/colorschemes/jinx.py @@ -0,0 +1,149 @@ +""" +A ranger color scheme + +Made to be eye catchy while maintaining visibility, and base 0-7 colours. + +Inspired by themes like Tomorrow, Dracula, Atom, and Spacemacs, but with my own twists +""" + +from ranger.gui.colorscheme import ColorScheme +from ranger.gui.color import * + + +class jinx(ColorScheme): + """ + Defines colours used when colourscheme is enabled + """ + progress_bar_color = 96 + + def use(self, context): + """ + Main colour block with individual definitions + """ + fg, bg, attr = default_colors + + if context.reset: + return default_colors + elif context.in_browser: + if context.selected: + attr = reverse + else: + attr = normal + if context.empty or context.error: + fg = 131 + if context.border: + fg = 247 + if context.image: + fg = 179 + if context.video: + fg = 96 + if context.audio: + fg = 117 + if context.document: + fg = 38 + if context.container: + fg = 108 + if context.directory: + fg = 103 + elif context.executable and not \ + any((context.media, context.fifo, context.container, context.socket)): + fg = 67 + if context.socket: + fg = 179 + attr |= bold + if context.fifo or context.device: + fg = 214 + attr |= bold + if context.link: + fg = 38 if context.good else 131 + if context.tag_marker and not context.selected: + fg = 96 + attr |= bold + if not context.selected and (context.cut or context.copied): + fg = 247 + attr |= underline + if context.main_column: + if context.marked: + attr |= underline + fg = 131 + if context.selected: + attr |= normal + if context.badinfo: + if attr & reverse: + bg = 96 + else: + fg = 203 + elif context.in_titlebar: + attr |= bold + if context.hostname: + fg = 203 if context.bad else 67 + elif context.directory: + fg = 96 + elif context.tab: + if context.good: + bg = 96 + elif context.link: + fg = 117 + elif context.in_statusbar: + if context.permissions: + if context.good: + fg = 67 + elif context.bad: + fg = 203 + if context.marked: + attr |= bold | reverse + fg = 96 + if context.message: + if context.bad: + attr |= bold + fg = 96 + if context.loaded: + bg = self.progress_bar_color + if context.vcsinfo: + fg = 38 + attr &= ~bold + if context.vcscommit: + fg = 108 + attr &= ~bold + if context.text: + fg = 254 + if context.highlight: + attr |= reverse + if context.in_taskview: + if context.title: + fg = 67 + if context.selected: + attr |= reverse + if context.loaded: + if context.selected: + fg = self.progress_bar_color + else: + bg = self.progress_bar_color + if context.vcsfile and not context.selected: + attr &= ~bold + if context.vcsconflict: + fg = 203 + elif context.vcschanged: + fg = 174 + elif context.vcsunknown: + fg = 174 + elif context.vcsstaged: + fg = 108 + elif context.vcssync: + fg = 108 + elif context.vcsignored: + fg = default + elif context.vcsremote and not context.selected: + attr &= ~bold + if context.vcssync: + fg = 108 + elif context.vcsbehind: + fg = 174 + elif context.vcsahead: + fg = 67 + elif context.vcsdiverged: + fg = 203 + elif context.vcsunknown: + fg = 174 + + return fg, bg, attr diff --git a/home/.config/termite/config b/home/.config/termite/config index f3a4386e..2c15d1f8 100644 --- a/home/.config/termite/config +++ b/home/.config/termite/config @@ -32,7 +32,7 @@ color4 = #8fa1b3 color5 = #b48ead color6 = #96b5b4 color7 = #E1E1E1 -color8 = #1c2023 +color8 = #919ba0 color9 = #bf616a color10 = #a3be8c color11 = #ebcb8b diff --git a/home/.homepage/index.html b/home/.homepage/index.html index a140e178..ece6a653 100644 --- a/home/.homepage/index.html +++ b/home/.homepage/index.html @@ -20,14 +20,11 @@ Official Website - ArchLabs G+ + ArchLabs Forum ArchLabs Reddit - - ArchLabs Forum - ArchLabs Twitter @@ -70,14 +67,14 @@