diff options
| -rw-r--r-- | Xresources | 2 | ||||
| -rw-r--r-- | config/i3/config | 8 | ||||
| -rw-r--r-- | config/i3blocks/config | 2 | ||||
| -rw-r--r-- | config/mpd/mpd.conf | 2 | ||||
| -rwxr-xr-x | local/bin/lxc-net | 2 | ||||
| -rwxr-xr-x | local/bin/mxrandr | 6 | ||||
| -rw-r--r-- | profile | 4 | ||||
| -rw-r--r-- | vimrc | 1 | ||||
| -rw-r--r-- | xinitrc | 4 |
9 files changed, 14 insertions, 17 deletions
@@ -41,7 +41,7 @@ URxvt*secondaryScreen: 1 URxvt*secondaryScroll: 0 ! Font URxvt*font: xft:mono:size=10 -URxvt*perl-ext-common: default,clipboard,vtwheel,resize-font +URxvt*perl-ext-common: default,clipboard,font-size URxvt*resize-font*smaller: C-Down URxvt*resize-font*bigger: C-Up diff --git a/config/i3/config b/config/i3/config index 7cd72c3..3900eb5 100644 --- a/config/i3/config +++ b/config/i3/config @@ -135,7 +135,7 @@ bindsym $mod+Shift+c reload # restart i3 inplace (preserves your layout/session, can be used to upgrade i3) bindsym $mod+Shift+r restart -set $Locker i3lock -d -c 000000 && sleep 1 +set $Locker i3lock -c 000000 && sleep 1 && xset dpms force off set $mode_system System (l) lock, (e) logout, (s) suspend, (r) reboot, (Shift+s) shutdown mode "$mode_system" { @@ -202,9 +202,9 @@ bindsym $mod+r mode "resize" bindsym Mod1+space exec --no-startup-id ~/.config/i3/scripts/keyboard_switch # Pulse audio control -bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 1 +5% && pkill -RTMIN+10 i3blocks -bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 1 -5% && pkill -RTMIN+10 i3blocks -bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 1 toggle && pkill -RTMIN+10 i3blocks +bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% && pkill -RTMIN+10 i3blocks +bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% && pkill -RTMIN+10 i3blocks +bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle && pkill -RTMIN+10 i3blocks # Sreen brightness controls bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 20 # increase screen brightness diff --git a/config/i3blocks/config b/config/i3blocks/config index 116e2bd..8ae24c8 100644 --- a/config/i3blocks/config +++ b/config/i3blocks/config @@ -24,7 +24,7 @@ # # The top properties below are applied to every block, but can be overridden. # Each block command defaults to the script name to avoid boilerplate. -command=/usr/lib/i3blocks/$BLOCK_NAME +command=/usr/libexec/i3blocks/$BLOCK_NAME separator_block_width=15 markup=none diff --git a/config/mpd/mpd.conf b/config/mpd/mpd.conf index 17a21cc..28d387c 100644 --- a/config/mpd/mpd.conf +++ b/config/mpd/mpd.conf @@ -13,7 +13,7 @@ # be disabled and audio files will only be accepted over ipc socket (using # file:// protocol) or streaming files over an accepted protocol. # -music_directory "~/hdd/music" +music_directory "~/music" # # This setting sets the MPD internal playlist directory. The purpose of this # directory is storage for playlists created by MPD. The server will use diff --git a/local/bin/lxc-net b/local/bin/lxc-net index 0821571..53ccb50 100755 --- a/local/bin/lxc-net +++ b/local/bin/lxc-net @@ -37,5 +37,5 @@ subnet 192.168.30.0 netmask 255.255.255.0 { dhcpd -4 -pf /tmp/lxc-dhcpd.pid -cf /tmp/lxc-dhcpd.conf vbr0 # Setup network forwarding (TODO add -o ethX to iptable command) -sysctl net.ipv4.ip_forward=1 +sysctl -w net.ipv4.ip_forward=1 iptables -t nat -A POSTROUTING -j MASQUERADE diff --git a/local/bin/mxrandr b/local/bin/mxrandr index 81ae511..7c51128 100755 --- a/local/bin/mxrandr +++ b/local/bin/mxrandr @@ -8,9 +8,9 @@ disconnectedOutputs=$(xrandr | grep -E " disconnected (primary )?[1-9]+" | awk ' cmd="xrandr " cmd_def=$cmd -INTERNAL=eDP-1 -HDMI=HDMI-1 -VGA=VGA-1 +INTERNAL=eDP1 +HDMI=HDMI1 +VGA=VGA1 for device in "$disconnectedOutputs"; do if [ -n "$defice" ]; then @@ -1,11 +1,9 @@ # Rest of the profile run only if login is from linux console [[ "$(tty)" != /dev/tty* ]] && return -# Start pulse audio -pulseaudio --start 2>/dev/null # Start music player daemon mpd ~/.config/mpd/mpd.conf # Start email synchronization ~/.local/sbin/syncemail # And if we are on first terminal also automatically start x server -[ "$(tty)" = "/dev/tty1" ] && startx +[ "$(tty)" = "/dev/tty1" ] && exec startx -- vt1 @@ -19,6 +19,7 @@ set hlsearch set foldmethod=syntax set wildmode=longest:full,full set wildmenu +set modeline set number set colorcolumn=82 @@ -12,6 +12,4 @@ export SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS=0 mxrandr start-pulseaudio-x11 -#exec i3 -d all -V >> ~/i3log-$(date +'%F-%k-%M-%S') 2>&1 -exec ck-launch-session dbus-launch --sh-syntax --exit-with-session i3 -#exec i3 --shmlog-size=26214400 +exec i3 |