aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/fish/config.fish4
-rw-r--r--config/i3/config41
-rw-r--r--xprofile9
3 files changed, 13 insertions, 41 deletions
diff --git a/config/fish/config.fish b/config/fish/config.fish
index 9fe3974..b556f05 100644
--- a/config/fish/config.fish
+++ b/config/fish/config.fish
@@ -55,6 +55,10 @@ set -x __fish_git_prompt_show_informative_status true
not set -q MPD_PORT; and set -x MPD_PORT 6601
+if type -q mpd; and not pgrep mpd >/dev/null
+ mpd
+end
+
if not set -q EDITOR
if type -q vis
set -x EDITOR vis
diff --git a/config/i3/config b/config/i3/config
index 7e96db1..0bbd804 100644
--- a/config/i3/config
+++ b/config/i3/config
@@ -1,25 +1,8 @@
# i3 config file (v4)
#
# Please see http://i3wm.org/docs/userguide.html for a complete reference!
-#
-# This config file uses keycodes (bindsym) and was written for the QWERTY
-# layout.
-#
-# To get a config file with the same key positions, but for your current
-# layout, use the i3-config-wizard
-#
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-# This font is widely installed, provides lots of unicode glyphs, right-to-left
-# text rendering and scalability on retina/hidpi displays (thanks to pango).
font pango:DejaVu Sans Mono 10
-# Before i3 v4.8, we used to recommend this one as the default:
-# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-# The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, its unicode glyph coverage is limited, the old
-# X core fonts rendering does not support right-to-left and this being a bitmap
-# font, it doesn’t scale on retina/hidpi displays.
set $mod Mod4
@@ -39,15 +22,9 @@ bindsym $mod+Return exec i3-sensible-terminal
# kill focused window
bindsym $mod+Shift+q kill
-# start dmenu (a program launcher)
-# bindsym $mod+d exec dmenu_run
-# There also is the (new) i3-dmenu-desktop which only displays applications
-# shipping a .desktop file. It is a wrapper around dmenu, so you need that
-# installed.
-# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
-
# programm starter
bindsym $mod+d exec $DOTFILES_LOCATION/scripts/program_starter.sh
+
# ssh starter
bindsym $mod+Shift+d exec $DOTFILES_LOCATION/scripts/ssh_starter.sh
@@ -168,7 +145,6 @@ bindsym $mod+r mode "resize"
# Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available)
bar {
- #status_command i3status
status_command $HOME/.config/i3/conky-i3bar
}
@@ -204,21 +180,6 @@ exec --no-startup-id xss-lock -- i3lock -i $DOTFILES_LOCATION/wallpapers/blue_sc
# Autostart Programms
exec --no-startup-id feh --bg-fill $DOTFILES_LOCATION/wallpapers/nsa_wallpaper.png
-exec --no-startup-id syndaemon -i 1 -d
-#exec --no-startup-id nm-applet
-exec --no-startup-id owncloud
-exec --no-startup-id mpd
# Autorestore Layout
#exec --no-startup-id "i3-msg 'workspace 1; append_layout /home/fischerling/.i3/workspace-1.json'"
-
-#######################################################################
-# automatically start i3-config-wizard to offer the user to create a
-# keysym-based config which used his favorite modifier (alt or windows)
-#
-# i3-config-wizard will not launch if there already is a config file
-# in ~/.i3/config.
-#
-# Please remove the following exec line:
-#######################################################################
-exec i3-config-wizard
diff --git a/xprofile b/xprofile
index e5c7088..2f716ab 100644
--- a/xprofile
+++ b/xprofile
@@ -59,7 +59,14 @@ fi
[[ -f $HOME/.Xresources ]] && xrdb -merge $HOME/.Xresources
+# Set keyboard layout
setxkbmap de
-# start notification service
+# Start notification service
dunst &
+
+# Start touchpad daemon
+syndaemon -i 1 -d
+
+# Start owncloud client
+owncloud &