From 42d372c61c23e5fa956cf976eb18febe0ea950f9 Mon Sep 17 00:00:00 2001
From: lucas <lucasnethaj@gmail.com>
Date: Wed, 7 Apr 2021 10:43:12 +0200
Subject: [PATCH] updated vimrc

---
 .config/Xresources                |  2 +-
 .config/fish/config.fish          |  5 +-
 .config/gtk-3.0/settings.ini      |  4 +-
 .config/lf/lfrc                   |  6 ---
 .config/polybar/config            |  2 +-
 .config/profile                   |  3 ++
 .config/qt5ct/qt5ct.conf          |  2 +-
 .config/sway/config               | 88 ++++++++++++++++++++++---------
 .config/userChrome/userChrome.css |  6 +--
 .config/waybar/config             |  5 +-
 .config/waybar/style.css          | 60 ++++++++++-----------
 .local/bin/dwm-session            |  3 --
 .local/bin/wallpaper              | 11 ++++
 .xinitrc                          |  6 ---
 14 files changed, 115 insertions(+), 88 deletions(-)

diff --git a/.config/Xresources b/.config/Xresources
index 7d4196d..06e59ed 100644
--- a/.config/Xresources
+++ b/.config/Xresources
@@ -38,4 +38,4 @@ dwm.selbordercolor: #BD93F9
 dwm.selbgcolor:     #282A36
 dwm.selfgcolor:     #50FA7b 
 *.alpha:				  0.8
-/* *.font:				  DejaVu Sans Mono Nerd Font Complete Mono:pixelsize:14:antialias=true */
+/* *.fon:				  DejaVu Sans Mono Nerd Font Complete Mono:pixelsize:14:antialias=true */
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 02bdb18..fe2343c 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -1,14 +1,11 @@
 # Greeting
-<<<<<<< HEAD
 set GREETING ' '(uname -r)                     # Kernel Release
 set -a GREETING ' :'(pacman -Qq | wc -l)','    # Package Count
 set -a GREETING (uptime --pretty)               # Uptime
-=======
 set GREETING ' '(uname -r)						# Kernel Release
 set -a GREETING ' :'(pacman -Qq | wc -l)','	# Package Count
 set -a GREETING (uptime --pretty)				# Uptime
->>>>>>> d059b91a56abed9255a9cfe2d40509877468c3cc
-echo -n $GREETING
+# echo -n $GREETING
 
 source ~/.config/aliases
 source ~/.config/profile
diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini
index bf53283..7c4c930 100644
--- a/.config/gtk-3.0/settings.ini
+++ b/.config/gtk-3.0/settings.ini
@@ -9,10 +9,10 @@ gtk-enable-event-sounds=1
 gtk-enable-input-feedback-sounds=1
 gtk-fallback-icon-theme=gnome
 gtk-font-name=Noto Sans,  10
-gtk-icon-theme-name=Papirus-Dark
+gtk-icon-theme-name=bloom
 gtk-menu-images=1
 gtk-primary-button-warps-slider=0
-gtk-theme-name=Dracula
+gtk-theme-name=deepin
 gtk-toolbar-icon-size=GTK_ICON_SIZE_SMALL_TOOLBAR
 gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
 gtk-xft-antialias=1
diff --git a/.config/lf/lfrc b/.config/lf/lfrc
index b71293b..72450f6 100644
--- a/.config/lf/lfrc
+++ b/.config/lf/lfrc
@@ -1,8 +1,5 @@
-<<<<<<< HEAD
-=======
 set previewer ~/.config/lf/preview
 # interpreter for shell commands (needs to be POSIX compatible)
->>>>>>> d059b91a56abed9255a9cfe2d40509877468c3cc
 set shell sh
 set ifs "\n"
 set icons
@@ -12,11 +9,8 @@ set previewer ~/.config/lf/pv
 set cleaner ~/.config/lf/cls
 set scrolloff 10
 
-<<<<<<< HEAD
-=======
 # set previewer ~/.config/lf/pv
 set cleaner ~/.config/lf/clear_img.sh
