Tidied .config

Removed redundencies, such as folders with only one file, or "rc" and "conf"
suffixes.

diff --git a/.config/alacritty b/.config/alacritty
new file mode 100644 (file)
index 0000000..a54f6b9
--- /dev/null
+++ b/.config/alacritty
@@ -0,0 +1,22 @@
+shell: /bin/bash
+
+window:
+  padding:
+    x: 8
+    y: 3
+
+font:
+  normal:
+    family: monospace
+    style: Regular
+  size: 14
+
+cursor:
+  style:
+    shape: Beam 
+  unfocused_hollow: false
+
+key_bindings:
+  - { key: Key0,       mods: Control,  action: ResetFontSize           }
+  - { key: Plus,       mods: Control,  action: IncreaseFontSize        }
+  - { key: Minus,      mods: Control,  action: DecreaseFontSize        }

diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml
deleted file mode 100644 (file)
index a54f6b9..0000000
--- a/.config/alacritty/alacritty.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-shell: /bin/bash
-
-window:
-  padding:
-    x: 8
-    y: 3
-
-font:
-  normal:
-    family: monospace
-    style: Regular
-  size: 14
-
-cursor:
-  style:
-    shape: Beam 
-  unfocused_hollow: false
-
-key_bindings:
-  - { key: Key0,       mods: Control,  action: ResetFontSize           }
-  - { key: Plus,       mods: Control,  action: IncreaseFontSize        }
-  - { key: Minus,      mods: Control,  action: DecreaseFontSize        }

