Merge branch 'trunk' of gitlab.com:C-Ren/config into trunk

alacritty.yml

@@ -96,7 +96,7 @@ font:
     #   - (macOS) Menlo
     #   - (Linux/BSD) monospace
     #   - (Windows) Consolas
-    family: Rec Mono Duotone
+    # family: Rec Mono Duotone
 
     # The `style` can be specified to pick a specific face.
     style: Regular
@@ -161,41 +161,35 @@ font:
 
 # Colors (base16-espresso)
 # by Alex Mirrington (https://github.com/alexmirrington)
+# Colors (Pnevma)
 colors:
-  # Default colors
-  primary:
-    background: '0x2d2d2d'
-    foreground: '0xcccccc'
-
-  # Colors the cursor will use if `custom_cursor_colors` is true
-  cursor:
-    text: '0x2d2d2d'
-    cursor: '0xcccccc'
-
-  # Normal colors
-  normal:
-    black:   '0x2d2d2d'
-    red:     '0xd25252'
-    green:   '0xa5c261'
-    yellow:  '0xffc66d'
-    blue:    '0x6c99bb'
-    magenta: '0xd197d9'
-    cyan:    '0xbed6ff'
-    white:   '0xcccccc'
-
-  # Bright colors
   bright:
-    black:   '0x777777'
-    red:     '0xf9a959'
-    green:   '0x393939'
-    yellow:  '0x515151'
-    blue:    '0xb4b7b4'
-    magenta: '0xe0e0e0'
-    cyan:    '0xf97394'
-    white:   '0xffffff'
-
-draw_bold_text_with_bright_colors: false
-
+    black: '#4a4845'
+    blue: '#a1bdce'
+    cyan: '#b1e7dd'
+    green: '#afbea2'
+    magenta: '#d7beda'
+    red: '#d78787'
+    white: '#efefef'
+    yellow: '#e4c9af'
+  cursor:
+    cursor: '#e4c9af'
+    text: '#000000'
+  normal:
+    black: '#2f2e2d'
+    blue: '#7fa5bd'
+    cyan: '#8adbb4'
+    green: '#90a57d'
+    magenta: '#c79ec4'
+    red: '#a36666'
+    white: '#d0d0d0'
+    yellow: '#d7af87'
+  primary:
+    background: '#1c1c1c'
+    foreground: '#d0d0d0'
+  selection:
+    background: '#4d4d4d'
+    text: '#ffffff'
     # Bright and dim foreground colors
     #
     # The dimmed foreground color is calculated automatically if it is not present.

nvim/init.vim

@@ -92,8 +92,7 @@ if $TERM ==# "linux"
 else
     set termguicolors
 endif
-set background=light
-colorscheme aurora
 
-" Rob Pike says that syntax highlighting is juvenile so it must be true
+set background=dark
 syntax off
+colorscheme sourcerer

x/.Xresources

@@ -0,0 +1,3 @@
+Xft.dpi: 120
+
+Xcursor.theme: Breeze_Snow

x/.xinitrc

@@ -0,0 +1,57 @@
+#!/bin/sh
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge xresources and modmaps to xrdb
+
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# run setxkbmap to set the keyboard layout to GB (there should be a way to configure this global but it doesn't work)
+
+setxkbmap -layout gb
+
+# restore wallpaper by running script generated by feh when it set the wallpaper
+
+~/.fehbg
+
+# run the compositor, primarily to prevent screen tearing
+# picom looks first for its configuration file in `$XDG_CONFIG_HOME/picom.conf`
+# (see man page for more details)
+
+picom -b
+
+# start some nice programs suggested by Xorg
+
+if [ -d /etc/X11/xinit/xinitrc.d ] ; then
+    for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
+	[ -x "$f" ] && . "$f"
+    done
+    unset f
+fi
+
+# use pointy cursor with bspwm (by default bspwm uses the x-shaped one)
+
+xsetroot -cursor_name left_ptr
+
+# run sxhkd for bspwm
+
+sxhkd &
+
+exec bspwm

zsh/zshrc

@@ -14,8 +14,8 @@ setopt CORRECT
 
 # Aliases
 alias ls="ls --color=auto"
-alias swirc="swirc -r cren -u cren -n cren"
 alias gcc="gcc -Wall"
+alias catgirl="catgirl -u cren"
 
 # Prompt
 # Load colour module for marking up prompt