->>>>>>> d059b91a56abed9255a9cfe2d40509877468c3cc
 map i $~/.config/lf/pv.sh $f | less -R 
 map i $LESSOPEN='| ~/.config/lf/pv.sh %s' less -R $f
 
diff --git a/.config/polybar/config b/.config/polybar/config
index d92f80e..216424d 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -42,7 +42,7 @@ background = #00000000
 modules-center = xwindow
 
 [bar/default]
-monitor = ${env:MONITOR:eDP}
+monitor = ${env:MONITOR:eDP-1}
 width = 100%
 height = 28
 ;offset-x = 2.5%
diff --git a/.config/profile b/.config/profile
index 0e14710..0b47d4c 100644
--- a/.config/profile
+++ b/.config/profile
@@ -20,6 +20,9 @@ export XDG_CONFIG_DIRS="/usr/etc/xdg:/etc/xdg"
 export GUI_EDITOR="/usr/bin/nvim"
 export EDITOR="/usr/bin/nvim"
 export VISUAL="/usr/bin/nvim"
+
+export MOZ_ENABLE_WAYLAND=1
+
 # export BROWSER="/usr/bin/qutebrowser"
 export BROWSER="/usr/bin/firefox"
 export TERMINAL="/usr/local/bin/st"
diff --git a/.config/qt5ct/qt5ct.conf b/.config/qt5ct/qt5ct.conf
index f9fd8b8..e37c9ac 100644
--- a/.config/qt5ct/qt5ct.conf
+++ b/.config/qt5ct/qt5ct.conf
@@ -25,4 +25,4 @@ underline_shortcut=1
 wheel_scroll_lines=3
 
 [SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\x90\0\0\x5\xb5\0\0\b\xf\0\0\t\xd7\0\0\0\x92\0\0\x5\xb7\0\0\b\r\0\0\t\xd5\0\0\0\0\0\0\0\0\a\x80\0\0\0\x92\0\0\x5\xb7\0\0\b\r\0\0\t\xd5)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\x4\0\0\0\x19\0\0\a{\0\0\x4*\0\0\0\x4\0\0\0\x19\0\0\a\x7f\0\0\x4\x37\0\0\0\0\x2\0\0\0\a\x80\0\0\0\x4\0\0\0\x19\0\0\a{\0\0\x4*)
diff --git a/.config/sway/config b/.config/sway/config
index d378a86..7ea7bb3 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -17,26 +17,35 @@ set $right l
 # smart_gaps on
 gaps inner 6
 gaps outer -6
-default_border pixel 4
+default_border pixel 2
+
+client.focused #ffbbff #ffbbff #000000
+
+focus_wrapping no
 
 # Your preferred terminal emulator
     set $term st
     # Your preferred application launcher
     # Note: pass the final command to swaymsg so that the resulting window can be opened
     # on the original workspace that the command was run on.
-    set $menu dmenu_path | dmenu | xargs swaymsg exec --
+    # set $menu dmenu_path | dmenu | xargs swaymsg exec --
+    set $menu dmenu_path | bemenu -H 30 | xargs swaymsg exec --
+    set $menu instantmenu_smartrun
 
     ### Output configuration
     #
     # Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
-    output * bg ~/pix/wall/403920_in-rainbows-radiohead-wallpaper-images_1280x800_h.png fill
-    #
-    # Example configuration:
-    #
-    #   output HDMI-A-1 resolution 1920x1080 position 1920,0
-    output eDP-1 resolution 1920x1080 position 320,1440
-    output HDMI-A-1 resolution 2560x1440 position 0,0
-    #
+    # set $wall exec wallpaper -o
+    exec waypaper &
+    # output * bg ~/pix/wall/Gorillaz.jpg fill
+    # output * bg ~/pix/wall/ny022g227qp61.jpg fill
+    # output * bg ~/pix/wall/tawbr2jclzp61.jpg fill
+
+    # output eDP-1 resolution 1920x1080 position 320,1440
+    # output HDMI-A-1 resolution 2560x1440 position 0,0
+    output eDP-1 position 0,0 
+    output HDMI-A-1 position 1920,0
+    
     # You can get the names of your outputs by running: swaymsg -t get_outputs
 
     ### Idle configuration
@@ -52,34 +61,28 @@ default_border pixel 4
     # your displays after another 300 seconds, and turn your screens back on when
     # resumed. It will also lock your screen before your computer goes to sleep.
 
-    ### Input configuration
-    #
-    # Example configuration:
-    #
-    #   input "2:14:SynPS/2_Synaptics_TouchPad" {
-    #       dwt enabled
-    #       tap enabled
-    #       natural_scroll enabled
-    #       middle_emulation enabled
-    #   }
-    #
-    # You can get the names of your inputs by running: swaymsg -t get_inputs
-    # Read `man 5 sway-input` for more information about this section.
-    
     input * {
     	xkb_layout "dk,us"
     	xkb_options "caps:escape"
-	natural_scroll "enabled"
     }
-    input "ELAN1200:00 04F3:309F Touchpad" {
+
+    input "1267:12447:ELAN1200:00_04F3:309F_Touchpad" {
+	natural_scroll "enabled"
     }
 
     ### Key bindings
     #
     # Basics:
     #
+    
+	exec_always disablelaptopdisplay.sh
+    	set $laptop "eDP-1"
+    	bindswitch --reload --locked lid:on output $laptop disable
+    	bindswitch --reload --locked lid:off output $laptop enable
+
     	# Start a terminal
     	bindsym $mod+shift+Return exec $term
+    	bindsym ctrl+alt+t exec $term
 
     	# Kill focused window
     	bindsym $mod+Shift+c kill
@@ -88,6 +91,39 @@ default_border pixel 4
     	bindsym $mod+d exec rofi -show drun
     	bindsym $mod+p exec $menu
 
+	# Lockscreen
+	bindsym ctrl+alt+l exec swaylock --screenshots --effect-blur 6x6 --fade-in .3 --grace 2
+
+	# Control audio out
+	bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume @DEFAULT_SINK@ -5%
+
+	bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume @DEFAULT_SINK@ +5% 
+	
+	bindsym --locked XF86AudioMute exec pactl set-sink-mute @DEFAULT_SINK@ toggle 
+	
+	# Control monitor brightness
+	bindsym --locked XF86MonBrightnessDown exec backlight -dec 10
+	bindsym --locked XF86MonBrightnessUp exec backlight -inc 10
+	
+	# Take screenshots
+	bindsym Print exec \
+	grim -g "$(slurp)" - | \
+	tee ~/pix/screenshots/$(date +%F-%T_sel).png | \
+	wl-copy
+	
+	bindsym shift+Print exec \
+	grim -o $(swaymsg -t get_outputs | jq -r '.[] | select(.focused) | .name') - | \
+	tee ~/pix/screenshots/$(date +%F-%T_display).png | \
+	wl-copy
+
+	bindsym ctrl+shift+Print exec \
+	grim - | \
+	tee ~/pix/screenshots/$(date +%F-%T_screen).png | \
+	wl-copy
+	
+	bindsym XF86Sleep systemctl suspend
+
+
     	# Drag floating windows by holding down $mod and left mouse button.
     	# Resize them with right mouse button + $mod.
     	# Despite the name, also works for non-floating windows.
diff --git a/.config/userChrome/userChrome.css b/.config/userChrome/userChrome.css
index ce6bb56..0623f49 100644
--- a/.config/userChrome/userChrome.css
+++ b/.config/userChrome/userChrome.css
@@ -3,15 +3,15 @@
 @import "global/global.css";
 @import "icons/icons.css";
 /* @import "tabbar/tabbar.css"; */
-/* @import "hide_tabs_with_one_tab.css"; */
+@import "hide_tabs_with_one_tab.css";
 @import "navbar/navbar.css";
 @import "personalbar/personalbar.css";
 @import "popup/popup.css";
 @import "urlbar/urlbar.css";
 @import "findbar/findbar.css";
-@import "tabs_on_bottom.css";
+/* @import "tabs_on_bottom.css"; */
 @import "tabs_fill_available_width.css";
-@import "multi-row_tabs.css";
+/* @import "multi-row_tabs.css"; */
 @import "centered_tab_content.css";
 @import "click_selected_tab_to_focus_urlbar.css";
 
diff --git a/.config/waybar/config b/.config/waybar/config
index 493b946..81cea32 100644
--- a/.config/waybar/config
+++ b/.config/waybar/config
@@ -86,13 +86,13 @@
     "backlight": {
         // "device": "acpi_video1",
         "format": "{percent}% {icon}",
-        "format-icons": ["", ""]
+        "format-icons": ["", "", "", "", "", "", "", "", "", "", "", ""]
     },
     "battery": {
         "states": {
             // "good": 95,
             "warning": 30,
-            "critical": 15
+            "critical": 10
         },
         "format": "{capacity}% {icon}",
         "format-charging": "{capacity}% ",
@@ -145,3 +145,4 @@
         // "exec": "$HOME/.config/waybar/mediaplayer.py --player spotify 2> /dev/null" // Filter player based on name
     }
 }
+// vim:ft=json
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 9010a7b..8a28116 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -10,7 +10,7 @@
 window#waybar {
     background-color: rgba(43, 48, 59, 0.5);
     border-bottom: 3px solid rgba(100, 114, 125, 0.5);
-    color: #ffffff;
+    color: #ffbbff;
     transition-property: background-color;
     transition-duration: .5s;
 }