diff --git a/.config/i3 b/.config/i3
new file mode 100755 (executable)
index 0000000..29915bf
--- /dev/null
+++ b/.config/i3
@@ -0,0 +1,183 @@
+# set mod key to super ("windows key")
+set $mod Mod4
+
+# drag floating windows with mouse+mod
+floating_modifier $mod
+
+# volumes
+bindsym $mod+plus                              exec notify-send " $(vol Master 5%+) (+5%)"
+bindsym $mod+minus                             exec notify-send " $(vol Master 5%-) (-5%)"
+bindsym $mod+backslash                 exec notify-send " $(vol Master toggle)"
+bindsym $mod+Shift+plus                        exec notify-send " $(vol Capture 5%+) (+5%)"
+bindsym $mod+Shift+minus               exec notify-send " $(vol Capture 5%-) (-5%)"
+bindsym $mod+Shift+backslash   exec notify-send " $(vol Capture toggle)"
+
+# start a terminal
+bindsym $mod+Return                    exec alacritty --config-file "$XDG_CONFIG_HOME/alacritty"
+bindsym $mod+Shift+Return      exec alacritty --config-file "$XDG_CONFIG_HOME/alacritty" --class "floatTerm"
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# rofi menu
+bindsym $mod+d exec rofi -show run -icon-theme "Papirus" -show-icons
+
+# gaps
+gaps outer 2
+gaps inner 4
+bindsym $mod+bracketright      gaps inner current plus 5
+bindsym $mod+bracketleft       gaps inner current minus 5
+bindsym $mod+BackSpace         gaps inner current set 4
+
+# change focus
+bindsym $mod+h                 focus left
+bindsym $mod+j                 focus down
+bindsym $mod+k                 focus up
+bindsym $mod+l                 focus right
+bindsym $mod+Left              focus left
+bindsym $mod+Down              focus down
+bindsym $mod+Up                        focus up
+bindsym $mod+Right             focus right
+
+# move focused window
+bindsym $mod+Shift+h                   move left
+bindsym $mod+Shift+j                   move down
+bindsym $mod+Shift+k                   move up
+bindsym $mod+Shift+l                   move right
+bindsym $mod+Shift+Left                        move left
+bindsym $mod+Shift+Down                        move down
+bindsym $mod+Shift+Up                  move up
+bindsym $mod+Shift+Right               move right
+
+# split horizontal/vertical orientation
+bindsym $mod+g split h
+bindsym $mod+v split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen toggle
+
+# change container layout 
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# workspaces
+set $ws1 "1: Primary"
+set $ws2 "2:   Browser"
+set $ws3 "3:   Internet"
+set $ws4 "4:   Files"
+set $ws5 "5:   Communication "
+set $ws6 "6:   Terminals"
+set $ws7 "7"
+set $ws8 "8"
+set $ws9 "9"
+set $ws10 "10"
+
+# switch to workspace
+bindsym $mod+1 workspace number $ws1
+bindsym $mod+2 workspace number $ws2
+bindsym $mod+3 workspace number $ws3
+bindsym $mod+4 workspace number $ws4
+bindsym $mod+5 workspace number $ws5
+bindsym $mod+6 workspace number $ws6
+bindsym $mod+7 workspace number $ws7
+bindsym $mod+8 workspace number $ws8
+bindsym $mod+9 workspace number $ws9
+bindsym $mod+0 workspace number $ws10
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace number $ws1
+bindsym $mod+Shift+2 move container to workspace number $ws2
+bindsym $mod+Shift+3 move container to workspace number $ws3
+bindsym $mod+Shift+4 move container to workspace number $ws4
+bindsym $mod+Shift+5 move container to workspace number $ws5
+bindsym $mod+Shift+6 move container to workspace number $ws6
+bindsym $mod+Shift+7 move container to workspace number $ws7
+bindsym $mod+Shift+8 move container to workspace number $ws8
+bindsym $mod+Shift+9 move container to workspace number $ws9
+bindsym $mod+Shift+0 move container to workspace number $ws10
+
+# move workspaces between screens 
+bindsym $mod+p move workspace to output right
+
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+r restart
+
+# resize mode 
+bindsym $mod+r mode "resize"
+mode "resize" {
+        bindsym h                      resize shrink   width   10 px or 10 ppt
+        bindsym j                      resize grow             height  10 px or 10 ppt
+        bindsym k                      resize shrink   height  10 px or 10 ppt
+        bindsym l                      resize grow             width   10 px or 10 ppt
+        bindsym Left           resize shrink   width   10 px or 10 ppt
+        bindsym Down           resize grow             height  10 px or 10 ppt
+        bindsym Up                     resize shrink   height  10 px or 10 ppt
+        bindsym Right          resize grow             width   10 px or 10 ppt
+
+        # exit mode
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+        bindsym $mod+r mode "default"
+}
+
+
+# status bar
+bar {
+       # font
+       font pango:LinLibertine Bold 10
+
+       # applet tray
+       tray_output DVI-D-0
+       
+       # commands
+       i3bar_command i3bar --transparency      
+       status_command i3blocks -c "$XDG_CONFIG_HOME/i3blocks"
+
+       # styling
+       height 25
+       workspace_min_width 80
+       separator_symbol " :||: "
+
+       # colors
+       colors {
+               background      #2f3534b0
+               statusline      #4eb6c4
+               separator       #ed63e1
+
+                                                       #border         background      text
+               focused_workspace       #2f3534c0       #f04d7ac0       #ffffffc0
+               inactive_workspace      #2f3534d0       #222222d0       #888888d0
+               urgent_workspace        #2f343ac0       #2fd6b5c0       #ffffffc0
+               binding_mode            #2f343ac0       #900000c0       #ffffffc0
+       }
+}
+
+# keybinds
+bindsym $mod+x exec i3lock -tefi "$XDG_DATA_HOME/wall.png" 
+bindsym $mod+c exec maim -s ~/capture-$(date +%s).png 
+bindsym $mod+y exec mpv /dev/video0 --no-cache --profile=low-latency --untimed --no-osc --x11-name=webcam
+bindsym $mod+m exec mpv $(xclip -o) --cache=yes 
+bindsym $mod+t exec killall screenkey || screenkey &
+bindsym $mod+b exec brave 
+
+# floating windows
+for_window [class="floatTerm"] floating toggle
+for_window [class="mpv" instance="webcam$"] floating toggle
+for_window [class="Gnome-calculator"] floating enable
+
+# window borders
+font pango:LinLibertine 0
+for_window [class=".*"] border normal 0
+
+                                               #border         background      text            indicator       child border
+client.focused                 #a39c13         #a38c13         #a38c13         #a39c13         #a39c13
+client.unfocused               #316d9b         #316d9b         #316d9b         #316d9b         #316d9b         
+client.focused_inactive        #316d9b         #316d9b         #316d9b         #316d9b         #316d9b         
+client.urgent                  #2f343a         #2f343a         #2f343a         #2f343a         #2f343a

