FreeBSD support: beginning.
Ambrevar
parent
6919cb799e
commit
9bf2bf4f8a
|
|
@ -1,8 +1,13 @@
|
|||
--------------------------------------------------------------------------------
|
||||
-- Awesome configuration
|
||||
-- Date 2012-06-21
|
||||
-- Date 2012-10-28
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
-- Get OS
|
||||
local f = io.popen("uname")
|
||||
local ostype = f:read("*a")
|
||||
f:close()
|
||||
|
||||
-- Standard awesome library
|
||||
require("awful")
|
||||
require("awful.autofocus")
|
||||
|
|
@ -15,10 +20,16 @@ require("beautiful")
|
|||
require("naughty")
|
||||
|
||||
-- Widget library
|
||||
--naughty.notify({ preset = naughty.config.presets.critical,
|
||||
-- title = "aze",
|
||||
-- text = err })
|
||||
|
||||
if ostype == "Linux" then
|
||||
vicious = require("vicious")
|
||||
end
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
-- {{{ Error handling
|
||||
-- Error handling
|
||||
--------------------------------------------------------------------------------
|
||||
-- Check if awesome encountered an error during startup and fell back to
|
||||
-- another config (This code will only ever execute for the fallback config)
|
||||
|
|
@ -42,10 +53,6 @@ do
|
|||
in_error = false
|
||||
end)
|
||||
end
|
||||
-- }}}
|
||||
|
||||
|
||||
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
-- Themes define colours, icons, and wallpapers
|
||||
|
|
@ -55,6 +62,9 @@ end
|
|||
beautiful.init(awful.util.getdir("config") .. "/themes/custom/theme.lua")
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
-- Misc
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
-- Default modkey.
|
||||
-- Usually, Mod4 is the key with a logo between Control and Alt.
|
||||
-- If you do not like this or do not have such a key,
|
||||
|
|
@ -63,37 +73,27 @@ beautiful.init(awful.util.getdir("config") .. "/themes/custom/theme.lua")
|
|||
modkey = "Mod4"
|
||||
|
||||
-- Table of layouts to cover with awful.layout.inc, order matters.
|
||||
layouts =
|
||||
{
|
||||
layouts = {
|
||||
awful.layout.suit.tile,
|
||||
awful.layout.suit.tile.left,
|
||||
awful.layout.suit.tile.bottom,
|
||||
awful.layout.suit.tile.top,
|
||||
-- awful.layout.suit.fair,
|
||||
-- awful.layout.suit.fair.horizontal,
|
||||
-- awful.layout.suit.spiral,
|
||||
-- awful.layout.suit.spiral.dwindle,
|
||||
awful.layout.suit.max,
|
||||
awful.layout.suit.max.fullscreen,
|
||||
-- awful.layout.suit.magnifier,
|
||||
awful.layout.suit.floating
|
||||
}
|
||||
-- }}}
|
||||
|
||||
-- {{{ Tags
|
||||
-- Tags
|
||||
-- Define a tag table which hold all screen tags.
|
||||
tags = {}
|
||||
for s = 1, screen.count() do
|
||||
-- Each screen has its own tag table.
|
||||
-- tags[s] = awful.tag({ 1, 2, 3, 4, 5, 6, 7, 8, 9 }, s, layouts[1])
|
||||
-- tags[s] = awful.tag({ " 1 ", " 2 "," 3 "," 4 ", " 5. Factory ", " 6. Music ", "7. Mail " }, s, layouts[1])
|
||||
tags[s] = awful.tag({ " 1 ", " 2 "," 3 "," 4 ", " 5 ⚒ ", " 6 ♫ ", "7 ✉ " }, s, layouts[1])
|
||||
end
|
||||
-- }}}
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
-- {{{ Wibox
|
||||
-- Wibox
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
-- Separator
|
||||
separator = " | "
|
||||
|
|
@ -106,13 +106,18 @@ layouts =
|
|||
-- Clock
|
||||
clockwidget = awful.widget.textclock({ align = "right" })
|
||||
|
||||
-- CPU
|
||||
cpuwidget = widget({ type = "textbox" })
|
||||
netwidget = widget({ type = "textbox" })
|
||||
volmwidget = widget({ type = "textbox" })
|
||||
batwidget = widget({ type = "textbox" })
|
||||
|
||||
if ostype == "Linux" then
|
||||
|
||||
-- CPU
|
||||
vicious.register(cpuwidget, vicious.widgets.cpu, separator .. '<span color="#CC8F52">CPU $1%</span>')
|
||||
|
||||
-- Net
|
||||
netwidget = widget({ type = "textbox" })
|
||||
networks = { "eth0", "wlan0" }
|
||||
local networks = { "eth0", "wlan0" }
|
||||
vicious.register(netwidget, vicious.widgets.net,
|
||||
function (widget, args)
|
||||
for _,device in pairs(networks) do
|
||||
|
|
@ -124,7 +129,6 @@ layouts =
|
|||
end, 3)
|
||||
|
||||
-- Volume
|
||||
volmwidget = widget({ type = "textbox" })
|
||||
vicious.register(volmwidget, vicious.widgets.volume, separator .. "Master $1% $2 ", 1, "Master")
|
||||
-- PCM may not be available all the time on every machine. If PCM is toggled
|
||||
-- after awesome has been started, you'll need to reload the configuration.
|
||||
|
|
@ -138,7 +142,6 @@ layouts =
|
|||
volpf:close()
|
||||
|
||||
-- Battery
|
||||
batwidget = widget({ type = "textbox" })
|
||||
local batf = io.popen("ls '/sys/class/power_supply' 2>/dev/null")
|
||||
local batl = batf:read("*a")
|
||||
local batlimit = 10
|
||||
|
|
@ -163,6 +166,7 @@ layouts =
|
|||
60, "BAT0")
|
||||
end
|
||||
batf:close()
|
||||
end
|
||||
|
||||
-- Create a wibox for each screen and add it
|
||||
mywibox = {}
|
||||
|
|
@ -177,9 +181,11 @@ layouts =
|
|||
awful.button({ }, 4, awful.tag.viewnext),
|
||||
awful.button({ }, 5, awful.tag.viewprev)
|
||||
)
|
||||
|
||||
mytasklist = {}
|
||||
mytasklist.buttons = awful.util.table.join(
|
||||
awful.button({ }, 1, function (c)
|
||||
awful.button({ }, 1,
|
||||
function (c)
|
||||
if c == client.focus then
|
||||
c.minimized = true
|
||||
else
|
||||
|
|
@ -192,7 +198,9 @@ layouts =
|
|||
c:raise()
|
||||
end
|
||||
end),
|
||||
awful.button({ }, 3, function ()
|
||||
|
||||
awful.button({ }, 3,
|
||||
function ()
|
||||
if instance then
|
||||
instance:hide()
|
||||
instance = nil
|
||||
|
|
@ -200,11 +208,15 @@ layouts =
|
|||
instance = awful.menu.clients({ width=250 })
|
||||
end
|
||||
end),
|
||||
awful.button({ }, 4, function ()
|
||||
|
||||
awful.button({ }, 4,
|
||||
function ()
|
||||
awful.client.focus.byidx(1)
|
||||
if client.focus then client.focus:raise() end
|
||||
end),
|
||||
awful.button({ }, 5, function ()
|
||||
|
||||
awful.button({ }, 5,
|
||||
function ()
|
||||
awful.client.focus.byidx(-1)
|
||||
if client.focus then client.focus:raise() end
|
||||
end))
|
||||
|
|
@ -212,6 +224,7 @@ layouts =
|
|||
for s = 1, screen.count() do
|
||||
-- Create a promptbox for each screen
|
||||
mypromptbox[s] = awful.widget.prompt({ layout = awful.widget.layout.horizontal.leftright })
|
||||
|
||||
-- Create an imagebox widget which will contains an icon indicating which layout we're using.
|
||||
-- We need one layoutbox per screen.
|
||||
mylayoutbox[s] = awful.widget.layoutbox(s)
|
||||
|
|
@ -250,7 +263,6 @@ layouts =
|
|||
layout = awful.widget.layout.horizontal.rightleft
|
||||
}
|
||||
end
|
||||
-- }}}
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
-- CUSTOM
|
||||
|
|
@ -479,6 +491,7 @@ layouts =
|
|||
awful.tag.viewonly(tags[screen][i])
|
||||
end
|
||||
end),
|
||||
|
||||
awful.key({ modkey, "Control" }, "#" .. i + 9,
|
||||
function ()
|
||||
local screen = mouse.screen
|
||||
|
|
@ -486,6 +499,7 @@ layouts =
|
|||
awful.tag.viewtoggle(tags[screen][i])
|
||||
end
|
||||
end),
|
||||
|
||||
awful.key({ modkey, "Mod1" }, "#" .. i + 9,
|
||||
function ()
|
||||
if client.focus and tags[client.focus.screen][i] then
|
||||
|
|
@ -508,10 +522,11 @@ layouts =
|
|||
|
||||
-- Set keys
|
||||
root.keys(globalkeys)
|
||||
-- }}}
|
||||
|
||||
--------------------------------------------------------------------------------
|
||||
-- {{{ Rules
|
||||
-- Rules
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
awful.rules.rules = {
|
||||
-- All clients will match this rule.
|
||||
{ rule = { },
|
||||
|
|
@ -547,9 +562,11 @@ layouts =
|
|||
properties = { tag = tags[1][7] } },
|
||||
|
||||
}
|
||||
-- }}}
|
||||
|
||||
-- {{{ Signals
|
||||
--------------------------------------------------------------------------------
|
||||
-- Signals
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
-- Signal function to execute when a new client appears.
|
||||
client.add_signal("manage", function (c, startup)
|
||||
-- Add a titlebar
|
||||
|
|
@ -578,4 +595,3 @@ layouts =
|
|||
|
||||
client.add_signal("focus", function(c) c.border_color = beautiful.border_focus end)
|
||||
client.add_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
|
||||
-- }}}
|
||||
|
|
|
|||
|
|
@ -16,6 +16,9 @@
|
|||
## The following is used as first-run setup.
|
||||
|
||||
SOURCEDIR="${HOME}/personal/dataperso"
|
||||
[ -z "$XDG_CONFIG_HOME" ] && XDG_CONFIG_HOME="$HOME/.config"
|
||||
[ -z "$XDG_DATA_HOME" ] && XDG_DATA_HOME="$HOME/.local/share"
|
||||
[ -z "$XDG_DATA_DIRS" ] && XDG_DATA_DIRS="/usr/local/share"
|
||||
|
||||
## Mutt
|
||||
echo "==> Mutt"
|
||||
|
|
@ -30,8 +33,8 @@ echo
|
|||
|
||||
## Awesome
|
||||
echo "==> Awesome"
|
||||
THEME_DEST="${HOME}/.config/awesome/themes/custom"
|
||||
THEME_SOURCE="/usr/share/awesome/themes/default/"
|
||||
THEME_DEST="${XDG_CONFIG_HOME}/awesome/themes/custom"
|
||||
THEME_SOURCE="${XDG_DATA_DIRS}/awesome/themes/default/"
|
||||
if [ ! -e "${THEME_DEST}/background.png" ]; then
|
||||
[ -d "${THEME_SOURCE}" ] && cp -rn ${THEME_SOURCE}/* "${THEME_DEST}"
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -0,0 +1,30 @@
|
|||
## -*- mode:sh -*- #
|
||||
|
||||
alias pa='sudo pkg_add -r'
|
||||
alias pr='sudo pkg_delete'
|
||||
alias pi='pkg_info -RrcdsD -l "::"'
|
||||
alias pil='pkg_info -L'
|
||||
|
||||
## Search
|
||||
alias pis='pkg_info -Qox'
|
||||
alias pvs='pkg_version -Is'
|
||||
alias psr='pkg_search -r'
|
||||
|
||||
## Out-of-date packages.
|
||||
alias pv='pkg_version -Il "<"'
|
||||
|
||||
## Port tree
|
||||
alias mic='sudo make install clean'
|
||||
alias mc='sudo make config'
|
||||
|
||||
ms()
|
||||
{
|
||||
find /usr/ports -iname "*$1*"
|
||||
}
|
||||
|
||||
mcd()
|
||||
{
|
||||
local DEST=$(find /usr/ports -iname "*$1*" | head -n1)
|
||||
echo $DEST
|
||||
cd "$DEST"
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
## -*- mode:sh -*- #
|
||||
|
||||
PACMAN_FRONTEND='pacman'
|
||||
|
||||
## Use of Pacman-Color
|
||||
if [ -e "/usr/bin/pacman-color" ]; then
|
||||
PACMAN_FRONTEND='pacman-color'
|
||||
|
||||
if [ "zsh" = "$SHELL_CURRENT" ]; then
|
||||
compdef _pacman pacman-color
|
||||
elif [ "bash" = "$SHELL_CURRENT" ]; then
|
||||
complete -o default -o nospace -F _pacman pacman-color
|
||||
fi
|
||||
fi
|
||||
|
||||
## Pacman aliases
|
||||
if [ "$PACMAN_FRONTEND" = "pacman" ]; then
|
||||
alias pc='sudo pacman -Sc'
|
||||
alias pi='sudo pacman -S --needed'
|
||||
alias pqi='pacman -Qi'
|
||||
alias pql='pacman -Ql'
|
||||
alias pqo='pacman -Qo'
|
||||
alias pqs='pacman -Qs'
|
||||
alias pr='sudo pacman -Rs'
|
||||
alias psi='pacman -Si'
|
||||
alias pss='pacman -Ss'
|
||||
alias pu='sudo pacman -Syu'
|
||||
fi
|
||||
|
||||
if [ "$PACMAN_FRONTEND" = "pacman-color" ]; then
|
||||
alias pc='sudo pacman-color -Sc'
|
||||
alias pi='sudo pacman -S --needed'
|
||||
alias pqi='pacman-color -Qi'
|
||||
alias pql='pacman-color -Ql'
|
||||
alias pqo='pacman-color -Qo'
|
||||
alias pqs='pacman-color -Qs'
|
||||
alias pr='sudo pacman-color -Rs'
|
||||
alias psi='pacman-color -Si'
|
||||
alias pss='pacman-color -Ss'
|
||||
alias pu='sudo pacman-color -Syu'
|
||||
fi
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
## -*- mode:sh -*- #
|
||||
################################################################################
|
||||
## Shell Config -- Alias Definitions.
|
||||
## Date 2012-07-02
|
||||
## Date 2012-10-29
|
||||
################################################################################
|
||||
|
||||
##==============================================================================
|
||||
|
|
@ -13,12 +13,10 @@
|
|||
|
||||
if [ "bash" = "$SHELL_CURRENT" ]; then
|
||||
alias ..='cd ..'
|
||||
alias esrc='$EDITOR ~/.bashrc'
|
||||
alias ssrc='source ~/.bashrc'
|
||||
fi
|
||||
|
||||
if [ "zsh" = "$SHELL_CURRENT" ]; then
|
||||
alias esrc='$EDITOR ~/.zshrc'
|
||||
alias ssrc='source ~/.zshrc'
|
||||
fi
|
||||
|
||||
|
|
@ -26,15 +24,22 @@ fi
|
|||
##==============================================================================
|
||||
|
||||
## 'ls' redefinition
|
||||
alias ls='ls --color=auto -F -v'
|
||||
alias ls='ls -F'
|
||||
|
||||
## GNU extras.
|
||||
if [ "$OSTYPE" = "linux-gnu" ]; then
|
||||
alias ls='ls --color=auto -v --group-directories-first'
|
||||
else
|
||||
alias ls='ls -G'
|
||||
fi
|
||||
|
||||
## Listing aliases.
|
||||
alias l='ls -1'
|
||||
alias la='ls -lAh --group-directories-first' # Hidden files
|
||||
alias lc='ls -ltcrh --group-directories-first' # by change time
|
||||
alias lk='ls -lSrh --group-directories-first' # by size
|
||||
alias ll='ls -lh --group-directories-first' # Detailed view with human readable values.
|
||||
alias lx='ls -lXh --group-directories-first' # sort by extension
|
||||
alias la='ls -lAh' # Hidden files
|
||||
alias lc='ls -ltcrh' # Sort by change time
|
||||
alias lk='ls -lSrh' # Sort by size
|
||||
alias ll='ls -lh' # Detailed view with human readable values.
|
||||
alias lx='ls -lXh' # Sort by extension
|
||||
|
||||
## Misc
|
||||
alias cp="cp -i" # confirm before overwriting something
|
||||
|
|
@ -42,22 +47,27 @@ alias xlx='xrdb -load ~/.Xresources'
|
|||
alias grep='grep --color=auto'
|
||||
|
||||
## Emacs
|
||||
if [ -e "/usr/bin/emacs" ]; then
|
||||
type emacs > /dev/null
|
||||
if [ $? ]; then
|
||||
alias em='emacsclient -a "" -t'
|
||||
alias emacs-reload="emacsclient -e '(kill-emacs)' >/dev/null 2>&1; /usr/bin/emacs --daemon"
|
||||
alias emacs-reload="emacsclient -e '(kill-emacs)' >/dev/null 2>&1; emacs --daemon"
|
||||
fi
|
||||
|
||||
# List desktop applications.
|
||||
alias applist='grep -r "^Name=" /usr/share/applications/* | cut -d'=' -f2| sort'
|
||||
[ -d /usr/share/applications ] && XDG_APPS=($XDG_APPS /usr/share/applications)
|
||||
[ -d /usr/local/share/applications ] && XDG_APPS=($XDG_APPS /usr/local/share/applications)
|
||||
[ ${#XDG_APPS} -ne 0 ] && alias applist='grep -R "^Name=" $XDG_APPS | cut -d'=' -f2 | sort'
|
||||
|
||||
## Remove executable attribute.
|
||||
alias nox='find . -type f -exec chmod a-x {} \;'
|
||||
|
||||
## Get your external IP.
|
||||
[ -e "/usr/bin/curl" ] && alias myip='curl ifconfig.me'
|
||||
type curl > /dev/null
|
||||
[ $? ] && alias myip='curl ifconfig.me'
|
||||
|
||||
## Network discovery.
|
||||
[ -e "/usr/bin/nmap" ] && alias network-discover='nmap -sP "192.168.1.*"'
|
||||
type nmap > /dev/null
|
||||
[ $? ] && alias network-discover='nmap -sP "192.168.1.*"'
|
||||
|
||||
## Prevents accidentally clobbering files.
|
||||
alias mkdir='mkdir -p'
|
||||
|
|
@ -71,19 +81,19 @@ alias echolibpath='echo -e ${LD_LIBRARY_PATH//:/\\n}'
|
|||
|
||||
## Shutdown / Reboot.
|
||||
## If you do not want to get prompted for your password, configure sudo properly.
|
||||
if [ -e "/usr/bin/dbus-send" ]; then
|
||||
if [ "$OSTYPE" = "linux-gnu" ]; then
|
||||
alias halt='sudo halt'
|
||||
alias reboot='sudo reboot'
|
||||
else
|
||||
alias halt='sudo halt -p'
|
||||
fi
|
||||
|
||||
## Start X and lock current terminal (press ENTER when back in terminal to prompt for password).
|
||||
[ -e "/usr/bin/vlock" ] && alias sx='startx & vlock'
|
||||
|
||||
## Screensaver
|
||||
[ -e "/usr/bin/xscreensaver-command" ] && alias xss='xscreensaver-command --lock'
|
||||
type vlock > /dev/null
|
||||
[ $? ] && alias sx='startx & vlock'
|
||||
|
||||
## Zathura -- Fork to background.
|
||||
[ -e "/usr/bin/zathura" ] && alias zat='zathura --fork'
|
||||
type zathura > /dev/null
|
||||
[ $? ] && alias zat='zathura --fork'
|
||||
|
||||
## Xrandr
|
||||
alias xmorphnone='xrandr --output $(xrandr | grep "\<connected\>" | cut -f1 -d" ") --transform none'
|
||||
|
|
@ -108,49 +118,12 @@ alias xmorphzi='xrandr --output $(xrandr | grep "\<connected\>" | cut -f1 -d" ")
|
|||
##==============================================================================
|
||||
## Pacman aliases
|
||||
##==============================================================================
|
||||
if [ -e "/usr/bin/pacman" ] ; then
|
||||
[ -e "/usr/bin/pacman" ] && . ~/.shell.d/alias_pacman
|
||||
|
||||
PACMAN_FRONTEND='pacman'
|
||||
|
||||
## Use of Pacman-Color
|
||||
if [ -e "/usr/bin/pacman-color" ]; then
|
||||
PACMAN_FRONTEND='pacman-color'
|
||||
|
||||
if [ "zsh" = "$SHELL_CURRENT" ]; then
|
||||
compdef _pacman pacman-color
|
||||
elif [ "bash" = "$SHELL_CURRENT" ]; then
|
||||
complete -o default -o nospace -F _pacman pacman-color
|
||||
fi
|
||||
fi
|
||||
|
||||
## Pacman aliases
|
||||
if [ "$PACMAN_FRONTEND" = "pacman" ]; then
|
||||
alias pc='sudo pacman -Sc'
|
||||
alias pi='sudo pacman -S --needed'
|
||||
alias pqi='pacman -Qi'
|
||||
alias pql='pacman -Ql'
|
||||
alias pqo='pacman -Qo'
|
||||
alias pqs='pacman -Qs'
|
||||
alias pr='sudo pacman -Rs'
|
||||
alias psi='pacman -Si'
|
||||
alias pss='pacman -Ss'
|
||||
alias pu='sudo pacman -Syu'
|
||||
fi
|
||||
|
||||
if [ "$PACMAN_FRONTEND" = "pacman-color" ]; then
|
||||
alias pc='sudo pacman-color -Sc'
|
||||
alias pi='sudo pacman -S --needed'
|
||||
alias pqi='pacman-color -Qi'
|
||||
alias pql='pacman-color -Ql'
|
||||
alias pqo='pacman-color -Qo'
|
||||
alias pqs='pacman-color -Qs'
|
||||
alias pr='sudo pacman-color -Rs'
|
||||
alias psi='pacman-color -Si'
|
||||
alias pss='pacman-color -Ss'
|
||||
alias pu='sudo pacman-color -Syu'
|
||||
fi
|
||||
|
||||
fi
|
||||
##==============================================================================
|
||||
## FreeBSD aliases
|
||||
##==============================================================================
|
||||
[ "$(uname)" = "FreeBSD" ] && . ~/.shell.d/alias_freebsd
|
||||
|
||||
##==============================================================================
|
||||
## TeXlive aliases
|
||||
|
|
@ -162,13 +135,3 @@ if [ -d "/usr/local/texlive" ]; then
|
|||
alias tls="tlmgr search --global"
|
||||
alias tll="tlmgr show --list"
|
||||
fi
|
||||
|
||||
##==============================================================================
|
||||
## APT aliases
|
||||
##==============================================================================
|
||||
|
||||
if [ -e "/usr/bin/apt-get" ]; then
|
||||
alias au='sudo apt-get update'
|
||||
alias ac='sudo apt-get autoremove && sudo apt-get clean'
|
||||
alias ai='sudo apt-get install'
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -19,8 +19,12 @@ if [ -d "${TEXDIR}" ]; then
|
|||
TEXFOLDER="${TEXDIR}/${TEXYEAR}/bin/${TEXDISTRO}/"
|
||||
if [ -d "${TEXFOLDER}" ]; then
|
||||
export PATH=${TEXFOLDER}:$PATH
|
||||
export MANPATH=${TEXDIR}/${TEXYEAR}/texmf/doc/man:$MANPATH
|
||||
export INFOPATH=${TEXDIR}/${TEXYEAR}/texmf/doc/info:$INFOPATH
|
||||
|
||||
## BSD uses 'manpath' utility, so MANPATH variable may be empty.
|
||||
if [ "$OSTYPE" = "linux-gnu" ]; then
|
||||
export MANPATH=${TEXDIR}/${TEXYEAR}/texmf/doc/man:$MANPATH
|
||||
fi
|
||||
fi
|
||||
unset TEXYEAR
|
||||
unset TEXDISTRO
|
||||
|
|
@ -29,27 +33,32 @@ fi
|
|||
unset TEXDIR
|
||||
|
||||
## Enable color support of ls.
|
||||
if [ "$TERM" != "dumb" ]; then
|
||||
if [ "$TERM" != "dumb" ] && [ "$OSTYPE" = "linux-gnu" ]; then
|
||||
eval "`dircolors $HOME/.shell.d/dircolorsdb`"
|
||||
fi
|
||||
|
||||
## Terminal
|
||||
## WARNING: this is always a bad idea!
|
||||
# if [[ "$TERM" = "*rxvt*" ]]; then
|
||||
# export TERM="rxvt-unicode"
|
||||
# fi
|
||||
if [[ "$TERM" = *rxvt* ]]; then
|
||||
export TERM="rxvt-unicode-256color"
|
||||
fi
|
||||
|
||||
## Make 'less' more friendly for non-text input files, see lesspipe(1).
|
||||
[ -x /usr/bin/lesspipe ] && eval "$(lesspipe)"
|
||||
|
||||
## Manpage.
|
||||
export MANPAGER="less -s"
|
||||
if [ "$OSTYPE" = "linux-gnu" ]; then
|
||||
export MANWIDTH=80
|
||||
else
|
||||
export MANWIDTH=75
|
||||
fi
|
||||
|
||||
## Less config. -R is needed for lesspipe.
|
||||
export LESS=' -R '
|
||||
|
||||
## Time display (with ls command for example)
|
||||
## TODO: BSD version?
|
||||
export TIME_STYLE=+"|%Y-%m-%d %H:%M:%S|"
|
||||
|
||||
## System locale
|
||||
|
|
@ -66,7 +75,8 @@ fi
|
|||
export EDITOR
|
||||
|
||||
## Internet Browser
|
||||
[ -e "/usr/bin/luakit" ] && export BROWSER="luakit"
|
||||
type luakit > /dev/null
|
||||
[ $? ] && export BROWSER="luakit"
|
||||
|
||||
## Title
|
||||
## If this is an xterm set the title to user@host:dir
|
||||
|
|
|
|||
5
.zshrc
5
.zshrc
|
|
@ -7,7 +7,12 @@
|
|||
## Sourcing
|
||||
##==============================================================================
|
||||
|
||||
## TODO: is it possible to unify BSD and GNU here?
|
||||
if [ "$OSTYPE" = "linux-gnu" ]; then
|
||||
SHELL_CURRENT="$(ps | awk -v shellpid=$$ '$0 ~ shellpid {print $4}')"
|
||||
else
|
||||
SHELL_CURRENT="$(ps -c | awk -v shellpid=$$ '$0 ~ shellpid {print $5}')"
|
||||
fi
|
||||
SHELL_DIR="$HOME/.shell.d"
|
||||
|
||||
## Should be sourced first.
|
||||
|
|
|
|||
Loading…
Reference in New Issue