@@ -40,7 +40,7 @@ window#waybar.chromium {
 #workspaces button {
     padding: 0 5px;
     background-color: transparent;
-    color: #ffffff;
+    color: #ffbbff;
     /* Use box-shadow instead of border so the text isn't offset */
     box-shadow: inset 0 -3px transparent;
 }
@@ -81,8 +81,8 @@ window#waybar.chromium {
 #mpd {
     padding: 0 10px;
     margin: 0 4px;
-    color: #ffffff;
-    border-radius:14px;
+    color: #ffbbff;
+    /* border-radius:14px; */
     /* background-image: linear-gradient(45deg, #6303B1, #ff0099); */
 }
 
@@ -102,23 +102,20 @@ window#waybar.chromium {
 }
 
 #clock {
-    background-color: #64727D;
+    box-shadow: inset 0 -3px#64727D;
 }
 
 #battery {
-    background-color: #ffffff;
-    color: #000000;
+    box-shadow: inset 0 -3px #ffffff;
 }
 
 #battery.charging {
-    color: #ffffff;
-    background-color: #26A65B;
+    box-shadow: inset 0 -3px #26A65B;
 }
 
 @keyframes blink {
     to {
         background-color: #ffffff;
-        color: #000000;
     }
 }
 
@@ -137,91 +134,88 @@ label:focus {
 }
 
 #cpu {