diff --git a/.config/i3/config b/.config/i3/config
deleted file mode 100755 (executable)
index ec57a2a..0000000
--- a/.config/i3/config
+++ /dev/null
@@ -1,183 +0,0 @@
-# set mod key to super ("windows key")
-set $mod Mod4
-
-# drag floating windows with mouse+mod
-floating_modifier $mod
-
-# volumes
-bindsym $mod+plus                              exec notify-send " $(vol Master 5%+) (+5%)"
-bindsym $mod+minus                             exec notify-send " $(vol Master 5%-) (-5%)"
-bindsym $mod+backslash                 exec notify-send " $(vol Master toggle)"
-bindsym $mod+Shift+plus                        exec notify-send " $(vol Capture 5%+) (+5%)"
-bindsym $mod+Shift+minus               exec notify-send " $(vol Capture 5%-) (-5%)"
-bindsym $mod+Shift+backslash   exec notify-send " $(vol Capture toggle)"
-
-# start a terminal
-bindsym $mod+Return                    exec alacritty 
-bindsym $mod+Shift+Return      exec alacritty --class "floatTerm"
-
-# kill focused window
-bindsym $mod+Shift+q kill
-
-# rofi menu
-bindsym $mod+d exec rofi -show run -icon-theme "Papirus" -show-icons
-
-# gaps
-gaps outer 2
-gaps inner 4
-bindsym $mod+bracketright      gaps inner current plus 5
-bindsym $mod+bracketleft       gaps inner current minus 5
-bindsym $mod+BackSpace         gaps inner current set 4
-
-# change focus
-bindsym $mod+h                 focus left
-bindsym $mod+j                 focus down
-bindsym $mod+k                 focus up
-bindsym $mod+l                 focus right
-bindsym $mod+Left              focus left
-bindsym $mod+Down              focus down
-bindsym $mod+Up                        focus up
-bindsym $mod+Right             focus right
-
-# move focused window
-bindsym $mod+Shift+h                   move left
-bindsym $mod+Shift+j                   move down
-bindsym $mod+Shift+k                   move up
-bindsym $mod+Shift+l                   move right
-bindsym $mod+Shift+Left                        move left
-bindsym $mod+Shift+Down                        move down
-bindsym $mod+Shift+Up                  move up
-bindsym $mod+Shift+Right               move right
-
-# split horizontal/vertical orientation
-bindsym $mod+g split h
-bindsym $mod+v split v
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f fullscreen toggle
-
-# change container layout 
-bindsym $mod+s layout stacking
-bindsym $mod+w layout tabbed
-bindsym $mod+e layout toggle split
-
-# toggle tiling / floating
-bindsym $mod+Shift+space floating toggle
-
-# change focus between tiling / floating windows
-bindsym $mod+space focus mode_toggle
-
-# workspaces
-set $ws1 "1: Primary"
-set $ws2 "2:   Browser"
-set $ws3 "3:   Internet"
-set $ws4 "4:   Files"
-set $ws5 "5:   Communication "
-set $ws6 "6:   Terminals"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-set $ws10 "10"
-
-# switch to workspace
-bindsym $mod+1 workspace number $ws1
-bindsym $mod+2 workspace number $ws2
-bindsym $mod+3 workspace number $ws3
-bindsym $mod+4 workspace number $ws4
-bindsym $mod+5 workspace number $ws5
-bindsym $mod+6 workspace number $ws6
-bindsym $mod+7 workspace number $ws7
-bindsym $mod+8 workspace number $ws8
-bindsym $mod+9 workspace number $ws9
-bindsym $mod+0 workspace number $ws10
-
-# move focused container to workspace
-bindsym $mod+Shift+1 move container to workspace number $ws1
-bindsym $mod+Shift+2 move container to workspace number $ws2
-bindsym $mod+Shift+3 move container to workspace number $ws3
-bindsym $mod+Shift+4 move container to workspace number $ws4
-bindsym $mod+Shift+5 move container to workspace number $ws5
-bindsym $mod+Shift+6 move container to workspace number $ws6
-bindsym $mod+Shift+7 move container to workspace number $ws7
-bindsym $mod+Shift+8 move container to workspace number $ws8
-bindsym $mod+Shift+9 move container to workspace number $ws9
-bindsym $mod+Shift+0 move container to workspace number $ws10
-
-# move workspaces between screens 
-bindsym $mod+p move workspace to output right
-
-# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-
-# resize mode 
-bindsym $mod+r mode "resize"
-mode "resize" {
-        bindsym h                      resize shrink   width   10 px or 10 ppt
-        bindsym j                      resize grow             height  10 px or 10 ppt
-        bindsym k                      resize shrink   height  10 px or 10 ppt
-        bindsym l                      resize grow             width   10 px or 10 ppt
-        bindsym Left           resize shrink   width   10 px or 10 ppt
-        bindsym Down           resize grow             height  10 px or 10 ppt
-        bindsym Up                     resize shrink   height  10 px or 10 ppt
-        bindsym Right          resize grow             width   10 px or 10 ppt
-
-        # exit mode
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-        bindsym $mod+r mode "default"
-}
-
-
-# status bar
-bar {
-       # font
-       font pango:LinLibertine Bold 10
-
-       # applet tray
-       tray_output DVI-D-0
-       
-       # commands
-       i3bar_command i3bar --transparency      
-       status_command i3blocks
-
-       # styling
-       height 25
-       workspace_min_width 80
-       separator_symbol " :||: "
-
-       # colors
-       colors {
-               background      #2f3534b0
-               statusline      #4eb6c4
-               separator       #ed63e1
-
-                                                       #border         background      text
-               focused_workspace       #2f3534c0       #f04d7ac0       #ffffffc0
-               inactive_workspace      #2f3534d0       #222222d0       #888888d0
-               urgent_workspace        #2f343ac0       #2fd6b5c0       #ffffffc0
-               binding_mode            #2f343ac0       #900000c0       #ffffffc0
-       }
-}
-
-# keybinds
-bindsym $mod+x exec i3lock -i ~/.config/wall.png -t
-bindsym $mod+c exec maim -s ~/capture-$(date +%s).png 
-bindsym $mod+y exec mpv /dev/video0 --no-cache --profile=low-latency --untimed --no-osc --x11-name=webcam
-bindsym $mod+m exec mpv $(xclip -o) --cache=yes 
-bindsym $mod+t exec killall screenkey || screenkey &
-bindsym $mod+b exec brave 
-
-# floating windows
-for_window [class="floatTerm"] floating toggle
-for_window [class="mpv" instance="webcam$"] floating toggle
-for_window [class="Gnome-calculator"] floating enable
-
-# window borders
-font pango:LinLibertine 0
-for_window [class=".*"] border normal 0
-
-                                               #border         background      text            indicator       child border
-client.focused                 #a39c13         #a38c13         #a38c13         #a39c13         #a39c13
-client.unfocused               #316d9b         #316d9b         #316d9b         #316d9b         #316d9b         
-client.focused_inactive        #316d9b         #316d9b         #316d9b         #316d9b         #316d9b         
-client.urgent                  #2f343a         #2f343a         #2f343a         #2f343a         #2f343a

