]> git.rmz.io Git - dotfiles.git/commitdiff
theme: introduce and use Nord theme
authorSamir Benmendil <me@rmz.io>
Sun, 24 Jan 2021 21:00:20 +0000 (21:00 +0000)
committerSamir Benmendil <me@rmz.io>
Sun, 24 Jan 2021 23:12:39 +0000 (23:12 +0000)
46 files changed:
awesome/themes/nord/background.license [new file with mode: 0644]
awesome/themes/nord/background.png [new file with mode: 0644]
awesome/themes/nord/layouts/cornerne.png [new file with mode: 0644]
awesome/themes/nord/layouts/cornernew.png [new file with mode: 0644]
awesome/themes/nord/layouts/cornernw.png [new file with mode: 0644]
awesome/themes/nord/layouts/cornernww.png [new file with mode: 0644]
awesome/themes/nord/layouts/cornerse.png [new file with mode: 0644]
awesome/themes/nord/layouts/cornersew.png [new file with mode: 0644]
awesome/themes/nord/layouts/cornersw.png [new file with mode: 0644]
awesome/themes/nord/layouts/cornersww.png [new file with mode: 0644]
awesome/themes/nord/layouts/dwindle.png [new file with mode: 0644]
awesome/themes/nord/layouts/dwindlew.png [new file with mode: 0644]
awesome/themes/nord/layouts/fairh.png [new file with mode: 0644]
awesome/themes/nord/layouts/fairhw.png [new file with mode: 0644]
awesome/themes/nord/layouts/fairv.png [new file with mode: 0644]
awesome/themes/nord/layouts/fairvw.png [new file with mode: 0644]
awesome/themes/nord/layouts/floating.png [new file with mode: 0644]
awesome/themes/nord/layouts/floatingw.png [new file with mode: 0644]
awesome/themes/nord/layouts/fullscreen.png [new file with mode: 0644]
awesome/themes/nord/layouts/fullscreenw.png [new file with mode: 0644]
awesome/themes/nord/layouts/magnifier.png [new file with mode: 0644]
awesome/themes/nord/layouts/magnifierw.png [new file with mode: 0644]
awesome/themes/nord/layouts/max.png [new file with mode: 0644]
awesome/themes/nord/layouts/maxw.png [new file with mode: 0644]
awesome/themes/nord/layouts/spiral.png [new file with mode: 0644]
awesome/themes/nord/layouts/spiralw.png [new file with mode: 0644]
awesome/themes/nord/layouts/tile.png [new file with mode: 0644]
awesome/themes/nord/layouts/tilebottom.png [new file with mode: 0644]
awesome/themes/nord/layouts/tilebottomw.png [new file with mode: 0644]
awesome/themes/nord/layouts/tileleft.png [new file with mode: 0644]
awesome/themes/nord/layouts/tileleftw.png [new file with mode: 0644]
awesome/themes/nord/layouts/tiletop.png [new file with mode: 0644]
awesome/themes/nord/layouts/tiletopw.png [new file with mode: 0644]
awesome/themes/nord/layouts/tilew.png [new file with mode: 0644]
awesome/themes/nord/mpd_default_album.license [new file with mode: 0644]
awesome/themes/nord/mpd_default_album.png [new file with mode: 0644]
awesome/themes/nord/submenu.png [new file with mode: 0644]
awesome/themes/nord/theme.lua [new file with mode: 0644]
kitty/colors/nord.conf [new file with mode: 0644]
kitty/kitty.conf
vim/vimrc
xinit/Xresources
xinit/Xresources.d/colors_gruvbox [new file with mode: 0644]
xinit/Xresources.d/colors_nord [new file with mode: 0644]
xinitrc
zshenv