-    background-color: #2ecc71;
-    color: #000000;
+    box-shadow: inset 0 -3px #2ecc71;
 }
 
 #memory {
-    background-color: #9b59b6;
+    box-shadow: inset 0 -3px #9b59b6;
 }
 
 #backlight {
-    background-color: #90b1b1;
+    box-shadow: inset 0 -3px #90b1b1;
 }
 
 #network {
-    background-color: #2980b9;
+    box-shadow: inset 0 -3px #2980b9;
 }
 
 #network.disconnected {
-    background-color: #f53c3c;
+    box-shadow: inset 0 -3px #f53c3c;
 }
 
 #pulseaudio {
-    background-color: #f1c40f;
-    color: #000000;
+    box-shadow: inset 0 -3px #f1c40f;
 }
 
 #pulseaudio.muted {
-    background-color: #90b1b1;
+    box-shadow: inset 0 -3px #90b1b1;
     color: #2a5c45;
 }
 
 #custom-media {
-    background-color: #66cc99;
+    box-shadow: inset 0 -3px #66cc99;
     color: #2a5c45;
     min-width: 100px;
 }
 
 #custom-media.custom-spotify {
-    background-color: #66cc99;
+    box-shadow: inset 0 -3px #66cc99;
 }
 
 #custom-media.custom-vlc {
-    background-color: #ffa000;
+    box-shadow: inset 0 -3px #ffa000;
 }
 
 #temperature {
-    background-color: #f0932b;
+    box-shadow: inset 0 -3px #f0932b;
 }
 
 #temperature.critical {