diff --git a/.config/i3blocks b/.config/i3blocks
new file mode 100644 (file)
index 0000000..0ae279d
--- /dev/null
+++ b/.config/i3blocks
@@ -0,0 +1,57 @@
+[name]
+command=echo $USER@$(hostname)
+label=  
+interval=once
+
+[uptime]
+command=uptime -p
+interval=60
+
+[speaker volume]
+command=vol
+label= 
+interval=10
+
+[mic volume]
+command=vol Capture
+label= 
+interval=10
+
+[memory]
+command=sb-memory
+label= 
+interval=20
+
+[cpu]
+command=sb-cpu -t 5 -l  
+markup=pango
+interval=persist
+
+[temperature]
+command=sb-temperature
+label=  
+interval=10
+
+[bandwidth]
+command=sb-bandwidth -B -s -t 5
+label= 
+markup=pango
+interval=persist
+
+[ip]
+command=hostname -i
+interval=once
+
+[day]
+command=date +%a
+label= 
+interval=once
+
+[date]
+command=date +%d/%m/%y
+interval=once
+
+[time]
+command=date +%T
+label= 
+interval=5

diff --git a/.config/i3blocks/config b/.config/i3blocks/config
deleted file mode 100644 (file)
index 0ae279d..0000000
--- a/.config/i3blocks/config
+++ /dev/null
@@ -1,57 +0,0 @@
-[name]
-command=echo $USER@$(hostname)
-label=  
-interval=once
-
-[uptime]
-command=uptime -p
-interval=60
-
-[speaker volume]
-command=vol
-label= 
-interval=10
-
-[mic volume]
-command=vol Capture
-label= 
-interval=10
-
-[memory]
-command=sb-memory
-label= 
-interval=20
-
-[cpu]
-command=sb-cpu -t 5 -l  
-markup=pango
-interval=persist
-
-[temperature]
-command=sb-temperature
-label=  
-interval=10
-
-[bandwidth]
-command=sb-bandwidth -B -s -t 5
-label= 
-markup=pango
-interval=persist
-
-[ip]
-command=hostname -i
-interval=once
-
-[day]
-command=date +%a
-label= 
-interval=once
-
-[date]
-command=date +%d/%m/%y
-interval=once
-
-[time]
-command=date +%T
-label= 
-interval=5