diff --git a/awesome/themes/nord/background.license b/awesome/themes/nord/background.license
new file mode 100644 (file)
index 0000000..a651e75
--- /dev/null
@@ -0,0 +1,2 @@
+bionicdna / Unspecified
+https://www.reddit.com/r/archlinux/comments/bbivwl/nord_theme_1080p_wallpaper/
diff --git a/awesome/themes/nord/background.png b/awesome/themes/nord/background.png
new file mode 100644 (file)
index 0000000..8d79915
Binary files /dev/null and b/awesome/themes/nord/background.png differ
diff --git a/awesome/themes/nord/layouts/cornerne.png b/awesome/themes/nord/layouts/cornerne.png
new file mode 100644 (file)
index 0000000..c85bd56
Binary files /dev/null and b/awesome/themes/nord/layouts/cornerne.png differ
diff --git a/awesome/themes/nord/layouts/cornernew.png b/awesome/themes/nord/layouts/cornernew.png
new file mode 100644 (file)
index 0000000..c3fd986
Binary files /dev/null and b/awesome/themes/nord/layouts/cornernew.png differ
diff --git a/awesome/themes/nord/layouts/cornernw.png b/awesome/themes/nord/layouts/cornernw.png
new file mode 100644 (file)
index 0000000..dfe78b3
Binary files /dev/null and b/awesome/themes/nord/layouts/cornernw.png differ
diff --git a/awesome/themes/nord/layouts/cornernww.png b/awesome/themes/nord/layouts/cornernww.png
new file mode 100644 (file)
index 0000000..f489010
Binary files /dev/null and b/awesome/themes/nord/layouts/cornernww.png differ
diff --git a/awesome/themes/nord/layouts/cornerse.png b/awesome/themes/nord/layouts/cornerse.png
new file mode 100644 (file)
index 0000000..023ae79
Binary files /dev/null and b/awesome/themes/nord/layouts/cornerse.png differ
diff --git a/awesome/themes/nord/layouts/cornersew.png b/awesome/themes/nord/layouts/cornersew.png
new file mode 100644 (file)
index 0000000..f7cfa1c
Binary files /dev/null and b/awesome/themes/nord/layouts/cornersew.png differ
diff --git a/awesome/themes/nord/layouts/cornersw.png b/awesome/themes/nord/layouts/cornersw.png
new file mode 100644 (file)
index 0000000..c1453c9
Binary files /dev/null and b/awesome/themes/nord/layouts/cornersw.png differ
diff --git a/awesome/themes/nord/layouts/cornersww.png b/awesome/themes/nord/layouts/cornersww.png
new file mode 100644 (file)
index 0000000..a65a043
Binary files /dev/null and b/awesome/themes/nord/layouts/cornersww.png differ
diff --git a/awesome/themes/nord/layouts/dwindle.png b/awesome/themes/nord/layouts/dwindle.png
new file mode 100644 (file)
index 0000000..9902d22
Binary files /dev/null and b/awesome/themes/nord/layouts/dwindle.png differ
diff --git a/awesome/themes/nord/layouts/dwindlew.png b/awesome/themes/nord/layouts/dwindlew.png
new file mode 100644 (file)
index 0000000..9199049
Binary files /dev/null and b/awesome/themes/nord/layouts/dwindlew.png differ
diff --git a/awesome/themes/nord/layouts/fairh.png b/awesome/themes/nord/layouts/fairh.png
new file mode 100644 (file)
index 0000000..d41deea
Binary files /dev/null and b/awesome/themes/nord/layouts/fairh.png differ
diff --git a/awesome/themes/nord/layouts/fairhw.png b/awesome/themes/nord/layouts/fairhw.png
new file mode 100644 (file)
index 0000000..bb50e3a
Binary files /dev/null and b/awesome/themes/nord/layouts/fairhw.png differ
diff --git a/awesome/themes/nord/layouts/fairv.png b/awesome/themes/nord/layouts/fairv.png
new file mode 100644 (file)
index 0000000..f5f0288
Binary files /dev/null and b/awesome/themes/nord/layouts/fairv.png differ
diff --git a/awesome/themes/nord/layouts/fairvw.png b/awesome/themes/nord/layouts/fairvw.png
new file mode 100644 (file)
index 0000000..4f4ed52
Binary files /dev/null and b/awesome/themes/nord/layouts/fairvw.png differ
diff --git a/awesome/themes/nord/layouts/floating.png b/awesome/themes/nord/layouts/floating.png
new file mode 100644 (file)
index 0000000..b8061a0
Binary files /dev/null and b/awesome/themes/nord/layouts/floating.png differ
diff --git a/awesome/themes/nord/layouts/floatingw.png b/awesome/themes/nord/layouts/floatingw.png
new file mode 100644 (file)
index 0000000..4815894
Binary files /dev/null and b/awesome/themes/nord/layouts/floatingw.png differ
diff --git a/awesome/themes/nord/layouts/fullscreen.png b/awesome/themes/nord/layouts/fullscreen.png
new file mode 100644 (file)
index 0000000..d02f6fc
Binary files /dev/null and b/awesome/themes/nord/layouts/fullscreen.png differ
diff --git a/awesome/themes/nord/layouts/fullscreenw.png b/awesome/themes/nord/layouts/fullscreenw.png
new file mode 100644 (file)
index 0000000..5c35bfa
Binary files /dev/null and b/awesome/themes/nord/layouts/fullscreenw.png differ
diff --git a/awesome/themes/nord/layouts/magnifier.png b/awesome/themes/nord/layouts/magnifier.png
new file mode 100644 (file)
index 0000000..2925414
Binary files /dev/null and b/awesome/themes/nord/layouts/magnifier.png differ
diff --git a/awesome/themes/nord/layouts/magnifierw.png b/awesome/themes/nord/layouts/magnifierw.png
new file mode 100644 (file)
index 0000000..6209556
Binary files /dev/null and b/awesome/themes/nord/layouts/magnifierw.png differ
diff --git a/awesome/themes/nord/layouts/max.png b/awesome/themes/nord/layouts/max.png
new file mode 100644 (file)
index 0000000..8d20844
Binary files /dev/null and b/awesome/themes/nord/layouts/max.png differ
diff --git a/awesome/themes/nord/layouts/maxw.png b/awesome/themes/nord/layouts/maxw.png
new file mode 100644 (file)
index 0000000..85f5ce3
Binary files /dev/null and b/awesome/themes/nord/layouts/maxw.png differ
diff --git a/awesome/themes/nord/layouts/spiral.png b/awesome/themes/nord/layouts/spiral.png
new file mode 100644 (file)
index 0000000..d9434be
Binary files /dev/null and b/awesome/themes/nord/layouts/spiral.png differ
diff --git a/awesome/themes/nord/layouts/spiralw.png b/awesome/themes/nord/layouts/spiralw.png
new file mode 100644 (file)
index 0000000..b78dd86
Binary files /dev/null and b/awesome/themes/nord/layouts/spiralw.png differ
diff --git a/awesome/themes/nord/layouts/tile.png b/awesome/themes/nord/layouts/tile.png
new file mode 100644 (file)
index 0000000..3ede21e
Binary files /dev/null and b/awesome/themes/nord/layouts/tile.png differ
diff --git a/awesome/themes/nord/layouts/tilebottom.png b/awesome/themes/nord/layouts/tilebottom.png
new file mode 100644 (file)
index 0000000..6f8c257
Binary files /dev/null and b/awesome/themes/nord/layouts/tilebottom.png differ
diff --git a/awesome/themes/nord/layouts/tilebottomw.png b/awesome/themes/nord/layouts/tilebottomw.png
new file mode 100644 (file)
index 0000000..a1de7b2
Binary files /dev/null and b/awesome/themes/nord/layouts/tilebottomw.png differ
diff --git a/awesome/themes/nord/layouts/tileleft.png b/awesome/themes/nord/layouts/tileleft.png
new file mode 100644 (file)
index 0000000..31d6870
Binary files /dev/null and b/awesome/themes/nord/layouts/tileleft.png differ
diff --git a/awesome/themes/nord/layouts/tileleftw.png b/awesome/themes/nord/layouts/tileleftw.png
new file mode 100644 (file)
index 0000000..cf14c25
Binary files /dev/null and b/awesome/themes/nord/layouts/tileleftw.png differ
diff --git a/awesome/themes/nord/layouts/tiletop.png b/awesome/themes/nord/layouts/tiletop.png
new file mode 100644 (file)
index 0000000..98cade2
Binary files /dev/null and b/awesome/themes/nord/layouts/tiletop.png differ
diff --git a/awesome/themes/nord/layouts/tiletopw.png b/awesome/themes/nord/layouts/tiletopw.png
new file mode 100644 (file)
index 0000000..d1d0872
Binary files /dev/null and b/awesome/themes/nord/layouts/tiletopw.png differ
diff --git a/awesome/themes/nord/layouts/tilew.png b/awesome/themes/nord/layouts/tilew.png
new file mode 100644 (file)
index 0000000..fde2ca4
Binary files /dev/null and b/awesome/themes/nord/layouts/tilew.png differ
diff --git a/awesome/themes/nord/mpd_default_album.license b/awesome/themes/nord/mpd_default_album.license
new file mode 100644 (file)
index 0000000..0f652ee
--- /dev/null
@@ -0,0 +1,2 @@
+Fyrsten / CC BY-SA (https://creativecommons.org/licenses/by-sa/3.0)
+https://commons.wikimedia.org/wiki/File:LP_vinyl3.png
diff --git a/awesome/themes/nord/mpd_default_album.png b/awesome/themes/nord/mpd_default_album.png
new file mode 100644 (file)
index 0000000..65de96c
Binary files /dev/null and b/awesome/themes/nord/mpd_default_album.png differ
diff --git a/awesome/themes/nord/submenu.png b/awesome/themes/nord/submenu.png
new file mode 100644 (file)
index 0000000..b2778e2
Binary files /dev/null and b/awesome/themes/nord/submenu.png differ
diff --git a/awesome/themes/nord/theme.lua b/awesome/themes/nord/theme.lua
new file mode 100644 (file)
index 0000000..9614695
--- /dev/null
@@ -0,0 +1,132 @@
+---------------------------
+-- Default awesome theme --
+---------------------------
+
+local theme_assets = require("beautiful.theme_assets")
+local xresources = require("beautiful.xresources")
+local dpi = xresources.apply_dpi
+
+local gfs = require("gears.filesystem")
+local theme_path = require("beautiful").theme_path
+
+local theme = {}
+
+theme.nord0  = "#2E3440"
+theme.nord1  = "#3B4252"
+theme.nord2  = "#434C5E"
+theme.nord3  = "#4C566A"
+theme.nord4  = "#D8DEE9"
+theme.nord5  = "#E5E9F0"
+theme.nord6  = "#ECEFF4"
+theme.nord7  = "#8FBCBB"
+theme.nord8  = "#88C0D0"
+theme.nord9  = "#81A1C1"
+theme.nord10 = "#5E81AC"
+theme.nord11 = "#BF616A"
+theme.nord12 = "#D08770"
+theme.nord13 = "#EBCB8B"
+theme.nord14 = "#A3BE8C"
+theme.nord15 = "#B48EAD"
+
+theme.font          = "Droid Sans 8"
+
+theme.bg_normal     = theme.nord0
+theme.bg_focus      = theme.nord1
+theme.bg_urgent     = theme.bg_normal
+theme.bg_minimize   = theme.bg_normal
+theme.bg_systray    = theme.bg_normal
+
+theme.fg_normal     = theme.nord4
+theme.fg_focus      = theme.fg_normal
+theme.fg_urgent     = theme.fg_normal
+theme.fg_minimize   = theme.fg_normal
+
+theme.useless_gap   = dpi(0)
+theme.border_width  = dpi(5)
+theme.border_normal = theme.nord1
+theme.border_focus  = theme.nord3
+theme.border_marked = theme.nord14
+
+theme.tooltip_fg = theme.fg_normal
+theme.tooltip_bg = theme.bg_normal
+
+-- There are other variable sets
+-- overriding the default one when
+-- defined, the sets are:
+-- taglist_[bg|fg]_[focus|urgent|occupied|empty|volatile]
+-- tasklist_[bg|fg]_[focus|urgent]
+-- titlebar_[bg|fg]_[normal|focus]
+-- tooltip_[font|opacity|fg_color|bg_color|border_width|border_color]
+-- mouse_finder_[color|timeout|animate_timeout|radius|factor]
+-- prompt_[fg|bg|fg_cursor|bg_cursor|font]
+-- hotkeys_[bg|fg|border_width|border_color|shape|opacity|modifiers_fg|label_bg|label_fg|group_margin|font|description_font]
+-- Example:
+theme.taglist_bg_focus = theme.nord3
+
+-- TODO icons
+theme.taglist_icon_only = false
+
+-- Display the taglist squares
+local taglist_square_size = dpi(4)
+theme.taglist_squares_sel = theme_assets.taglist_squares_sel(
+    taglist_square_size, theme.fg_normal
+)
+theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel(
+    taglist_square_size, theme.fg_normal
+)
+
+-- Variables set for theming notifications:
+-- notification_font
+-- notification_[bg|fg]
+-- notification_[width|height|margin]
+-- notification_[border_color|border_width|shape|opacity]
+
+-- Variables set for theming the menu:
+-- menu_[bg|fg]_[normal|focus]
+-- menu_[border_color|border_width]
+theme.menu_submenu_icon = theme_path.."/submenu.png"
+theme.menu_height = dpi(15)
+theme.menu_width  = dpi(100)
+theme.menu_border_width = dpi(2)
+
+-- You can add as many variables as
+-- you wish and access them by using
+-- beautiful.variable in your rc.lua
+--theme.bg_widget = "#cc0000"
+
+-- Define the image to load
+theme.wallpaper = theme_path.."/background.png"
+
+theme.layout_fairh      = theme_path.."/layouts/fairhw.png"
+theme.layout_fairv      = theme_path.."/layouts/fairvw.png"
+theme.layout_floating   = theme_path.."/layouts/floatingw.png"
+theme.layout_magnifier  = theme_path.."/layouts/magnifierw.png"
+theme.layout_max        = theme_path.."/layouts/maxw.png"
+theme.layout_fullscreen = theme_path.."/layouts/fullscreenw.png"
+theme.layout_tilebottom = theme_path.."/layouts/tilebottomw.png"
+theme.layout_tileleft   = theme_path.."/layouts/tileleftw.png"
+theme.layout_tile       = theme_path.."/layouts/tilew.png"
+theme.layout_tiletop    = theme_path.."/layouts/tiletopw.png"
+theme.layout_spiral     = theme_path.."/layouts/spiralw.png"
+theme.layout_dwindle    = theme_path.."/layouts/dwindlew.png"
+theme.layout_cornernw   = theme_path.."/layouts/cornernww.png"
+theme.layout_cornerne   = theme_path.."/layouts/cornernew.png"
+theme.layout_cornersw   = theme_path.."/layouts/cornersww.png"
+theme.layout_cornerse   = theme_path.."/layouts/cornersew.png"
+
+theme = theme_assets.recolor_layout(theme, theme.fg_normal)
+
+-- Generate Awesome icon:
+theme.awesome_icon = theme_assets.awesome_icon(
+    theme.menu_height, theme.bg_focus, theme.fg_focus
+)
+
+theme.mpd_default_album = theme_path.."/mpd_default_album.png"
+
+-- Define the icon theme for application icons. If not set then the icons
+-- from /usr/share/icons and /usr/share/icons/hicolor will be used.
+theme.icon_theme = nil
+
+return theme
+
+-- vim: filetype=lua:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:textwidth=80
diff --git a/kitty/colors/nord.conf b/kitty/colors/nord.conf
new file mode 100644 (file)
index 0000000..fd34e1f
--- /dev/null
@@ -0,0 +1,62 @@
+# vim:fileencoding=utf-8:ft=conf:foldmethod=marker
+
+# Cursor
+cursor                #d8dee9
+cursor_text_color     background
+
+foreground            #d8dee9
+background            #2e3440
+selection_foreground  #2e3440
+selection_background  #d8dee9
+dim_opacity           0.75
+
+background_opacity         1.0
+dynamic_background_opacity no
+
+background_image        none
+background_image_layout tiled
+background_image_linear no
+background_tint         0.0
+
+url_color             #81a1c1
+
+#: Borders TODO
+active_border_color   #00ff00
+inactive_border_color #cccccc
+bell_border_color     #ff5a00
+inactive_text_alpha   1.0
+
+#: Tabs
+active_tab_foreground   #000
+active_tab_background   #eee
+active_tab_font_style   bold-italic
+inactive_tab_foreground #444
+inactive_tab_background #999
+inactive_tab_font_style normal
+tab_bar_background      none
+
+#: Colors
+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
+
+#: Marks TODO
+mark1_foreground      black
+mark1_background      #98d3cb
+mark2_foreground      black
+mark2_background      #f2dcd3
+mark3_foreground      black
+mark3_background      #f274bc
index 9790325d3a119e562c09228bbf9251e044ba6e70..0b89c60fb48d2698121428e039d4743f1519b395 100644 (file)
@@ -140,140 +140,7 @@ active_tab_title_template none
 
 #: Color scheme {{{
 
-foreground #dddddd
-background #000000
-
-#: The foreground and background colors
-
-background_opacity 1.0
-
-#: The opacity of the background. A number between 0 and 1, where 1 is
-#: opaque and 0 is fully transparent.  This will only work if
-#: supported by the OS (for instance, when using a compositor under
-#: X11). Note that it only sets the background color's opacity in
-#: cells that have the same background color as the default terminal
-#: background. This is so that things like the status bar in vim,
-#: powerline prompts, etc. still look good.  But it means that if you
-#: use a color theme with a background color in your editor, it will
-#: not be rendered as transparent.  Instead you should change the
-#: default background color in your kitty config and not use a
-#: background color in the editor color scheme. Or use the escape
-#: codes to set the terminals default colors in a shell script to
-#: launch your editor.  Be aware that using a value less than 1.0 is a
-#: (possibly significant) performance hit.  If you want to dynamically
-#: change transparency of windows set dynamic_background_opacity to
-#: yes (this is off by default as it has a performance cost)
-
-background_image none
-
-#: Path to a background image. Must be in PNG format.
-
-background_image_layout tiled
-
-#: Whether to tile or scale the background image.
-
-background_image_linear no
-
-#: When background image is scaled, whether linear interpolation
-#: should be used.
-
-dynamic_background_opacity no
-
-#: Allow changing of the background_opacity dynamically, using either
-#: keyboard shortcuts (increase_background_opacity and
-#: decrease_background_opacity) or the remote control facility.
-
-background_tint 0.0
-
-#: How much to tint the background image by the background color. The
-#: tint is applied only under the text area, not margin/borders. Makes
-#: it easier to read the text. Tinting is done using the current
-#: background color for each window. This setting applies only if
-#: background_opacity is set and transparent windows are supported or
-#: background_image is set.
-
-dim_opacity 0.75
-
-#: How much to dim text that has the DIM/FAINT attribute set. One
-#: means no dimming and zero means fully dimmed (i.e. invisible).
-
-selection_foreground #000000
-
-#: The foreground for text selected with the mouse. A value of none
-#: means to leave the color unchanged.
-
-selection_background #fffacd
-
-#: The background for text selected with the mouse.
-
-
-#: The 256 terminal colors. There are 8 basic colors, each color has a
-#: dull and bright version, for the first 16 colors. You can set the
-#: remaining 240 colors as color16 to color255.
-
-color0 #000000
-color8 #767676
-
-#: black
-
-color1 #cc0403
-color9 #f2201f
-
-#: red
-
-color2  #19cb00
-color10 #23fd00
-
-#: green
-
-color3  #cecb00
-color11 #fffd00
-
-#: yellow
-
-color4  #0d73cc
-color12 #1a8fff
-
-#: blue
-
-color5  #cb1ed1
-color13 #fd28ff
-
-#: magenta
-
-color6  #0dcdcd
-color14 #14ffff
-
-#: cyan
-
-color7  #dddddd
-color15 #ffffff
-
-#: white
-
-mark1_foreground black
-
-#: Color for marks of type 1
-
-mark1_background #98d3cb
-
-#: Color for marks of type 1 (light steel blue)
-
-mark2_foreground black
-
-#: Color for marks of type 2
-
-mark2_background #f2dcd3
-
-#: Color for marks of type 1 (beige)
-
-mark3_foreground black
-
-#: Color for marks of type 3
-
-mark3_background #f274bc
-
-#: Color for marks of type 1 (violet)
+include colors/nord.conf
 
 #: }}}
 
index 5baddd8823ca11813c3cebad684796a889a496ec..468744b3ed11e805ac8690003f26611707490229 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -62,7 +62,21 @@ Plug 'vim-scripts/yankring.vim'
 Plug 'wincent/loupe'
 
 " colorschemes
-Plug 'morhetz/gruvbox'
+Plug 'morhetz/gruvbox' " {{{2
+let g:gruvbox_contrast_dark  = 'hard'
+let g:gruvbox_contrast_light = 'soft'
+
+Plug 'arcticicestudio/nord-vim' " {{{2
+let g:nord_bold = 1
+let g:nord_italic = 1
+let g:nord_italic_comments = 1
+let g:nord_underline = 1
+let g:nord_uniform_status_lines = 0
+let g:nord_uniform_diff_background = 0
+let g:nord_cursor_line_number_background = 0
+let g:nord_bold_vertical_split_line = 0
+
+"}}}
 
 " snippets
 Plug 'sirver/ultisnips'
@@ -107,11 +121,7 @@ filetype plugin indent on
 " colorscheme {{{1
 syntax on
 set background=dark
-let g:gruvbox_contrast_dark  = 'hard'
-let g:gruvbox_contrast_light = 'soft'
-colorscheme gruvbox
-" override the background to be black
-highligh Normal ctermbg=None
+colorscheme $THEME
 
 " options {{{1
 " moving around, searching and patterns {{{2
index aefcb2b9d769c17bddf0c6f7493969fde6513a1d..2cbeda3782d4fe2240dc3440eac23151b28f0b5c 100644 (file)
@@ -48,33 +48,3 @@ URxvt.keysym.C-S-BackSpace:    perl:aAtt:undo
 URxvt.keysym.C-Up:    font-size:increase
 URxvt.keysym.C-Down:  font-size:decrease
 URxvt.font-size.step: 2
-
-! {{{1 Colours
-*.background:  #000000
-*.foreground:  #f8f8f2
-! Black
-*.color0:      #262729
-*.color8:      #262729
-! Red
-*.color1:      #f92671
-*.color9:      #ff669d
-! Green
-*.color2:      #a6e22e
-*.color10:     #beed5f
-! Yellow
-*.color3:      #fd971f
-*.color11:     #e6db74
-! Blue
-*.color4:      #1692d0
-*.color12:     #66d9ef
-! Magenta
-*.color5:      #9e6ffe
-*.color13:     #df92f6
-! Cyan
-*.color6:      #5e7175
-*.color14:     #a3babf
-! White
-*.color7:      #ffffff
-*.color15:     #ffffff
-! Cursor
-*.cursorColor: #b5d2dd
diff --git a/xinit/Xresources.d/colors_gruvbox b/xinit/Xresources.d/colors_gruvbox
new file mode 100644 (file)
index 0000000..feeb3a8
--- /dev/null
@@ -0,0 +1,32 @@
+! vim:set ft=xdefaults:
+! These were the original colours in my XResources before I switched
+! to Nord, I believe they are gruvbox, but could be something else.
+
+*.background:  #000000
+*.foreground:  #f8f8f2
+! Black
+*.color0:      #262729
+*.color8:      #262729
+! Red
+*.color1:      #f92671
+*.color9:      #ff669d
+! Green
+*.color2:      #a6e22e
+*.color10:     #beed5f
+! Yellow
+*.color3:      #fd971f
+*.color11:     #e6db74
+! Blue
+*.color4:      #1692d0
+*.color12:     #66d9ef
+! Magenta
+*.color5:      #9e6ffe
+*.color13:     #df92f6
+! Cyan
+*.color6:      #5e7175
+*.color14:     #a3babf
+! White
+*.color7:      #ffffff
+*.color15:     #ffffff
+! Cursor
+*.cursorColor: #b5d2dd
diff --git a/xinit/Xresources.d/colors_nord b/xinit/Xresources.d/colors_nord
new file mode 100644 (file)
index 0000000..f8ec9c4
--- /dev/null
@@ -0,0 +1,48 @@
+! vim:set ft=xdefaults:
+! Copyright (c) 2016-present Arctic Ice Studio <development@arcticicestudio.com>
+! Copyright (c) 2016-present Sven Greb <code@svengreb.de>
+
+! Project:    Nord XResources
+! Version:    0.1.0
+! Repository: https://github.com/arcticicestudio/nord-xresources
+! License:    MIT
+
+#define nord0 #2E3440
+#define nord1 #3B4252
+#define nord2 #434C5E
+#define nord3 #4C566A
+#define nord4 #D8DEE9
+#define nord5 #E5E9F0
+#define nord6 #ECEFF4
+#define nord7 #8FBCBB
+#define nord8 #88C0D0
+#define nord9 #81A1C1
+#define nord10 #5E81AC
+#define nord11 #BF616A
+#define nord12 #D08770
+#define nord13 #EBCB8B
+#define nord14 #A3BE8C
+#define nord15 #B48EAD
+
+*.foreground:   nord4
+*.background:   nord0
+*.cursorColor:  nord4
+*fading: 35
+*fadeColor: nord3
+
+*.color0: nord1
+*.color1: nord11
+*.color2: nord14
+*.color3: nord13
+*.color4: nord9
+*.color5: nord15
+*.color6: nord8
+*.color7: nord5
+*.color8: nord3
+*.color9: nord11
+*.color10: nord14
+*.color11: nord13
+*.color12: nord9
+*.color13: nord15
+*.color14: nord7
+*.color15: nord6
diff --git a/xinitrc b/xinitrc
index 9f4e466e155bebc65b4c7a23c19ff66b7a69dfec..3b0bace16819e8631c22468959bfae1317df1ff3 100644 (file)
--- a/xinitrc
+++ b/xinitrc
@@ -34,6 +34,10 @@ if [ -f $userresources_d/$(hostname) ]; then
     xrdb -merge $userresources_d/$(hostname)
 fi
 
+if [ -f $userresources_d/colors_$THEME ]; then
+    xrdb -merge $userresources_d/colors_$THEME
+fi
+
 if [ -f "$usermodmap" ]; then
     xmodmap "$usermodmap"
 fi
diff --git a/zshenv b/zshenv
index ef9cf3dda4c4894e9ce2f8b44b6d53f52e1bbec1..8d5d2778f740fe2332cdef07ba1bcfd461cb17d7 100644 (file)
--- a/zshenv
+++ b/zshenv
@@ -7,7 +7,7 @@ export HOST=$(hostname)
 
 # the default command to open a new terminal
 export TERMINAL=kitty
-export THEME=mlp
+export THEME=nord
 
 # gpg
 export GNUPGHOME="$XDG_CONFIG_HOME/gnupg"