-    background-color: #eb4d4b;
+    box-shadow: inset 0 -3px #eb4d4b;
 }
 
 #tray {
-    background-color: #2980b9;
+    box-shadow: inset 0 -3px #2980b9;
 }
 
 #idle_inhibitor {
-    background-color: #2d3436;
+    box-shadow: inset 0 -3px #2d3436;
 }
 
 #idle_inhibitor.activated {
-    background-color: #ecf0f1;
+    box-shadow: inset 0 -3px #ecf0f1;
     color: #2d3436;
 }
 
 #mpd {
-    background-color: #66cc99;
+    box-shadow: inset 0 -3px #66cc99;
     color: #2a5c45;
 }
 
 #mpd.disconnected {
-    background-color: #f53c3c;
+    box-shadow: inset 0 -3px #f53c3c;
 }
 
 #mpd.stopped {
-    background-color: #90b1b1;
+    box-shadow: inset 0 -3px #90b1b1;
 }
 
 #mpd.paused {
-    background-color: #51a37a;
+    box-shadow: inset 0 -3px #51a37a;
 }
 
 #language {
-    background: #00b093;
-    color: #740864;
+    box-shadow: inset 0 -3px #00b093;
     padding: 0 5px;
     margin: 0 5px;
     min-width: 16px;
diff --git a/.local/bin/dwm-session b/.local/bin/dwm-session
index ab4c18b..0900450 100755
--- a/.local/bin/dwm-session
+++ b/.local/bin/dwm-session
@@ -8,7 +8,6 @@ on_exit() {
 	[ -d "${state_path}" && -w "${state_path}" ] && rm -rf -- "${state_path}"
 }
 
-<<<<<<< HEAD
 # shotkey & 
 SXHKD_SHELL="/bin/dash"
 sxhkd -c $XDG_CONFIG_HOME/sxhkd/sxhkdwm &
@@ -19,10 +18,8 @@ clipmenud &
 mkfifo /tmp/backlightprcnt &
 tail -f /tmp/backlightprcnt | xob &
 volumewatch.py | xob &
-=======
 shotkey & 
 dwmst &
->>>>>>> d059b91a56abed9255a9cfe2d40509877468c3cc
 picom &
 wallpaper &
 dwm
diff --git a/.local/bin/wallpaper b/.local/bin/wallpaper
index e137479..49e8759 100755
--- a/.local/bin/wallpaper
+++ b/.local/bin/wallpaper
@@ -7,3 +7,14 @@ max=`find $imgdir/* | wc -l`
 sel=`find $imgdir/* | sed "${r}q;d"`
 
 feh --bg-fill -. "${sel}"
+# case `loginctl show-session 2- p Type` in
+#     '*X11')
+# 	feh --bg-fill -. "${sel}"
+# 	;;
+#     '*wayland')
+#     	swaybg -m fill -i "$sel)"
+# 	;;
+# 	*)
+# 	    echo unknown session
+# 	;;
+# esac
diff --git a/.xinitrc b/.xinitrc
index b20e6bf..a88d023 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -9,10 +9,7 @@ usermodmap=$XDG_CONFIG_HOME/Xmodmap
 sysresources=/etc/X11/xinit/.Xresources
 sysmodmap=/etc/X11/xinit/.Xmodmap
 
-<<<<<<< HEAD
 setxkbmap dk
-=======
->>>>>>> d059b91a56abed9255a9cfe2d40509877468c3cc
 setxkbmap -option caps:escape
 # merge in defaults and keymaps
 
@@ -46,11 +43,8 @@ pidof -s runit &&
 	setsid -f pulseaudio --start --exit-idle-time=-1 >/dev/null 2>&1
 
 if [ $TERM = linux ] || [ -e "/etc/systemd/system/graphical.target.wants/xlogin@$(whoami).service" ] ; then
-<<<<<<< HEAD
 # Here dwm is kept as default
-=======
 # Here Bspwm is kept as default
->>>>>>> d059b91a56abed9255a9cfe2d40509877468c3cc
 session=${1:-dwm}
 
 case $session in