diff --git a/.config/npm b/.config/npm
new file mode 100644 (file)
index 0000000..f0d7957
--- /dev/null
+++ b/.config/npm
@@ -0,0 +1,2 @@
+prefix         = ${HOME}/.local
+cache          = ${XDG_CACHE_HOME}/npm

diff --git a/.config/npmrc b/.config/npmrc
deleted file mode 100644 (file)
index f0d7957..0000000
--- a/.config/npmrc
+++ /dev/null
@@ -1,2 +0,0 @@
-prefix         = ${HOME}/.local
-cache          = ${XDG_CACHE_HOME}/npm

diff --git a/.config/picom b/.config/picom
new file mode 100644 (file)
index 0000000..1dd9d8e
--- /dev/null
+++ b/.config/picom
@@ -0,0 +1,8 @@
+opacity-rule = [
+       "80:class_g = 'Alacritty'",     
+       "80:class_g = 'floatTerm'",
+       "85:class_g = 'Transmission-gtk'",
+       "85:class_g = 'Rofi'"
+];
+
+shadow = true

diff --git a/.config/picom.conf b/.config/picom.conf
deleted file mode 100644 (file)
index 1dd9d8e..0000000
--- a/.config/picom.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-opacity-rule = [
-       "80:class_g = 'Alacritty'",     
-       "80:class_g = 'floatTerm'",
-       "85:class_g = 'Transmission-gtk'",
-       "85:class_g = 'Rofi'"
-];
-
-shadow = true

diff --git a/.config/python b/.config/python
new file mode 100644 (file)
index 0000000..e026454
--- /dev/null
+++ b/.config/python
@@ -0,0 +1,6 @@
+#!/usr/bin/python
+# run on each Python shell
+
+# disable history
+import readline
+readline.set_auto_history(False)

diff --git a/.config/pythonrc.py b/.config/pythonrc.py
deleted file mode 100644 (file)
index 97f1642..0000000
--- a/.config/pythonrc.py
+++ /dev/null
@@ -1,3 +0,0 @@
-# disable history
-import readline
-readline.set_auto_history(False)

diff --git a/.config/vim b/.config/vim
new file mode 100644 (file)
index 0000000..bdfc211
--- /dev/null
+++ b/.config/vim
@@ -0,0 +1,35 @@
+" use ~/.config/vim, see https://vi.stackexchange.com/a/20067
+set viminfofile=NONE
+set runtimepath+=$XDG_DATA_HOME/vim
+
+" double-tap 'j' to enter normal mode
+inoremap jj <Esc>
+
+" display 
+syntax on
+set number
+set nowrap
+
+" indentation
+set autoindent
+set tabstop=4
+set shiftwidth=4
+
+set incsearch
+set scrolloff=8
+
+" use local modified colorscheme
+colorscheme slate_mod
+
+" allow for creating of PDFs with syntax highlighting, via 'HardcopyPdf'
+" command, see: https://askubuntu.com/a/1177135
+command! -range=% HardcopyPdf <line1>,<line2> hardcopy > %.ps | !ps2pdf %.ps && rm %.ps
+
+" de-clutter
+set noswapfile
+set nobackup
+set noundofile
+
+" recognise custom file extensions
+autocmd        BufNewFile,BufRead *.trf set syntax=nroff
+autocmd BufNewFile,BufRead *.mail set syntax=mail

diff --git a/.config/vim/.gitignore b/.config/vim/.gitignore
deleted file mode 100644 (file)
index ea547e8..0000000
--- a/.config/vim/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-viminfo*

