Merge branch 'master' of ssh://git.venberg.xyz:7920/Gabe/dotfiles

i3/.config/i3/config

@@ -71,7 +71,7 @@ font pango:DejaVu Sans Mono 8
 		bindsym $mod+ctrl+j move container to output down
 		bindsym $mod+ctrl+k move container to output up
 		bindsym $mod+ctrl+l move container to output right
-		
+
 	## split in horizontal orientation
 	bindsym $mod+shift+backslash  split h
 
@@ -188,8 +188,8 @@ font pango:DejaVu Sans Mono 8
 		bindsym $mod+shift+b  exec --no-startup-id "xset +dpms; notify-send --expire-time=500 'screen blanking on'"
 
 	# change brightness
-		bindsym $mod+control+plus exec --no-startup-id "xbacklight -inc 10; notify-send --expire-time=500 Brightness\ $(xbacklight -get | cut --delimiter=. -f 1)"
+		bindsym $mod+control+plus exec --no-startup-id "brightnessctl s +10%; notify-send --expire-time=500 Brightness\ $(brightnessctl -m| cut --delimiter=, -f 4)"
-		bindsym $mod+control+minus exec --no-startup-id "xbacklight -dec 10; notify-send --expire-time=500 Brightness\ $(xbacklight -get | cut --delimiter=. -f 1)"
+		bindsym $mod+control+minus exec --no-startup-id "brightnessctl s 10%-; notify-send --expire-time=500 Brightness\ $(brightnessctl -m| cut --delimiter=, -f 4)"
 
 	#screenshot everything with mod+s, current window with mod+shift+s, selection with mod+ctrl+s
 		bindsym $mod+s exec --no-startup-id "maim ~/Pictures/$(date +%s).png; notify-send --expire-time=1000 'Whole-desktop screenshot taken'"
@@ -203,14 +203,19 @@ font pango:DejaVu Sans Mono 8
 
 	#colour picker with xcolor
 		bindsym --release $mod+p exec --no-startup-id "xcolor -s"
-	
+
+>>>>>>> 50dd73ec62e82ed8f43dfb3e5ebe68f49caa19f8
 	#mpd controls
 		bindsym $mod+mod1+p exec --no-startup-id "mpc toggle"
 		bindsym $mod+mod1+plus exec --no-startup-id "mpc volume +1; notify-send --expire-time=1000 $(mpc volume)"
 		bindsym $mod+mod1+minus exec --no-startup-id "mpc volume -1; notify-send --expire-time=1000 $(mpc volume)"
-	
+
 	#open volume control
-		bindsym $mod+shift+p exec pavucontrol
+		bindsym $mod+shift+p exec easyeffects
+
+	#volume control
+		bindsym $mod+plus exec --no-startup-id "wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%-; notify-send --expire-time=1000 $(wpctl get-volume @DEFAULT_AUDIO_SINK@)"
+		bindsym $mod+minus exec --no-startup-id "wpctl set-volume @DEFAULT_AUDIO_SINK@ 1%+; notify-send --expire-time=1000 $(wpctl get-volume @DEFAULT_AUDIO_SINK@)"
 
 #make certan windwows always floating
 	#volume control
@@ -225,8 +230,6 @@ bar {
 }
 
 #startup applications
-	#pasystray
-	exec --no-startup-id pasystray
 
 	#geoclue
 	exec --no-startup-id /usr/lib/geoclue-2.0/demos/agent

x11hidpi/.Xresources

