Merge perihelion history into laptop history
This commit is contained in:
commit
ed9ce98810
|
|
@ -0,0 +1,2 @@
|
|||
nvim/plugins/
|
||||
nvim/.netrwhist
|
||||
16
README
16
README
|
|
@ -9,11 +9,23 @@ repository would not properly record my entire system configuration.
|
|||
|
||||
## Programs for which configuration files exist
|
||||
|
||||
* dwm (dynamic window manager)
|
||||
### Programs I use regularly
|
||||
|
||||
* zsh (Z shell)
|
||||
* alacritty
|
||||
* nvim (neovim)
|
||||
* the `river` Wayland compositor
|
||||
* the `foot` terminal emulator
|
||||
|
||||
### Programs I no longer use regularly
|
||||
|
||||
Because I don't use these programs regularly, the configuration files
|
||||
for these might be for an older version of the program, and aren't
|
||||
maintained.
|
||||
|
||||
* dwm (dynamic window manager)
|
||||
* the wallpaper-setting component of feh
|
||||
* xorg x server
|
||||
* alacritty
|
||||
|
||||
## Fair warning
|
||||
|
||||
|
|
|
|||
|
|
@ -159,8 +159,6 @@ font:
|
|||
# If `true`, bold text is drawn using the bright color variants.
|
||||
#draw_bold_text_with_bright_colors: false
|
||||
|
||||
# Colors (base16-espresso)
|
||||
# by Alex Mirrington (https://github.com/alexmirrington)
|
||||
# Colors (Pnevma)
|
||||
colors:
|
||||
bright:
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ pad=10x7 center # optionally append 'center'
|
|||
# alternate-scroll-mode=yes
|
||||
|
||||
[colors]
|
||||
<<<<<<< HEAD
|
||||
alpha=1.0
|
||||
foreground=ffffff
|
||||
background=111217
|
||||
|
|
@ -67,6 +68,27 @@ bright4=7878c3 # bright blue
|
|||
bright5=bf5494 # bright magenta
|
||||
bright6=78aac4 # bright cyan
|
||||
bright7=b0b0b0 # bright white
|
||||
=======
|
||||
# alpha=1.0
|
||||
# foreground=dcdccc
|
||||
# background=111111
|
||||
# regular0=222222 # black
|
||||
# regular1=cc9393 # red
|
||||
# regular2=7f9f7f # green
|
||||
# regular3=d0bf8f # yellow
|
||||
# regular4=6ca0a3 # blue
|
||||
# regular5=dc8cc3 # magenta
|
||||
# regular6=93e0e3 # cyan
|
||||
# regular7=dcdccc # white
|
||||
# bright0=666666 # bright black
|
||||
# bright1=dca3a3 # bright red
|
||||
# bright2=bfebbf # bright green
|
||||
# bright3=f0dfaf # bright yellow
|
||||
# bright4=8cd0d3 # bright blue
|
||||
# bright5=fcace3 # bright magenta
|
||||
# bright6=b3ffff # bright cyan
|
||||
# bright7=ffffff # bright white
|
||||
>>>>>>> 4959b89adae53ffde6fcaf0d2fb7bce7e27057cf
|
||||
# selection-foreground=<inverse foreground/background>
|
||||
# selection-background=<inverse foreground/background>
|
||||
# jump-labels=<regular0> <regular3>
|
||||
|
|
|
|||
|
|
@ -43,6 +43,13 @@ let g:zig_fmt_autosave = 0
|
|||
|
||||
" Plugins
|
||||
" Load plugin manager
|
||||
" Plugin directory should be in XDG_CONFIG_HOME, or in ~/.config if that
|
||||
" variable is unset
|
||||
if $XDG_CONFIG_HOME ==# ""
|
||||
let b:config_prefix="~/.config"
|
||||
else
|
||||
let b:config_prefix=$XDG_CONFIG_HOME
|
||||
endif
|
||||
call plug#begin($XDG_CONFIG_HOME . 'nvim/plugins/')
|
||||
|
||||
" Semantic understanding of languages
|
||||
|
|
@ -58,6 +65,9 @@ Plug 'jakwings/vim-pony'
|
|||
" Pencil, for writing prose
|
||||
Plug 'reedes/vim-pencil'
|
||||
|
||||
" Vim Wiki
|
||||
" Plug 'vimwiki/vimwiki'
|
||||
|
||||
" Colourschemes
|
||||
" Following option should be set on a 256 color
|
||||
" terminal to enable true colour
|
||||
|
|
@ -75,6 +85,7 @@ Plug 'noahfrederick/vim-hemisu'
|
|||
Plug 'ajgrf/sprinkles'
|
||||
Plug 'xero/sourcerer.vim'
|
||||
Plug 'franbach/miramare'
|
||||
Plug 'everard/vim-aurora'
|
||||
" base16 colourscheme set (very large)
|
||||
" Plug 'chriskempson/base16-vim'
|
||||
|
||||
|
|
@ -88,6 +99,7 @@ if $TERM ==# "linux"
|
|||
else
|
||||
set termguicolors
|
||||
endif
|
||||
|
||||
set background=dark
|
||||
syntax on
|
||||
colorscheme srcery
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
Xft.dpi: 120
|
||||
|
||||
Xcursor.theme: Breeze_Snow
|
||||
57
x/.xinitrc
57
x/.xinitrc
|
|
@ -1,57 +0,0 @@
|
|||
#!/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
|
||||
|
|
@ -24,5 +24,5 @@ autoload -U colors && colors
|
|||
# necessary. Without it, the ] from the jobs notifier fails to appear
|
||||
# in boldface. I think that resetting the colours is also resetting
|
||||
# all the character attributes.
|
||||
export PS1="%(1j.%B[%{$fg[green]%}%j%{$reset_color%}%B]%b .)[%{$fg[magenta]%}%m%{$reset_color%}:%{$fg[blue]%}%3~%{$reset_color%}] %# "
|
||||
export PS1="%(1j.%B[%{$fg[green]%}%j%{$reset_color%}%B]%b .)[%{$fg[red]%}%m%{$reset_color%}:%{$fg[blue]%}%3~%{$reset_color%}] %# "
|
||||
export RPS1="%(?..%B%{$fg[red]%}%?%{$reset_color%}%b)"
|
||||
|
|
|
|||
Loading…
Reference in New Issue