Merge branch 'master' of github.com:kompetenzbolzen/vimconfig

9 files changed, 30 insertions, 50 deletions

diff --git a/.Xresources b/.Xresources
index 98ffe1a..db87e87 100644
--- a/.Xresources
+++ b/.Xresources
@@ -7,3 +7,9 @@ XTerm*selectToClipboard: true
 XTerm.vt100.locale: true
 
 Xft.dpi: 96
+! State:           'bg',       'fg',       'bgalt',    'hlbg',     'hlfg'
+rofi.color-normal: #000000AA,  #FFFFFFFF,  #000000AA,  #333333AA,  #FFFFFF
+rofi.color-urgent: #000000AA,  #FFFFFFFF,  #000000AA,  #333333AA,  #FFFFFF
+rofi.color-active: #000000AA,  #FFFFFFFF,  #000000AA,  #333333AA,  #FFFFFF
+!                  'background', 'border', 'separator'
+rofi.color-window: #000000AA,    #00000000,  #aaaaaa
diff --git a/.compton.conf b/.compton.conf
index 4302c79..2b731b3 100644
--- a/.compton.conf
+++ b/.compton.conf
@@ -55,7 +55,7 @@ glx-copy-from-front = false;
 #################################

 

 # Enabled client-side shadows on windows.

-shadow = true;

+shadow = false;

 # The blur radius for shadows. (default 12)

 shadow-radius = 5;

 # The left offset for shadows. (default -15)

diff --git a/.i3/config b/.i3/config
index 90b1dea..a098f92 100644
--- a/.i3/config
+++ b/.i3/config
@@ -1,33 +1,8 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see https://i3wm.org/docs/userguide.html for a complete reference!
-
-#force_xinerama yes
-
+#vim:conf
 set $mod Mod1
 
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
 font pango:monospace 9
 
-# 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 8
-
-# 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.
-
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
@@ -43,10 +18,13 @@ bindsym  $mod+b exec "brave"
 # kill focused window
 bindsym $mod+Shift+q kill
 
-bindsym $mod+Shift+w exec "i3lock -i ~/vimconfig/lock.png"
+bindsym $mod+Shift+w exec "i3lock -p win -i ~/vimconfig/lock.png"
+
+#Screenshot on mod+p
+bindsym $mod+p exec "scrot ~/Screenshots/Screenshot%Y-%m-%d%H:%M:%S.png"
 
 # start dmenu (a program launcher)
-bindsym $mod+d exec dmenu_run
+bindsym $mod+d exec rofi -show 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.
@@ -144,7 +122,8 @@ bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
 bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
-bindsym $mod+Shift+e 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+Shift+e 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+Shift+e exec $(printf "shutdown now\nreboot\ni3-msg exit" | rofi -dmenu -mesg "Exit?")
 
 # resize window (you can also use the mouse for that)
 mode "resize" {
@@ -308,7 +287,7 @@ set $yw #f1fa7c
 set $gn #50fa7b
 set $rd #ff5555
 set $id #ff79c6
-set $opaque #000000ff
+set $opaque #00000000
 
 set $black #000000
 set $grey #151515
@@ -323,19 +302,19 @@ client.background $black
 
 default_border none
 gaps inner 15
-## Program starting
-
-exec --no-startup-id nm-applet
 
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
 bar {
 	i3bar_command i3bar -t
 	status_command python /usr/share/powerline/bindings/i3/powerline-i3.py
+	#status_command i3status
 	font pango:DejaVu Sans Mono for Powerline 12
 
 	colors {
-		background #000000AA
+		background 		#00000000
+		focused_workspace	#00000000 #00000000 #FFFFFF
+		active_workspace	#00000000 #00000000 #FFFFFF
+		inactive_workspace	#00000000 #00000000 #555555
+		urgent_workspace	#00000000 #FF000033 #555555
 	}
 }
 
@@ -345,19 +324,14 @@ bar {
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl -- set-sink-volume 0 +5% #increase sound volume
 bindsym XF86AudioLowerVolume exec --no-startup-id pactl -- set-sink-volume 0 -5% #decrease sound volume
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound
+#Microphone mute
+bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute 1 toggle
 
-# play-pause
+#Mediacontrol
 bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause
- 
-# stop
 bindsym XF86AudioStop exec --no-startup-id playerctl stop
- 
-# prev
 bindsym XF86AudioPrev exec --no-startup-id playerctl previous
- 
-# next
 bindsym XF86AudioNext exec --no-startup-id playerctl next
-#
 
 # Sreen brightness controls
 # Use acpilight with arch!!
@@ -367,17 +341,13 @@ bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 5 -fps 30 # d
 
 #Screenshot on win+p
 bindsym $mod+p exec "scrot ~/Screenshots/Screenshot%Y-%m-%d%H:%M:%S.png"
+#bindsym XF86RFKill exec --no-startup-id i3-nagbar -t warning -m asdf
 
-#Layout de
 exec --no-startup-id "setxkbmap -layout de"
-
 exec --no-startup-id "compton"
-
 exec --no-startup-id "xrdb ~/.Xresources"
 
 exec --no-startup-id "lxqt-policykit-agent"
 
 #start autostart.sh
 exec --no-startup-id ~/autostart.sh
-
-#exec --no-startup-id feh --bg-fill ~/.i3/wp.jpg
diff --git a/packages.txt b/packages.txt
index aefd385..e20d592 100644
--- a/packages.txt
+++ b/packages.txt
@@ -1,6 +1,7 @@
 base-devel
 htop
 i3gaps
+i3lock
 neovim
 xorg-xinit
 xorg-server
@@ -8,3 +9,6 @@ compton
 xterm
 powerline
 xf86-input-libinput
+mupdf
+ranger
+rofi
diff --git a/pictures/b_2.jpg b/pictures/b_2.jpg
new file mode 100644
index 0000000..08c26d4
--- /dev/null
+++ b/pictures/b_2.jpg
diff --git a/pictures/b_3.jpg b/pictures/b_3.jpg
new file mode 100644
index 0000000..a037558
--- /dev/null
+++ b/pictures/b_3.jpg
diff --git a/.i3/wp.jpg b/pictures/b_wp.jpg
index e6aabe5..e6aabe5 100644
--- a/.i3/wp.jpg
+++ b/pictures/b_wp.jpg
diff --git a/pictures/lock.png b/pictures/lock.png
new file mode 100644
index 0000000..f9791c4
--- /dev/null
+++ b/pictures/lock.png
diff --git a/lock.png b/pictures/lock_.png
index 712528b..712528b 100644
--- a/lock.png
+++ b/pictures/lock_.png