aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.Xresources7
-rw-r--r--.bash_profile2
-rw-r--r--.bashrc18
-rw-r--r--.config/awesome/rc.lua17
-rw-r--r--.config/awesome/themes/default/theme.lua2
-rw-r--r--.mplayer/config4
-rw-r--r--.xinitrc4
7 files changed, 24 insertions, 30 deletions
diff --git a/.Xresources b/.Xresources
index ae69d66..8b06caf 100644
--- a/.Xresources
+++ b/.Xresources
@@ -50,11 +50,12 @@ URxvt.shading: 20
*color15: #FFFFFF
Xft.autohint: 0
-Xft.lcdfilter: lcddefault
-Xft.hintstyle: hintfull
-Xft.hinting: 1
Xft.antialias: 1
+Xft.hinting: true
+Xft.hintstyle: hintslight
+Xft.dpi: 96
Xft.rgba: rgb
+Xft.lcdfilter: lcddefault
! -----------------
! ROFI Color theme
diff --git a/.bash_profile b/.bash_profile
index f1007b6..c3715d3 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,4 +1,4 @@
# ~/.bash_profile
[[ -f ~/.bashrc ]] && . ~/.bashrc
-[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx -- -keeptty -nolisten tcp > ~/.xorg.log 2>&1
+[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx -- -keeptty -nolisten tcp > /dev/null 2>&1
diff --git a/.bashrc b/.bashrc
index 0c5d252..dc16152 100644
--- a/.bashrc
+++ b/.bashrc
@@ -7,12 +7,14 @@ PS1='\[\e[0;34m\][ \W ] \$\[\e[0m\] '
# github dotfiles
alias dotfile='/usr/bin/git --git-dir=$HOME/.local/share/dotfiles/ --work-tree=$HOME'
-# no repeating history
-unset HISTSIZE
-unset HISTFILESIZE
-HISTCONTROL=ignoredups:erasedups
+# bash history settings
+export HISTSIZE=
+export HISTFILESIZE=
+export HISTCONTROL=ignoredups:erasedups
+
+# append bash history entries
shopt -s histappend
-PROMPT_COMMAND="history -n; history -w; history -c; history -r; $PROMPT_COMMAND"
+export PROMPT_COMMAND="history -a"
# ssh agent with keychain
alias ssh='eval $(/usr/bin/keychain --eval --agents ssh -Q --quiet ~/.ssh/primary) && ssh'
@@ -82,12 +84,6 @@ alias archey='archey3'
# listed history
alias hist='history | grep'
-# live streams
-alias alj='rtmpdump -v -r rtmp://aljazeeraflashlivefs.fplive.net/aljazeeraflashlive-live/aljazeera_eng_med | mplayer -'
-alias alja='rtmpdump -r "rtmp://ajam.lsops.net/live/" -a "live/" -f "LNX 11,2,202,332" -W "http://static.ls-cdn.com/player/5.10/livestation-player.swf?1387140070" -p "http://www.livestation.com" -y "ajam_en_584" | mplayer -'
-alias zns='rtmpdump -v -r rtmp://streamcomedia.streamguys1.com/live/znsmobile | mplayer -'
-alias bbc='rtmpdump -v -r rtmp://hd4.lsops.net/live/bbcnews_en_364 http://p.jwpcdn.com/6/8/jwplayer.flash.swf http://www.wherever.tv/tv-channels/BBC-News-24.jsf | mplayer -'
-
# ssh bash prompt color change
if [ -n "$SSH_CLIENT" ]; then
export PS1='\[\e[0;32m\][ \W ] \$\[\e[0m\] '
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index a9e08fe..79b04d1 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -19,7 +19,7 @@ vicious = require("vicious")
-- Lain library
local lain = require("lain")
-- Set font
-awesome.font = ("FontAwesome 7.5")
+awesome.font = ("FontAwesome 8")
-- Startup
-- os.execute("")
-- Exit Signals
@@ -154,7 +154,7 @@ separator = wibox.widget.textbox()
separator:set_text(" ")
-- Create a textclock widget
-mytextclock = awful.widget.textclock(" %I:%M %p", 1)
+mytextclock = wibox.widget.textclock(" %I:%M %p", 1)
lain.widgets.calendar.attach(mytextclock, {font="Ubuntu Mono Bold", font_size="10"})
-- Create a wibox for each screen and add it
@@ -277,13 +277,6 @@ root.buttons(awful.util.table.join(
))
-- }}}
--- {{{ Drop down terminal
-local quakeapp = {}
-for s = 1, screen.count() do
- quakeapp[s] = lain.util.quake({ app = terminal })
-end
--- }}}
-
-- {{{ Key bindings
globalkeys = awful.util.table.join(
awful.key({ modkey, }, "Left", awful.tag.viewprev ),
@@ -307,7 +300,6 @@ globalkeys = awful.util.table.join(
awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end),
awful.key({ modkey, }, "u", awful.client.urgent.jumpto),
awful.key({ modkey, }, "b", function () mywibox[mouse.screen].visible = not mywibox[mouse.screen].visible end),
- awful.key({ modkey, }, "q", function () quakeapp[mouse.screen]:toggle() end),
-- Standard program
awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end,
@@ -476,6 +468,11 @@ awful.rules.rules = {
screen = awful.screen.preferred,
placement = awful.placement.no_overlap+awful.placement.no_offscreen
}},
+
+ -- Floating clients.
+ { rule_any = {
+ instance = { "tilda", "copyq", },
+ }, properties = { floating = true }},
}
-- }}}
diff --git a/.config/awesome/themes/default/theme.lua b/.config/awesome/themes/default/theme.lua
index ac23504..034ef95 100644
--- a/.config/awesome/themes/default/theme.lua
+++ b/.config/awesome/themes/default/theme.lua
@@ -1,7 +1,7 @@
-- {{{ Main
local theme = {}
theme.wallpaper = "~/.config/awesome/themes/default/default-7.jpg"
-theme.font = "FontAwesome Bold 7.5"
+theme.font = "FontAwesome Bold 8"
-- }}}
-- {{{ Colors
diff --git a/.mplayer/config b/.mplayer/config
index ad3905b..f844165 100644
--- a/.mplayer/config
+++ b/.mplayer/config
@@ -4,5 +4,5 @@ ao=alsa
nolirc=1
quiet=1
nojoystick=1
-x=640
-y=480
+x=1024
+y=640
diff --git a/.xinitrc b/.xinitrc
index fce9543..81ef0df 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -13,13 +13,13 @@ fi
[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
# Normal cursor
-xsetroot -cursor_name left_ptr
+xsetroot -cursor_name left_ptr &
# Protect eyes with redshift
redshift &
# Key mappings
-xmodmap .Xmodmap
+xmodmap .Xmodmap &
# Run awesome
exec awesome --no-argb