@@ -0,0 +1,135 @@
+! hidpi
+Xft.dpi: 192
+! urxvt stuff.
+URxvt*buffered: true
+URxvt*cursorBlink: true
+URxvt*underlineColor: yellow
+URxvt*depth: 32
+URxvt*borderless: 1
+URxvt*loginShell: true
+Urxvt*secondaryScroll:  true    # Enable Shift-PageUp/Down in screen
+URxvt*saveLines: 5000
+URxvt*termName: rxvt-unicode
+URxvt.font: xft:hack:size=12
+!!clickable urls with middle click:
+URxvt.perl-ext-common: default,matcher
+URxvt.url-launcher: firefox
+URxvt.matcher.button: 1
+!!keybindings for urxvt-resize-font-git.
+URxvt.keysim.C-minus: resize-font:smaller
+URxvt.keysym.C-equal: resize-font:bigger
+URxvt.keysym.C-0: resize-font:reset
+URxvt.keysym.C-question: resize-font:show
+
+!dark colourscheme
+	! special
+	*.foreground:   #b7b8b9
+	*.background:   #0c0d0e
+	*.cursorColor:  #b7b8b9
+
+	! black
+	*.color0:       #0c0d0e
+	*.color8:       #737475
+
+	! red
+	*.color1:       #e31a1c
+	*.color9:       #e31a1c
+
+	! green
+	*.color2:       #31a354
+	*.color10:      #31a354
+
+	! yellow
+	*.color3:       #dca060
+	*.color11:      #dca060
+
+	! blue
+	*.color4:       #3182bd
+	*.color12:      #3182bd
+
+	! magenta
+	*.color5:       #756bb1
+	*.color13:      #756bb1
+
+	! cyan
+	*.color6:       #80b1d3
+	*.color14:      #80b1d3
+
+	! white
+	*.color7:       #b7b8b9
+	*.color15:      #fcfdfe
+
+! drop in Solarized colorscheme for Xresources/Xdefaults
+	!SOLARIZED HEX     16/8 TERMCOL  XTERM/HEX   L*A*B      RGB         HSB
+	!--------- ------- ---- -------  ----------- ---------- ----------- -----------
+	!base03    #002b36  8/4 brblack  234 #1c1c1c 15 -12 -12   0  43  54 193 100  21
+	!base02    #073642  0/4 black    235 #262626 20 -12 -12   7  54  66 192  90  26
+	!base01    #586e75 10/7 brgreen  240 #585858 45 -07 -07  88 110 117 194  25  46
+	!base00    #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195  23  51
+	!base0     #839496 12/6 brblue   244 #808080 60 -06 -03 131 148 150 186  13  59
+	!base1     #93a1a1 14/4 brcyan   245 #8a8a8a 65 -05 -02 147 161 161 180   9  63
+	!base2     #eee8d5  7/7 white    254 #e4e4e4 92 -00  10 238 232 213  44  11  93
+	!base3     #fdf6e3 15/7 brwhite  230 #ffffd7 97  00  10 253 246 227  44  10  99
+	!yellow    #b58900  3/3 yellow   136 #af8700 60  10  65 181 137   0  45 100  71
+	!orange    #cb4b16  9/3 brred    166 #d75f00 50  50  55 203  75  22  18  89  80
+	!red       #dc322f  1/1 red      160 #d70000 50  65  45 220  50  47   1  79  86
+	!magenta   #d33682  5/5 magenta  125 #af005f 50  65 -05 211  54 130 331  74  83
+	!violet    #6c71c4 13/5 brmagenta 61 #5f5faf 50  15 -45 108 113 196 237  45  77
+	!blue      #268bd2  4/4 blue      33 #0087ff 55 -10 -45  38 139 210 205  82  82
+	!cyan      #2aa198  6/6 cyan      37 #00afaf 60 -35 -05  42 161 152 175  74  63
+	!green     #859900  2/2 green     64 #5f8700 60 -20  65 133 153   0  68 100  60
+
+	!#define S_base03        #002b36
+	!#define S_base02        #073642
+	!#define S_base01        #586e75
+	!#define S_base00        #657b83
+	!#define S_base0         #839496
+	!#define S_base1         #93a1a1
+	!#define S_base2         #eee8d5
+	!#define S_base3         #fdf6e3
+	!#define S_yellow        #b58900
+	!#define S_orange        #cb4b16
+	!#define S_red           #dc322f
+	!#define S_magenta       #d33682
+	!#define S_violet        #6c71c4
+	!#define S_blue          #268bd2
+	!#define S_cyan          #2aa198
+	!#define S_green         #859900
+	!
+	!*background:            S_base03
+	!*foreground:            S_base00
+	!*cursorColor:           S_base1
+	!*pointerColorBackground:S_base01
+	!*pointerColorForeground:S_base1
+	!
+	!! black dark/light
+	!*color0:                S_base02
+	!*color8:                S_base03
+	!
+	!! red dark/light
+	!*color1:                S_red
+	!*color9:                S_orange
+	!
+	!! green dark/light
+	!*color2:                S_green
+	!*color10:               S_base01
+	!
+	!! yellow dark/light
+	!*color3:                S_yellow
+	!*color11:               S_base00
+	!
+	!! blue dark/light
+	!*color4:                S_blue
+	!*color12:               S_base0
+	!
+	!! magenta dark/light
+	!*color5:                S_magenta
+	!*color13:               S_violet
+	!
+	!! cyan dark/light
+	!*color6:                S_cyan
+	!*color14:               S_base1
+	!
+	!! white dark/light
+	!*color7:                S_base2
+	!*color15:               S_base3

x11hidpi/.xinitrc

@@ -0,0 +1,14 @@
+#remap caps lock to a third control key. both shifts at once toggle shiftlock
+setxkbmap -option ctrl:nocaps
+#dark mode styling for qt and gtk apps.
+export GTK_THEME=Adwaita:dark
+export GTK2_RC_FILES=/usr/share/themes/Adwaita-dark/gtk-2.0/gtkrc
+export QT_STYLE_OVERRIDE=adwaita-dark
+# hidpi
+#export GDK_SCALE=2
+#export QT_AUTO_SCREEN_SCALE_FACTOR=1
+xrdb -merge ~/.Xresources
+#get gnome-keyring running
+dbus-update-activation-environment --all
+gnome-keyring-daemon --start --components=secrets
+i3