diff --git a/.config/vim/colors/slate_mod.vim b/.config/vim/colors/slate_mod.vim
deleted file mode 100644 (file)
index 821c904..0000000
--- a/.config/vim/colors/slate_mod.vim
+++ /dev/null
@@ -1,56 +0,0 @@
-"%% SiSU Vim color file
-" Slate Maintainer: Ralph Amissah <ralph@amissah.com>
-" (originally looked at desert Hans Fugal <hans@fugal.net> http://hans.fugal.net/vim/colors/desert.vim (2003/05/06)
-:set background=dark
-:highlight clear
-if version > 580
- hi clear
- if exists("syntax_on")
- syntax reset
- endif
-endif
-let colors_name = "slate_mod"
-:hi Normal guifg=White guibg=grey15
-:hi Cursor guibg=khaki guifg=slategrey
-:hi VertSplit guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse
-:hi Folded guibg=black guifg=grey40 ctermfg=grey ctermbg=darkgrey
-:hi FoldColumn guibg=black guifg=grey20 ctermfg=4 ctermbg=7
-:hi IncSearch guifg=green guibg=black cterm=none ctermfg=yellow ctermbg=green
-:hi ModeMsg guifg=goldenrod cterm=none ctermfg=brown
-:hi MoreMsg guifg=SeaGreen ctermfg=darkgreen
-:hi NonText guifg=RoyalBlue guibg=grey15 cterm=bold ctermfg=blue
-:hi Question guifg=springgreen ctermfg=green
-:hi Search guibg=peru guifg=wheat cterm=none ctermfg=grey ctermbg=blue
-:hi SpecialKey guifg=yellowgreen ctermfg=darkgreen
-:hi StatusLine guibg=#c2bfa5 guifg=black gui=none cterm=bold,reverse
-:hi StatusLineNC guibg=#c2bfa5 guifg=grey40 gui=none cterm=reverse
-:hi Title guifg=gold gui=bold cterm=bold ctermfg=yellow
-:hi Statement guifg=CornflowerBlue ctermfg=lightblue
-:hi Visual gui=none guifg=khaki guibg=olivedrab cterm=reverse
-:hi WarningMsg guifg=salmon ctermfg=1
-:hi String guifg=SkyBlue ctermfg=darkcyan
-:hi Comment term=bold ctermfg=11 guifg=grey40
-:hi Constant guifg=#ffa0a0 ctermfg=brown
-:hi Special guifg=darkkhaki ctermfg=brown
-:hi Identifier guifg=salmon ctermfg=red
-:hi Include guifg=red ctermfg=red
-:hi PreProc guifg=red guibg=white ctermfg=red
-:hi Operator guifg=Red ctermfg=Red
-:hi Define guifg=gold gui=bold ctermfg=yellow
-:hi Type guifg=CornflowerBlue ctermfg=2
-:hi Function guifg=navajowhite ctermfg=brown
-:hi Structure guifg=green ctermfg=green
-:hi LineNr guifg=grey50 ctermfg=3
-:hi Ignore guifg=grey40 cterm=bold ctermfg=7
-:hi Todo guifg=orangered guibg=yellow2
-:hi Directory ctermfg=darkcyan
-:hi ErrorMsg cterm=bold guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
-:hi VisualNOS cterm=bold,underline
-:hi WildMenu ctermfg=0 ctermbg=3
-:hi DiffAdd ctermbg=4
-:hi DiffChange ctermbg=5
-:hi DiffDelete cterm=bold ctermfg=4 ctermbg=6
-:hi DiffText cterm=bold ctermbg=1
-:hi Underlined cterm=underline ctermfg=5
-:hi Error guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1
-:hi SpellErrors guifg=White guibg=Red cterm=bold ctermfg=7 ctermbg=1

