aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/comm-sel2
-rwxr-xr-xbin/shenv3
-rw-r--r--config/X11/xprofile23
-rw-r--r--config/X11/xresources65
-rw-r--r--config/cwmrc5
-rw-r--r--config/shrc37
-rw-r--r--config/user-dirs.dirs17
-rw-r--r--config/vis/themes/fake256.lua64
-rw-r--r--config/vis/visrc.lua13
-rw-r--r--config/wal/colorschemes/dark/base16-causalagency.json25
-rw-r--r--config/wal/templates/colors-wal-dmenu.h6
-rw-r--r--config/wal/templates/colors.Xresources58
-rw-r--r--config/wal/templates/dunstrc93
-rw-r--r--config/wal/templates/zathurarc35
14 files changed, 204 insertions, 242 deletions
diff --git a/bin/comm-sel b/bin/comm-sel
index 6ef97d9..0021f88 100755
--- a/bin/comm-sel
+++ b/bin/comm-sel
@@ -8,7 +8,7 @@ if command -v st-altscreen>/dev/null; then
fi
case "$(dmenu_path|grep -E "epic5$|cordless|scli$"|dmenu -p "choose chat app:")" in
epic5) $TERMINAL -c comm -e epic5 -l "$XDG_CONFIG_HOME/epic/epicrc" ensa&;;
- cordless) $TERMINAL -c comm -e cordless&;;
+ cordless) $TERMINAL -c comm -e cordless -config-dir "$XDG_CONFIG_HOME/cordless" &;;
scli) $TERMINAL -c comm -e scli&;;
*) return;;
esac
diff --git a/bin/shenv b/bin/shenv
index b9428b8..d37733f 100755
--- a/bin/shenv
+++ b/bin/shenv
@@ -1,6 +1,5 @@
#!/bin/sh
# simply sources the shrc and runs a shell with that as its environment.
# passes through all arguments that sh takes. to be used instead of sh.
-XDG_CONFIG_DIR=${XDG_CONFIG_DIR:="$HOME/.config"}
-. $XDG_CONFIG_DIR/shrc
+. ~/etc/shrc
exec sh "$@"
diff --git a/config/X11/xprofile b/config/X11/xprofile
new file mode 100644
index 0000000..224386b
--- /dev/null
+++ b/config/X11/xprofile
@@ -0,0 +1,23 @@
+#!/bin/sh
+. $HOME/etc/shrc
+# set caps to escape when pressed and super when held
+setxkbmap -option caps:super && xcape -e 'Super_L=Escape'
+# disables the beeper
+xset b off
+# increases kbd repeat on hold
+xset r rate 300 50
+# enables x colorscheme
+xrdb -load $HOME_ETC/X11/xresources
+
+# set background
+xbg &
+# notification daemon
+dunst &
+# mouse vanishes when typing
+unclutter -noevents &
+# activate music daemon
+mpd &
+# and its scrobbler
+mpdas -c $HOME_ETC/mpdasrc &
+# remind user of important tasks
+bother &
diff --git a/config/X11/xresources b/config/X11/xresources
new file mode 100644
index 0000000..1a306bf
--- /dev/null
+++ b/config/X11/xresources
@@ -0,0 +1,65 @@
+! X colors.
+*foreground: #b7a980
+*background: #14130e
+*.foreground: #b7a980
+*.background: #14130e
+
+! Colors 0-15.
+*.color0: #161510
+*color0: #161510
+*.color1: #a32810
+*color1: #a32810
+*.color2: #727a18
+*color2: #727a18
+*.color3: #a37720
+*color3: #a37720
+*.color4: #3d6266
+*color4: #3d6266
+*.color5: #7a4955
+*color5: #7a4955
+*.color6: #557a55
+*color6: #557a55
+*.color7: #8e8463
+*color7: #8e8463
+*.color8: #4c4635
+*color8: #4c4635
+*.color9: #cc3214
+*color9: #cc3214
+*.color10: #8e991e
+*color10: #8e991e
+*.color11: #cc9528
+*color11: #cc9528
+*.color12: #4c7b7f
+*color12: #4c7b7f
+*.color13: #995b6b
+*color13: #995b6b
+*.color14: #6b996b
+*color14: #6b996b
+*.color15: #ccbc8e
+*color15: #ccbc8e
+
+! Black color that will not be affected by bold highlighting.
+*.color66: #161510
+*color66: #161510
+
+! XTerm config.
+XTerm*faceName: Cozette:pixelsize=11
+XTerm*cursorColor: #72694f
+XTerm*scrollBar: false
+XTerm*vt100.Translations: #override \
+ Alt Shift <Key>Y: insert-selection(PRIMARY) \n\
+ Alt Shift <Key>V: insert-selection(CLIPBOARD) \n\
+ Alt Shift <Key>C: copy-selection(CLIPBOARD) \n\
+ Alt <Key> K: scroll-back(1,line) \n\
+ Alt <Key> J: scroll-forw(1,line) \n\
+ Alt <Key> U: scroll-back(1,halfpage) \n\
+ Alt <Key> D: scroll-forw(1,halfpage)
+XTerm*allowMouseOps: false
+XTerm*useClipping: false
+
+! Xclock colors.
+XClock*majorColor: rgba:cc/bc/8e/ff
+XClock*minorColor: rgba:cc/bc/8e/ff
+XClock*hourColor: rgba:cc/bc/8e/ff
+XClock*minuteColor: rgba:cc/bc/8e/ff
+XClock*secondColor: rgba:cc/bc/8e/ff
diff --git a/config/cwmrc b/config/cwmrc
index 34ff841..0ad3a5a 100644
--- a/config/cwmrc
+++ b/config/cwmrc
@@ -3,6 +3,7 @@ gap 13 0 0 0
#enable sticky groups
sticky yes
#autogroup rules
+autogroup 1 XTerm
autogroup 1 St
autogroup 3 mail
autogroup 4 comm
@@ -26,7 +27,7 @@ color selfont "#72694f"
unbind-key all
unbind-mouse all
#program list
-command term st
+command term xterm
command lock slock
#program spawning
#bind-key 4-d dmenu_run
@@ -35,7 +36,7 @@ bind-key 4S-d menu-cmd
bind-key 4C-d menu-window-hidden
bind-key 4-Return terminal
#bind-key 4S-Return "sh -c \"$TERMINAL -c popup"
-bind-key 4-e "sh -c \"$ALTSCR -t nvim -e env TERM=stterm-16color $EDITOR\""
+bind-key 4-e "sh -c \"$TERMINAL -e $EDITOR\""
#bind-key 4S-e "sh -c \"$TERMINAL -t nvim -c popup -e env TERM=stterm-16color $EDITOR"
bind-key 4-w "sh -c \"$BROWSER $HOMEPAGE\""
bind-key 4S-c "sh -c \"$COMM\""
diff --git a/config/shrc b/config/shrc
index 3529cb1..533386f 100644
--- a/config/shrc
+++ b/config/shrc
@@ -1,15 +1,24 @@
#!/bin/sh
# cleaner shell environment than .profile, used with shenv
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_HOME="$HOME/.local/share"
+export HOME_ETC="$HOME/etc"
+export HOME_DATA="$HOME/share"
+export HOME_LOG="$HOME/var/log"
+export HOME_CACHE="$HOME/var/cache"
+export HOME_BIN="$HOME/bin"
+export HOME_EXT="$HOME/local"
+export HOME_EXT_BIN="$HOME_EXT/bin"
+export HOME_EXT_SRC="$HOME_EXT/src"
-export PATH="$HOME/.local/bin:$PATH"
+export XDG_CACHE_HOME="${HOME_CACHE:=$HOME/.cache}"
+export XDG_CONFIG_HOME="${HOME_ETC:=$HOME/.config}"
+export XDG_DATA_HOME="${HOME_DATA:=$HOME/.local/share}"
-export EDITOR="nvim"
+export PATH="$HOME_BIN:$HOME_EXT_BIN:$PATH"
+
+export EDITOR="vise"
export FILE="lf"
export PAGER="less"
-export TERMINAL="st"
+export TERMINAL="xterm"
export ALTSCR="st-altscreen"
export BROWSER="firefox"
export COMM="comm-sel"
@@ -21,6 +30,8 @@ export SCR="maim"
export LOCK="slock"
#less args
export LESS='-iFMRX~ -x2'
+#ircii (and derivatives) ircservers location
+export IRC_SERVERS_FILE="$HOME_DATA/ircservers"
#locale info
export LANGUAGE="en"
export LANG="POSIX.UTF-8"
@@ -30,11 +41,15 @@ export CLICOLOR=1
#todo(1)
export TODO="$HOME/doc/todo"
#ksh
-export ENV="$XDG_CONFIG_HOME/ksh/kshrc"
+export ENV="$HOME_ETC/ksh/kshrc"
#cleanup paths
-export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0"
+export GTK2_RC_FILES="$HOME_ETC/gtk-2.0/gtkrc-2.0"
export LESSHISTFILE="-"
-export GOPATH="$HOME/.local/go"
-export CARGO_HOME="$XDG_DATA_HOME/cargo"
-export MEDNAFEN_HOME="$XDG_CONFIG_HOME/mednafen"
+export GOPATH="$HOME_EXT/go"
+export CARGO_HOME="$HOME_EXT/rust"
+export PYTHONUSERBASE="$HOME_EXT/python"
+export MEDNAFEN_HOME="$HOME_ETC/mednafen"
+export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=$HOME_ETC/java"
+export TERMINFO="$HOME_DATA/terminfo"
+export MAILCAPS="$HOME_ETC/mailcap"
diff --git a/config/user-dirs.dirs b/config/user-dirs.dirs
index a442350..b2cefc6 100644
--- a/config/user-dirs.dirs
+++ b/config/user-dirs.dirs
@@ -1,15 +1,14 @@
-# This file is written by xdg-user-dirs-update
# If you want to change or add directories, just edit the line you're
# interested in. All local changes will be retained on the next run
# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
# absolute path. No other format is supported.
#
-XDG_DESKTOP_DIR="$HOME/"
-XDG_DOWNLOAD_DIR="$HOME/dl"
-XDG_TEMPLATES_DIR="$HOME"
-XDG_PUBLICSHARE_DIR="$HOME/pub"
-XDG_DOCUMENTS_DIR="$HOME/doc"
-XDG_MUSIC_DIR="$HOME/mus"
-XDG_PICTURES_DIR="$HOME/pic"
-XDG_VIDEOS_DIR="$HOME/vid"
+XDG_DESKTOP_DIR="$HOME/share/xdg/dktp"
+XDG_DOWNLOAD_DIR="$HOME/share/xdg/dl"
+XDG_TEMPLATES_DIR="$HOME/share/xdg/tpl"
+XDG_PUBLICSHARE_DIR="$HOME/share/xdg/pub"
+XDG_DOCUMENTS_DIR="$HOME/share/xdg/doc"
+XDG_MUSIC_DIR="$HOME/share/xdg/mus"
+XDG_PICTURES_DIR="$HOME/share/xdg/pic"
+XDG_VIDEOS_DIR="$HOME/share/xdg/vid"
diff --git a/config/vis/themes/fake256.lua b/config/vis/themes/fake256.lua
new file mode 100644
index 0000000..7ed8f71
--- /dev/null
+++ b/config/vis/themes/fake256.lua
@@ -0,0 +1,64 @@
+-- uses 24-bit color values to "trick" vis into using correct colors, based off vim's "zellner"
+local lexers = vis.lexers
+
+local colors = {
+ ['col0'] = '#16150e',
+ ['col1'] = '#a32810',
+ ['col2'] = '#727a18',
+ ['col3'] = '#a37720',
+ ['col4'] = '#3d6266',
+ ['col5'] = '#7a4955',
+ ['col6'] = '#557a55',
+ ['col7'] = '#8e8463',
+ ['col8'] = '#4c4635',
+ ['col9'] = '#cc3214',
+ ['col10'] = '#8e991e',
+ ['col11'] = '#cc9528',
+ ['col12'] = '#4c7b7f',
+ ['col13'] = '#995b6b',
+ ['col14'] = '#6b996b',
+ ['col15'] = '#ccbc8e',
+}
+-- dark
+lexers.STYLE_DEFAULT ='back:default,fore:default' -- hi Normal -- correct
+lexers.STYLE_COMMENT = 'fore:'..colors.col9 -- hi Comment -- correct
+lexers.STYLE_CONSTANT = 'fore:'..colors.col13 -- hi Constant -- correct
+lexers.STYLE_SPECIAL = 'back:'..colors.col5 -- hi Special
+lexers.STYLE_IDENTIFIER = 'fore:default' -- hi Identifier -- correct
+lexers.STYLE_STATEMENT = 'fore:'..colors.col1 -- hi Statementa -- correct
+lexers.STYLE_PREPROCESSOR = 'fore:'..colors.col5 -- hi PreProc
+lexers.STYLE_TYPE = 'fore:'..colors.col12 -- hi Type -- correct
+lexers.STYLE_SELECTION = 'reverse' -- hi Visual
+lexers.STYLE_TAG = 'fore:'..colors.col2 -- hi Tag
+lexers.STYLE_ERROR = 'back:'..colors.col1..',fore:default,italics' -- hi Error
+lexers.STYLE_STATUS = 'back:default,fore:'..colors.col4..',reverse' -- hi StatusLineNC
+lexers.STYLE_STATUS_FOCUSED = lexers.STYLE_STATUS..',bold' -- hi StatusLine
+lexers.STYLE_NOTHING = 'back:default' -- hi Ignore
+lexers.STYLE_DEFINITION = 'fore:'..colors.col4 --
+lexers.STYLE_REGEX = 'fore:'..colors.col2 --
+lexers.STYLE_WHITESPACE = '' -- hi Whitespace
+lexers.STYLE_OPERATOR = lexers.STYLE_DEFAULT
+
+lexers.STYLE_FUNCTION = lexers.STYLE_DEFAULT
+lexers.STYLE_LINENUMBER = 'fore:default' -- hi LineNr
+lexers.STYLE_LINENUMBER_CURSOR = lexers.STYLE_LINENUMBER -- hi CursorLineNr
+lexers.STYLE_CURSOR = 'reverse' -- hi Cursor
+lexers.STYLE_CURSOR_PRIMARY = lexers.STYLE_CURSOR..',fore:yellow' --
+lexers.STYLE_CURSOR_LINE = 'underlined' -- hi CursorLine
+lexers.STYLE_COLOR_COLUMN = 'back:'..colors.col1 -- hi CursorColumn
+lexers.STYLE_SEPARATOR = lexers.STYLE_DEFAULT --
+lexers.STYLE_INFO = lexers.STYLE_DEFAULT..',bold' --
+lexers.STYLE_EOF = '' --
+
+-- links
+lexers.STYLE_STRING = lexers.STYLE_CONSTANT
+lexers.STYLE_NUMBER = lexers.STYLE_CONSTANT
+
+lexers.STYLE_VARIABLE = lexers.STYLE_IDENTIFIER
+
+lexers.STYLE_LABEL = lexers.STYLE_STATEMENT
+lexers.STYLE_KEYWORD = lexers.STYLE_STATEMENT
+
+lexers.STYLE_EMBEDDED = lexers.STYLE_SPECIAL
+
+lexers.STYLE_CLASS = lexers.STYLE_TYPE
diff --git a/config/vis/visrc.lua b/config/vis/visrc.lua
new file mode 100644
index 0000000..b194feb
--- /dev/null
+++ b/config/vis/visrc.lua
@@ -0,0 +1,13 @@
+-- load standard vis module, providing parts of the Lua API
+require('vis')
+
+vis.events.subscribe(vis.events.INIT, function()
+ -- Your global configuration options
+ vis:command('set change-256colors off')
+ vis:command('set theme fake256')
+end)
+
+vis.events.subscribe(vis.events.WIN_OPEN, function(win)
+ -- Your per window configuration options e.g.
+ -- vis:command('set number')
+end)
diff --git a/config/wal/colorschemes/dark/base16-causalagency.json b/config/wal/colorschemes/dark/base16-causalagency.json
deleted file mode 100644
index 8b21dfd..0000000
--- a/config/wal/colorschemes/dark/base16-causalagency.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
- "special": {
- "background": "#14130e",
- "foreground": "#b7a980",
- "cursor": "#72694f"
- },
- "colors": {
- "color0": "#161510",
- "color1": "#a32810",
- "color2": "#727a18",
- "color3": "#a37720",
- "color4": "#3d6266",
- "color5": "#7a4955",
- "color6": "#557a55",
- "color7": "#8e8463",
- "color8": "#4c4635",
- "color9": "#cc3214",
- "color10": "#8e991e",
- "color11": "#cc9528",
- "color12": "#4c7b7f",
- "color13": "#995b6b",
- "color14": "#6b996b",
- "color15": "#ccbc8e"
- }
-}
diff --git a/config/wal/templates/colors-wal-dmenu.h b/config/wal/templates/colors-wal-dmenu.h
deleted file mode 100644
index d139d56..0000000
--- a/config/wal/templates/colors-wal-dmenu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-static const char *colors[SchemeLast][2] = {{
- /* fg bg */
- [SchemeNorm] = {{ "{color4}", "{color0}" }},
- [SchemeSel] = {{ "{color1}", "{color0}" }},
- [SchemeOut] = {{ "{color13}", "{color8}" }},
-}};
diff --git a/config/wal/templates/colors.Xresources b/config/wal/templates/colors.Xresources
deleted file mode 100644
index 480c104..0000000
--- a/config/wal/templates/colors.Xresources
+++ /dev/null
@@ -1,58 +0,0 @@
-! X colors.
-! Generated by 'wal'
-*foreground: {foreground}
-*background: {background}
-*.foreground: {foreground}
-*.background: {background}
-*cursorColor: {cursor}
-*.cursorColor: {cursor}
-XTerm*foreground: {foreground}
-XTerm*background: {background}
-XTerm*cursorColor: {cursor}
-
-! Colors 0-15.
-*.color0: {color0}
-*color0: {color0}
-*.color1: {color1}
-*color1: {color1}
-*.color2: {color2}
-*color2: {color2}
-*.color3: {color3}
-*color3: {color3}
-*.color4: {color4}
-*color4: {color4}
-*.color5: {color5}
-*color5: {color5}
-*.color6: {color6}
-*color6: {color6}
-*.color7: {color7}
-*color7: {color7}
-*.color8: {color8}
-*color8: {color8}
-*.color9: {color9}
-*color9: {color9}
-*.color10: {color10}
-*color10: {color10}
-*.color11: {color11}
-*color11: {color11}
-*.color12: {color12}
-*color12: {color12}
-*.color13: {color13}
-*color13: {color13}
-*.color14: {color14}
-*color14: {color14}
-*.color15: {color15}
-*color15: {color15}
-
-! Black color that will not be affected by bold highlighting.
-*.color66: {color0}
-*color66: {color0}
-
-! Xclock colors.
-XClock*foreground: {foreground}
-XClock*background: {background}
-XClock*majorColor: rgba:{color15.xrgba}
-XClock*minorColor: rgba:{color15.xrgba}
-XClock*hourColor: rgba:{color15.xrgba}
-XClock*minuteColor: rgba:{color15.xrgba}
-XClock*secondColor: rgba:{color15.xrgba}
diff --git a/config/wal/templates/dunstrc b/config/wal/templates/dunstrc
deleted file mode 100644
index 39a9a5e..0000000
--- a/config/wal/templates/dunstrc
+++ /dev/null
@@ -1,93 +0,0 @@
-[colors]
- background = "{color8}"
- foreground = "{color15}"
-
-[global]
- ### Display ###
-
- monitor = 0
- follow = mouse
-
- geometry = "540x5-10+32"
- indicate_hidden = yes
- shrink = yes
- transparency = 0
- notification_height = 0
- separator_height = 3
- padding = 12
- horizontal_padding = 12
- frame_width = 3
-
- frame_color = "{color10}"
- separator_color = auto
- sort = yes
- idle_threshold = 120
-
- ### Text ###
- font = Cozette Medium 8
- line_height = 0
-
- markup = full
-
- # The format of the message. Possible variables are:
- # %a appname
- # %s summary
- # %b body
- # %i iconname (including its path)
- # %I iconname (without its path)
- # %p progress value if set ([ 0%] to [100%]) or nothing
- # %n progress value if set without any extra characters
- # %% Literal %
- # Markup is allowed
- format = "<b>%s </b>\n%b"
- alignment = left
- show_age_threshold = 60
- word_wrap = yes
- ellipsize = middle
- ignore_newline = no
- stack_duplicates = true
- hide_duplicate_count = false
- show_indicators = yes
-
- ### Icons ###
- icon_position = left
- max_icon_size = 64
- icon_path = /usr/local/share/icons/Adwaita/16x16/status/:/usr/local/share/icons/Adwaita/16x16/devices/
-
- ### History ###
- sticky_history = yes
- history_length = 20
-
- ### Misc/Advanced ###
- dmenu = /usr/local/bin/dmenu -p dunst:
- browser = /usr/local/bin/firefox -new-tab
- always_run_script = true
- title = Dunst
- class = Dunst
- startup_notification = false
- force_xinerama = false
-
-[experimental]
- per_monitor_dpi = false
-
-[shortcuts]
- close = ctrl+space
- close_all = ctrl+shift+space
- context = ctrl+shift+period
-
-[urgency_low]
- background = colors.background
- foreground = colors.foreground
- timeout = 10
-
-[urgency_normal]
- background = colors.background
- foreground = colors.foreground
- timeout = 10
-
-[urgency_critical]
- background = colors.background
- foreground = colors.foreground
- frame_color = "{color9}"
- timeout = 0
-# vim: ft=cfg
diff --git a/config/wal/templates/zathurarc b/config/wal/templates/zathurarc
deleted file mode 100644
index 558b341..0000000
--- a/config/wal/templates/zathurarc
+++ /dev/null
@@ -1,35 +0,0 @@
-# actual zathura config
-set recolor "true"
-
-set completion-bg "{color0}"
-set completion-fg "{color15}"
-set completion-group-bg "{color0}"
-set completion-group-fg "{color2}"
-set completion-highlight-bg "{color15}"
-set completion-highlight-fg "{color0}"
-
-set recolor-lightcolor "{color0}"
-set recolor-darkcolor "{color15}"
-set default-bg "{color0}"
-
-set inputbar-bg "{color0}"
-set inputbar-fg "{color15}"
-set notification-bg "{color0}"
-set notification-fg "{color15}"
-set notification-error-bg "{color1}"
-set notification-error-fg "{color15}"
-set notification-warning-bg "{color1}"
-set notification-warning-fg "{color15}"
-set statusbar-bg "{color0}"
-set statusbar-fg "{color15}"
-set index-bg "{color0}"
-set index-fg "{color15}"
-set index-active-bg "{color15}"
-set index-active-fg "{color0}"
-set render-loading-bg "{color0}"
-set render-loading-fg "{color15}"
-
-set window-title-home-tilde true
-set statusbar-basename true
-set selection-clipboard clipboard
-set font "Cozette 10"