From 4c1e5165c5f703c825b655e32ff038a9ea482cdb Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Wed, 31 Oct 2018 13:53:51 +0100 Subject: [PATCH] New device means updated config --- .config/i3/config | 30 +++++++---------- .config/i3pystatus/config.py | 65 ++++++++++++++++++++++++------------ .mutt/mailcap | 5 +-- .vimrc | 16 ++------- 4 files changed, 60 insertions(+), 56 deletions(-) diff --git a/.config/i3/config b/.config/i3/config index f86de98..12d1488 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -60,7 +60,7 @@ bindsym $mod+Shift+0 move container to workspace 10 bindsym $mod+Shift+l reload bindsym $mod+Shift+c restart -#bindsym $mod+Shift+l exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" +bindsym $mod+Ctrl+x exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" mode "resize" { bindsym n resize shrink width 10 px or 10 ppt @@ -86,37 +86,31 @@ bar { for_window [window_role="pop-up"] floating enable for_window [class="Pavucontrol"] floating enable +for_window [class="Gnome-calculator"] floating enable exec xset s noblank && xset s 90 10 && xset -dpms -exec xsetroot -bg black -exec redshift-gtk -exec --no-startup-id blueman-applet +exec xsetroot -solid "#000000" exec xss-lock -n /home/kunsi/.bin/notify.sh -- /home/kunsi/.bin/screenlock.sh exec nextcloud +exec xinput set-prop 'SynPS/2 Synaptics TouchPad' 'Device Enabled' 0 -bindsym Control+$mod+l exec /home/kunsi/.bin/screenlock.sh +#bindsym Control+$mod+l exec /home/kunsi/.bin/screenlock.sh +bindsym XF86Tools exec /home/kunsi/.bin/screenlock.sh bindsym Control+$mod+r move workspace to output up bindsym Control+$mod+t move workspace to output down bindsym Control+$mod+n move workspace to output left bindsym Control+$mod+d move workspace to output right -bindsym XF86LaunchA exec /home/kunsi/.bin/screenlayout.sh -bindsym $mod+F3 exec /home/kunsi/.bin/screenlayout.sh +bindsym XF86Display exec /home/kunsi/.bin/screenlayout.sh bindsym XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +2%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 bindsym XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -2%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 bindsym XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle -bindsym $mod+F12 exec pactl set-sink-volume @DEFAULT_SINK@ +2%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 -bindsym $mod+F11 exec pactl set-sink-volume @DEFAULT_SINK@ -2%; exec pactl set-sink-mute @DEFAULT_SINK@ 0 -bindsym $mod+F10 exec pactl set-sink-mute @DEFAULT_SINK@ toggle +bindsym XF86AudioMicMute exec pactl set-source-mute alsa_input.pci-0000_00_1f.3.analog-stereo toggle -#bindsym XF86AudioPlay exec playerctl play-pause -#bindsym XF86AudioNext exec playerctl next -#bindsym XF86AudioPrev exec playerctl previous +bindsym XF86MonBrightnessUp exec xbacklight +5 +bindsym XF86MonBrightnessDown exec xbacklight -5 -bindsym XF86MonBrightnessUp exec xbacklight -inc 5 -bindsym XF86MonBrightnessDown exec xbacklight -dec 5 - -bindsym XF86KbdBrightnessUp exec kb-light + 10 -bindsym XF86KbdBrightnessDown exec kb-light - 10 +bindsym $mod+Print exec scrot --silent +bindsym $mod+Shift+Print exec scrot --focused --silent diff --git a/.config/i3pystatus/config.py b/.config/i3pystatus/config.py index 9551b7f..d33a80d 100644 --- a/.config/i3pystatus/config.py +++ b/.config/i3pystatus/config.py @@ -5,10 +5,15 @@ from i3pystatus.updates import pacman, cower status = Status() status.register("pulseaudio", - format="♪ {db}dB", - format_muted="♪ -∞dB", + format="♪I {volume}%", + format_muted="♪I -∞dB", step="2", - sink="alsa_output.pci-0000_00_1b.0.analog-stereo") + sink="alsa_output.pci-0000_00_1f.3.analog-stereo") +status.register("pulseaudio", + format="♪D {volume}%", + format_muted="♪D -∞dB", + step="2", + sink="@DEFAULT_SINK@") status.register("backlight", format="{percentage}%", @@ -28,7 +33,18 @@ status.register("clock", format="%a, %Y-%m-%d %H:%M:%S",) status.register("battery", - format="{status}{percentage:.2f}% {remaining:%E%h:%M}", + battery_ident="BAT0", + format="BAT0: {status}{percentage:.2f}% {remaining:%E%h:%M}", + alert=True, + alert_percentage=5, + status={ + "DIS": "↓", + "CHR": "↑", + "FULL": "", + }) +status.register("battery", + battery_ident="BAT1", + format="BAT1: {status}{percentage:.2f}% {remaining:%E%h:%M}", alert=True, alert_percentage=5, status={ @@ -38,16 +54,21 @@ status.register("battery", }) status.register("load", - format="{avg1} {avg5} {tasks}") + format="{avg1} {avg5}") #status.register("temp", -# format="{TC0P:.0f}°C {Right_Side:.0f}rpm", +# format="{Package_id_0:.0f}°C {fan0:.0f}rpm", # lm_sensors_enabled=True, # dynamic_color=True) +status.register("shell", + format="{output}", + command="/home/kunsi/.config/i3pystatus/rfkill.py", + interval=1) + status.register("network", - interface="wlp3s0", - format_up="{interface}:[ {essid} @ {freq:01.3f}GHz][ {v4cidr}][ {v6cidr}]", + interface="wlp4s0", + format_up="{interface}:[ {essid} ({freq:01.3f}GHz – {quality}%)][ {v4cidr}][ {v6cidr}]", format_down="{interface}: down", on_leftclick="i3-sensible-terminal -- sudo wifi-menu", detect_active=True, @@ -57,19 +78,19 @@ status.register("disk", path="/home", format="{used}/{total}G",) -status.register("mpd", - format="{status} [{pos}/{len}: ][{artist} - ]{title}{filename}[ ({song_elapsed}/{song_length})]", - status={ - "pause": "▷", - "play": "▶", - "stop": "◾", - }, - host="172.19.138.20", - color="#666666", - on_rightclick="stop", - on_upscroll="previous_song", - on_downscroll="next_song", - hide_inactive=True, - max_field_len=200) +#status.register("mpd", +# format="{status} [{pos}/{len}: ][{artist} - ]{title}{filename}[ ({song_elapsed}/{song_length})]", +# status={ +# "pause": "▷", +# "play": "▶", +# "stop": "◾", +# }, +# host="172.19.138.20", +# color="#666666", +# on_rightclick="stop", +# on_upscroll="previous_song", +# on_downscroll="next_song", +# hide_inactive=True, +# max_field_len=200) status.run() diff --git a/.mutt/mailcap b/.mutt/mailcap index 72d70dd..20434bb 100644 --- a/.mutt/mailcap +++ b/.mutt/mailcap @@ -1,2 +1,3 @@ -text/html; firefox %s >/dev/null 2>&1; needsterminal -text/html; w3m -I %{charset} -T text/html; copiousoutput; +text/html; chromium %s >/dev/null 2>&1 && sleep 2; +text/html; w3m -I %{charset} -T text/html; copiousoutput +application/pdf; mupdf %s >/dev/null 2>&1; diff --git a/.vimrc b/.vimrc index 15a0d37..44fa544 100755 --- a/.vimrc +++ b/.vimrc @@ -13,26 +13,14 @@ set mouse=a set cursorline syntax on set showcmd - +set encoding=utf-8 set autowrite set noautochdir set hlsearch map :nohlsearch -"set laststatus=2 "make a status line above the command line. otherwise this won't work -"set statusline= "clear statusline -"set statusline+=%-3.3n " buffer number -"set statusline+=%f " file name -"set statusline+=%h%m%r%w " flags -"set statusline+=[%{strlen(&ft)?&ft:'none'}, " filetype -"set statusline+=%{strlen(&fenc)?&fenc:&enc}, " encoding -"set statusline+=%{&fileformat}] " file format -"set statusline+=%= " right align -"set statusline+=%{synIDattr(synID(line('.'),col('.'),1),'name')} " highlight -"set statusline+=%b,0x%-8B " current char - -set colorcolumn=80,120 +set colorcolumn=72,120 hi colorcolumn ctermbg=NONE ctermfg=red cterm=bold guibg=NONE guifg=red gui=bold au BufRead /tmp/neomutt-* set tw=72