merge with work

This commit is contained in:
finga 2018-06-02 23:33:07 +02:00
commit 12833d2c59
3 changed files with 35 additions and 33 deletions

View file

@ -11,9 +11,6 @@
set $mod Mod4 set $mod Mod4
# font for window titles. ISO 10646 = Unicode
font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
# poweroff stuff # poweroff stuff
set $mode_system System: (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown set $mode_system System: (l) lock, (e) logout, (s) suspend, (h) hibernate, (r) reboot, (Shift+s) shutdown
mode "$mode_system" { mode "$mode_system" {
@ -36,7 +33,7 @@ floating_modifier $mod
bindsym $mod+Return exec i3-sensible-terminal bindsym $mod+Return exec i3-sensible-terminal
# start emacs # start emacs
bindsym $mod+Shift+Return exec i3-sensible-editor bindsym $mod+Shift+Return exec em
# kill focused window # kill focused window
bindsym $mod+Shift+Q kill bindsym $mod+Shift+Q kill
@ -44,9 +41,6 @@ bindsym $mod+Shift+Q kill
# start dmenu (a program launcher) # start dmenu (a program launcher)
bindsym $mod+d exec dmenu_run bindsym $mod+d exec dmenu_run
# lock screen (i3lock)
bindsym $mod+Escape exec i3lock -c 000000
# change focus # change focus
bindsym $mod+Left focus left bindsym $mod+Left focus left
bindsym $mod+Down focus down bindsym $mod+Down focus down
@ -136,30 +130,29 @@ bindsym $mod+r mode "resize"
# colors & style # colors & style
new_window normal 1 new_window normal 1
new_float normal 1 new_float normal 1
client.focused #009900 #009900 #ffffff #007700 client.focused #000000 #009900 #ffffff #ff0000
client.focused_inactive #005500 #005500 #000000 #007700 client.unfocused #000000 #005500 #000000 #ff0000
client.unfocused #005500 #005500 #000000 #007700
#client.urgent
# Start i3bar to display a workspace bar (plus the system information i3status # Start i3bar to display a workspace bar (plus the system information i3status
# finds out, if available) # finds out, if available)
bar { bar {
status_command i3status --config ~/.i3/i3status status_command i3status --config ~/.config/i3status/config
position top position top
tray_output primary tray_output primary
workspace_buttons yes workspace_buttons yes
mode hide mode dock
modifier $mod modifier $mod
colors { colors {
statusline #00ff00 statusline #00ff00
focused_workspace #00cc00 #00ff00 #000000 focused_workspace #00cc00 #00ff00 #000000
inactive_workspace #00cc00 #008b00 #cccccc inactive_workspace #00cc00 #008b00 #cccccc
#client.orientation #ff0000 #client.orientation #ff0000
} }
} }
exec ssh-agent # exec ssh-agent
exec gpg-agent # exec gpg-agent
exec xset -b # exec xset -b
# exec xrandr --output VGA-2 --auto --right-of VGA-1
# exec feh --bg-scale ~/bg.jpg

View file

@ -3,15 +3,15 @@ general {
interval = 1 interval = 1
} }
order += "ipv6" # order += "ipv6"
order += "ethernet eth0" order += "ethernet eth0"
order += "wireless wlan0" order += "wireless wlan0"
order += "battery 0" order += "battery 0"
order += "cpu_usage" order += "cpu_usage"
order += "load" order += "load"
order += "cpu_temperature 0"
order += "volume master" order += "volume master"
order += "time" order += "tztime home"
order += "tztime utc"
ethernet eth0 { ethernet eth0 {
format_up = "E: %ip (%speed)" format_up = "E: %ip (%speed)"
@ -30,15 +30,6 @@ battery 0 {
low_threshold = 20 low_threshold = 20
} }
time {
format = "%Y-%m-%d %H:%M:%S"
}
cpu_temperature 0 {
format = "%degrees °C"
path = "/sys/class/thermal/thermal_zone0/temp"
}
cpu_usage { cpu_usage {
format = "C: %usage" format = "C: %usage"
} }
@ -53,3 +44,13 @@ volume master {
mixer = "Master" mixer = "Master"
mixer_idx = 0 mixer_idx = 0
} }
tztime home {
format = "%Y-%m-%d (%Z) %H:%M:%S"
timezone = "Europe/Vienna"
}
tztime utc {
format = "(%Z) %H:%M:%S"
timezone = "Etc/UTC"
}

8
.gitignore.d/i3 Normal file
View file

@ -0,0 +1,8 @@
*
!/.config
!/.config/i3
!/.config/i3/config
!/.config/i3status
!/.config/i3status/config
!/.gitignore.d
!/.gitignore.d/i3