diff --git a/.config/vim/vimrc b/.config/vim/vimrc
deleted file mode 100644 (file)
index 2ab79e4..0000000
--- a/.config/vim/vimrc
+++ /dev/null
@@ -1,35 +0,0 @@
-" use ~/.config/vim, see https://vi.stackexchange.com/a/20067
-set viminfofile=NONE
-set runtimepath+=$XDG_CONFIG_HOME/vim
-
-" double-tap 'j' to enter normal mode
-inoremap jj <Esc>
-
-" display 
-syntax on
-set number
-set nowrap
-
-" indentation
-set autoindent
-set tabstop=4
-set shiftwidth=4
-
-set incsearch
-set scrolloff=8
-
-" use local modified colorscheme
-colorscheme slate_mod
-
-" allow for creating of PDFs with syntax highlighting, via 'HardcopyPdf'
-" command, see: https://askubuntu.com/a/1177135
-command! -range=% HardcopyPdf <line1>,<line2> hardcopy > %.ps | !ps2pdf %.ps && rm %.ps
-
-" de-clutter
-set noswapfile
-set nobackup
-set noundofile
-
-" recognise custom file extensions
-autocmd        BufNewFile,BufRead *.trf set syntax=nroff
-autocmd BufNewFile,BufRead *.mail set syntax=mail

diff --git a/.config/wget b/.config/wget
new file mode 100644 (file)
index 0000000..97bba88
--- /dev/null
+++ b/.config/wget
@@ -0,0 +1 @@
+hsts-file = ~/.cache/wget-hsts

diff --git a/.config/wgetrc b/.config/wgetrc
deleted file mode 100644 (file)
index 97bba88..0000000
--- a/.config/wgetrc
+++ /dev/null
@@ -1 +0,0 @@
-hsts-file = ~/.cache/wget-hsts

diff --git a/.config/x11 b/.config/x11
new file mode 100755 (executable)
index 0000000..b34e924
--- /dev/null
+++ b/.config/x11
@@ -0,0 +1,23 @@
+#!/bin/sh
+# ~/.config/x11 - run on startx
+
+# error file
+ERRFILE="$XDG_CACHE_HOME/X11/xsession-errors"
+
+# daemons
+picom --config "$XDG_CONFIG_HOME/picom" &
+dunst -conf    "$XDG_CONFIG_HOME/dunst" &
+nm-applet &
+redshift-gtk -c        "$XDG_CONFIG_HOME/redshift" &
+
+# wallpaper
+xwallpaper --zoom "$XDG_DATA_HOME/wall.png"
+
+# pywal theme
+wal -Rn &
+
+# auto-repeat
+xset r rate 300 50
+
+# start i3wm
+i3 -c "$XDG_CONFIG_HOME/i3"

diff --git a/.config/xinitrc b/.config/xinitrc
deleted file mode 100755 (executable)
index 984818c..0000000
--- a/.config/xinitrc
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# ~/.config/xinitrc - run on startx
-
-# error file
-ERRFILE="$XDG_CACHE_HOME/X11/xsession-errors"
-
-# daemons
-picom &
-dunst &
-nm-applet &
-redshift-gtk &
-
-# wallpaper
-xwallpaper --zoom ~/.config/wall.png
-
-# pywal theme
-wal -Rn &
-
-# auto-repeat
-xset r rate 300 50
-
-# start i3wm
-i3

diff --git a/.profile b/.profile
index 3dc79d0..ae63c74 100644 (file)
--- a/.profile
+++ b/.profile
@@ -22,15 +22,15 @@ export XDG_STATE_HOME="$HOME/.local/state"
 export XDG_RUNTIME_DIR="/run/user/$UID"
 
 # config file locations
-export VIMINIT="source $XDG_CONFIG_HOME/vim/vimrc"
-export XINITRC="$XDG_CONFIG_HOME/xinitrc"
+export VIMINIT="source $XDG_CONFIG_HOME/vim"
+export XINITRC="$XDG_CONFIG_HOME/x11"
 export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch"
-export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtkrc"
-export PYTHONSTARTUP="$XDG_CONFIG_HOME/pythonrc.py"
-export WGETRC="$XDG_CONFIG_HOME/wgetrc"
-export MBSYNCRC="$XDG_CONFIG_HOME/mbsync/config"
+export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk"
+export PYTHONSTARTUP="$XDG_CONFIG_HOME/python"
+export WGETRC="$XDG_CONFIG_HOME/wget"
+export MBSYNCRC="$XDG_CONFIG_HOME/mbsync"
 export W3M_DIR="$XDG_CONFIG_HOME/w3m"
-export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npmrc"
+export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm"
 
 # local library locations 
 export GROFF_TMAC_PATH="$HOME/.local/lib/groff"