updated vimrc

.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 */

.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

.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

.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
 

.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%

.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"

.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*)

.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.

.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";
 

.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