From c0e35fbf4263d0b43b627573b0961ee6e6f37ff1 Mon Sep 17 00:00:00 2001 From: VectorKappa Date: Thu, 23 Sep 2021 11:41:41 +0200 Subject: [PATCH] Revert "Revert "Updated hotkeys, autostart apps and polybar config"" This reverts commit 8950439dc2584b773cb81daed0434f4566fcb340. --- alacritty/.config/alacritty/alacritty.yml | 16 +- bspwm/.config/bspwm/autostart | 37 ++- bspwm/.dmrc | 2 + common/.curlrc | 2 +- polybar/.config/polybar/config | 20 +- sxhkd/.config/sxhkd/sxhkdrc | 6 +- sxhkd/.config/sxhkd/sxhkdrc-minimal | 325 ---------------------- systemd_units/magic-sysrq-enabler.service | 15 + systemd_units/thinktrackfix.service | 15 + yay.sh | 16 +- 10 files changed, 110 insertions(+), 344 deletions(-) create mode 100644 bspwm/.dmrc delete mode 100755 sxhkd/.config/sxhkd/sxhkdrc-minimal create mode 100644 systemd_units/magic-sysrq-enabler.service create mode 100644 systemd_units/thinktrackfix.service mode change 100644 => 100755 yay.sh diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index 9f43937..1ee6f91 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -165,9 +165,19 @@ hints: # - (macOS) open # - (Linux/BSD) xdg-open # - (Windows) explorer - launcher: - program: xdg-open - args: [] + enabled: + - regex: "(ipfs:|ipns:|magnet:|mailto:|gemini:|gopher:|https:|http:|news:|file:|git:|ssh:|ftp:)[^\u0000-\u001F\u007F-\u009F<>\"\\s{-}\\^⟨⟩`]+" + command: xdg-open + post_processing: true + mouse: + enabled: true + mods: None + binding: + key: U + mods: Control|Shift + # launcher: + # program: xdg-open + #args: [] #key_bindings: #- { key: Paste, action: Paste } #- { key: Copy, action: Copy } diff --git a/bspwm/.config/bspwm/autostart b/bspwm/.config/bspwm/autostart index 149e73f..1aa2262 100755 --- a/bspwm/.config/bspwm/autostart +++ b/bspwm/.config/bspwm/autostart @@ -2,39 +2,70 @@ xsetroot -cursor_name left_ptr & export GTK2_RC_FILES="$HOME/.gtkrc-2.0" & xrdb merge .Xresources & -## Wallpaper. + +## Wallpaper. sh ~/.fehbg & + ## Composition manager -picom -b & +picom -b --experimental-backends --vsync & + ## enable local fonts in .fonts directory xset +fp /usr/share/fonts/local & xset +fp /usr/share/fonts/misc & xset +fp ~/.fonts & xset fp rehash & fc-cache -fv & + ## powersaving options xset s off & xset s noblank & xset s noexpose & xset c on & xset -dpms & + ## Make monitor settings persist between reboots eval $(awk -F'=' '/Exec=/ {print $2}' ~/.config/autostart/lxrandr-autostart.desktop) & + ## Map super key to trigger rofi when used alone xcape -e 'Super_L=Super_L|Shift_L|space' & +## Automagically set gap width based on amount of windows open +autogap & + ## Polkit agent polkit-dumb-agent & ## Gnome keyring gnome-keyring-daemon & +## Notification daemon dunst & + +## Set screen locker xss-lock -v i3lock-fancy-dualmonitor & -dockd --daemon & + +############################################################################################################################### +## Autostart apps ## +############################################################################################################################### + +## Screenshot daemon flameshot & + +## Autostart run_keybase -a & + +## Telegram daemon telegram-desktop -startintray & + +############################### +## THINKPAD-SPECIFIC ## +############################### +dockd --daemon & + + +############################################################################################################################### +## Launch polybar - Keep last! ## +############################################################################################################################### sleep 3 & $HOME/.config/polybar/launch.sh & diff --git a/bspwm/.dmrc b/bspwm/.dmrc new file mode 100644 index 0000000..2c5257e --- /dev/null +++ b/bspwm/.dmrc @@ -0,0 +1,2 @@ +[Desktop] +Session=bspwm diff --git a/common/.curlrc b/common/.curlrc index 481d94b..2f8e15c 100644 --- a/common/.curlrc +++ b/common/.curlrc @@ -1,5 +1,5 @@ # Disguise as IE 9 on Windows 7. -user-agent = "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)" +# user-agent = "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)" # When following a redirect, automatically set the previous URL as referer. referer = ";auto" diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config index b9935ca..8e5359f 100644 --- a/polybar/.config/polybar/config +++ b/polybar/.config/polybar/config @@ -55,6 +55,7 @@ font-0 = "SauceCodePro Nerd Font Mono:size=10" font-1 = unifont:fontformat=truetype:size=8:antialias=false;0 font-2 = siji:pixelsize=10;1 font-3 = "SauceCodePro Nerd Font Mono:size=16;4" +font-4 = "SauceCodePro Nerd Font Mono:size=13;2" modules-left = rofi bspwm modules-center = mpd title @@ -216,11 +217,11 @@ format-disconnected = ;label-disconnected = %ifname% disconnected ;label-disconnected-foreground = ${colors.foreground-alt} -ramp-signal-0 = ⠁ -ramp-signal-1 = ⠃ -ramp-signal-2 = ⠇ -ramp-signal-3 = ⡇ -ramp-signal-4 = ⣿ +ramp-signal-0 = ⣀ +ramp-signal-1 = ⣤ +ramp-signal-2 = ⣶ +ramp-signal-3 = ⣿ +ramp-signal-4 = █ ramp-signal-foreground = ${colors.foreground-alt} [module/eth] @@ -249,7 +250,7 @@ date-alt = " %Y-%m-%d" time = %H:%M time-alt = %H:%M:%S -format-prefix =  +format-prefix =  format-prefix-foreground = ${colors.foreground-alt} format-underline = #0a6cf5 @@ -322,10 +323,11 @@ format-charging-underline = #ffb52a format-discharging = format-discharging-underline = ${self.format-charging-underline} +format-full-font = 5 format-full-prefix = " " format-full-prefix-foreground = ${colors.foreground-alt} format-full-underline = ${self.format-charging-underline} - +ramp-font = 5 ramp-capacity-0 =  ramp-capacity-1 =  ramp-capacity-2 =  @@ -338,6 +340,7 @@ ramp-capacity-8 =  ramp-capacity-9 =  ramp-capacity-foreground = ${colors.foreground-alt} +animation-font = 5 animation-charging-0 =  animation-charging-1 =  animation-charging-2 =  @@ -365,6 +368,7 @@ label = %temperature-c% label-warn =  %temperature-c% label-warn-foreground = ${colors.secondary} +ramp-font = 5 ramp-0 =  ramp-1 =  ramp-2 =  @@ -402,7 +406,7 @@ menu-2-1-exec = menu-open-0 [module/rofi] type = custom/text -click-left = xlunch --bc 2e3440aa >> /tmp/xlunchlog.log 2>&1 +click-left = xlunch --input /etc/xlunch/entries.dsv --bc 2e3440aa >> /tmp/xlunchlog.log 2>&1 ;click-left = rofi -modi drun,run,window,calc -show drun content =  content-padding = 1 diff --git a/sxhkd/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc index d37c808..5397dcf 100755 --- a/sxhkd/.config/sxhkd/sxhkdrc +++ b/sxhkd/.config/sxhkd/sxhkdrc @@ -170,6 +170,8 @@ super + ctrl + {a,s,w,d} super + ctrl + {Left,Down,Up,Right} bspwm_resize.sh {west,south,north,east} +super + shift + r + bspwm_rename_desktop # # Layout manipulation/desktop level controls # ______________ @@ -341,7 +343,7 @@ XF86Launch1 rofi -modi drun,run,window,calc -show drun # make sxhkd reload its configuration files: super + shift + Escape - pkill -USR1 -x sxhkd + pkill -USR1 -x sxhkd && sxhkd alt + space rofi -modi drun,run,window,calc -show drun @@ -358,7 +360,7 @@ alt + ctrl + space # Toggle compositing super + ctrl + alt + space {pkill picom ,\ - picom -b } + picom -b --experimental-backends } # Remove receptacles super + BackSpace diff --git a/sxhkd/.config/sxhkd/sxhkdrc-minimal b/sxhkd/.config/sxhkd/sxhkdrc-minimal deleted file mode 100755 index f043837..0000000 --- a/sxhkd/.config/sxhkd/sxhkdrc-minimal +++ /dev/null @@ -1,325 +0,0 @@ -# bspwm hotkeys -# -# Cleanly quit bspwm -super + shift + q - bspc quit 1 && pkill lemonpanel && pkill lemonbar - -# Show keybindings -super + F1 - $TERMINAL -e keybindings.sh -# -# Window manipulation -# ______________ - -# Close window -super + x - bspc node -c - -# Kill window -super + shift + x - bspc node -k - -# Toggle tiling mode of window -super + shift + t - bspc node -t {pseudo_tiled,tiled} -super + t - {bspc node -t floating && window-placer $(bspc query -T -d | grep -o '"state":"floating"' | wc -l),bspc node -t tiled} -# Force all windows of the desktop to tile -super + ctrl + t - bspcp tile -# Force all windows of the desktop to float and arrange them -super + ctrl + shift + t - bspcp float - -# Toggle fullscreen -super + shift + f - bspc node -t {fullscreen,tiled} - -# Try to keep size and position of the selected window -super + o - bspc node -g private - -# Make window sticky -super + i - bspc node -g sticky - -# Lock a window from closing -super + Escape - bspc node -g locked - -### Map or unmap windows (functional equivalent of "minimize") -super + c - whid dmenu - -super + shift + c - whid hide - -super + ctrl + c - whid last - -# -# Window moving and splitting -# ______________ - -# Autopresel (split window in its largest dimension) -ctrl + space - auto-presel - -# Presel window for splitting in certain direction -alt + ctrl + {a,s,w,d} - bspc node -p \~{west,south,north,east} -i - -#alt + ctrl + {h,j,k,l} -# bspc node -p \~{west,south,north,east} - -alt + ctrl + {Left,Down,Up,Right} - bspc node -p \~{west,south,north,east} - -# Presel the desktop for splitting in certain direction -# alt + shift + {a,s,w,d} - # bspc node @/ -p \~{west,south,north,east} -# -# alt + shift + {h,j,k,l} - # bspc node @/ -p \~{west,south,north,east} - -# alt + shift + {Left,Down,Up,Right} - # bspc node @/ -p \~{west,south,north,east} -# Set splitting ratio of windows -alt + ctrl + {1-9} - bspc node -o 0.{1-9} - -# Move current window to largest space or preselected area if there is one. -super + Return - windowpromoter - -# Create a new "master area", splitting the whole desktop instead of just windows. -alt + Return - bspc node -n @/ - -# go (Shift=move) to desktop (and focus the monitor that the desktop is located on. Bspwm style) -super + {_,shift + }{1-9,0} - bspc {desktop -f,node -d} ^{1-9,10} - -## Alternative: i3 style behavior (focus nth, desktop of the focused monitor) -#super + {1-9,0} -# focusdesktopofthismonitor {1-9} -#super + shift + {1-9,0} -# movetodesktopofthismonitor {1-9,10} - -## Another alternative: xmonad style desktops. You have 10 desktops shared between all monitors, -## and focusing a desktop focuses it on the currently focused monitor -#super + {1-9,0} -# summondesktop.sh {1-9,10} -#super + shift + {1-9,0} -# bspc node -d ^{1-9,10} - -# Select previous / next desktop -super + {m,n} - bspc desktop -f {prev.occupied,next.occupied} - -# cycle windows -alt + {_,shift + }Tab - bspc node -f {next,prev} - -# Go to specific window -super + Tab - WindowSelector - -#Focus windows by direction, works with multihead -super + {a,s,w,d} - focusmover {west,south,north,east} - -#super + {h,j,k,l} -# focusmover {west,south,north,east} - -super + {Left,Down,Up,Right} - focusmover {west,south,north,east} - -# Move tiled windows. Moving a tiled window to -# preselected one moves into preselection instead. -# Moving out of the screen should move the window to next monitor if possible -super + shift + {a,s,w,d} - windowgrabber {west,south,north,east} - -#super + shift + {h,j,k,l} -# windowgrabber {west,south,north,east} - -# Different style of movement: transplant into window in chosen direction -super + shift + {Left,Down,Up,Right} - euclid_mover {west,south,north,east} - -#resize windows -super + ctrl + {a,s,w,d} - bspwm_resize.sh {west,south,north,east} - -#super + ctrl + {h,j,k,l} -# bspwm_resize.sh {west,south,north,east} - -super + ctrl + {Left,Down,Up,Right} - bspwm_resize.sh {west,south,north,east} - -# -# Layout manipulation/desktop level controls -# ______________ - -# Toggle monocle mode -super + f - bspc desktop -l next - -# Balance tree -super + b - bspc node @/ -B - -# Balance brother node. If you do this on biggest window of the desktop, it usually means balancing all windows with except the biggest. -super + alt + b - bspc node @brother -B - -# Undo balancing (equalize windows) -super + ctrl + b - bspc node @/ -E - -# Toggle automatic balancing of windows -alt + b - euclid_balancer - -# Mirror and flip leaves of tree -super + {comma,period} - bspc node @/ -F {horizontal,vertical} - -# Rotate leaves of tree -super + shift + {comma,period} - bspc node @/ -R {90,270} - -# Change window gap - -super + g - bspc config -d focused window_gap {$gap,$(($gap+$gap)),$(($gap+$gap+$gap))} - -super + button{4,5} - bspc config -d focused window_gap $((`bspc config -d focused window_gap` {+,-} 2 )) -# -# mouse bindings -# __________________ - -~button1 - DidIClickDesktop.sh && gapgrab - -~button2 - DidIClickDesktop.sh && BspwmDesktopMenu -# DidIClickDesktop.sh && mygtkmenui -- .config/GTKmenu/BspwmDesktopMenui -# DidIClickDesktop.sh && mygtkmenui -- .config/GTKmenu/BspwmWindowMenui - -~button3 - DidIClickDesktop.sh && rofimenu -desktop -#DidIClickDesktop.sh && mygtkmenui -- .config/GTKmenu/LaunchMenu - -# Switch workspace by scrolling on the desktop. Causes scrolling issues on some systems. -#~button4 -# DidIClickDesktop.sh && bspc desktop -f next -#~button5 -# DidIClickDesktop.sh && bspc desktop -f prev - -### Add or remove desktops by scrolling -super + ctrl + button5 - bspcp dsktp rm - -super + ctrl + button4 - bspcp dsktp add - -# Spawn applications popup menu and manually tile selected -# app where your mouse was when you opened the menu. Smartsplit only chooses -# biggest dimension of the window, MouseLaunch only cares which edge is closer. -# mod5 is alt_gr (first key right from space) on most keyboards. -mod5 + @button1 - smartsplit ; rofimenu -desktop -# smartsplit ; dboxmenu -# MouseLaunch ; mygtkmenui -- .config/GTKmenu/LaunchMenu - -# Spawn window manipulation menu -# Mod1 is alt -mod1 + @button1 - BspwmWindowMenu -# mygtkmenui -- .config/GTKmenu/BspwmWindowMenui - - -# -# Touchpad "gestures" (depend on your touchpad driver, very likely to be unavailable) -#_____________________ - -# -# spawn programs -# - -# run applications -super + space - dmenu_recent -fn 'xos4 Terminus:size=15' -i -l 14 -w 600 -y $PANEL_HEIGHT - -super + shift + space - rofi -show - -#super + p -# dmenu_recent -h $PANEL_HEIGHT -fn 'xos4 Terminus:size=15' -i - -super + shift + Return - default-terminal -super + z - default-terminal - -super + shift + z - open-terminal-here - -super + r - rofi-finder.sh - -super + shift + b - $BROWSER - -super + e - default-terminal ranger -#spacefm -n - -Print - scrot - - -# -# Media keys -# - -XF86AudioRaiseVolume - volume up - -XF86AudioLowerVolume - volume down - -XF86AudioMute - volume mute - -XF86MonBrightnessDown - light -U 5 - -XF86MonBrightnessUp - light -A 5 - - -XF86Sleep - systemctl suspend - -# make sxhkd reload its configuration files: -super + shift + Escape - pkill -USR1 -x sxhkd - -# In case bspwmrc fails to execute/you wish have plugged in a new monitor -super + shift + r - bspwmrc -#edit this file -alt + ctrl + space - $GUI_EDITOR ~/.config/sxhkd/sxhkdrc -# Toggle compositing -super + ctrl + space - {pkill compton ,\ - compton -b } - -# Remove receptacles -super + BackSpace - for i in $(bspc query -N -n .leaf.!window.local); do bspc node $i -k; done diff --git a/systemd_units/magic-sysrq-enabler.service b/systemd_units/magic-sysrq-enabler.service new file mode 100644 index 0000000..f79c60d --- /dev/null +++ b/systemd_units/magic-sysrq-enabler.service @@ -0,0 +1,15 @@ +[Unit] +Description=Magic Sysrq key enabler + +Wants=network.target +After=default.target + +[Service] +Type=simple +ExecStart=/usr/bin/magic-sysrq-enable +Restart=on-failure +RestartSec=10 +KillMode=process + +[Install] +WantedBy=default.target diff --git a/systemd_units/thinktrackfix.service b/systemd_units/thinktrackfix.service new file mode 100644 index 0000000..14451de --- /dev/null +++ b/systemd_units/thinktrackfix.service @@ -0,0 +1,15 @@ +[Unit] +Description=Thinkpad Trackpoint sensitivity fix + +Wants=network.target +After=default.target + +[Service] +Type=simple +ExecStart=/usr/bin/set-trackpoint-sensitivity +Restart=on-failure +RestartSec=10 +KillMode=process + +[Install] +WantedBy=default.target diff --git a/yay.sh b/yay.sh old mode 100644 new mode 100755 index 41ca691..ad2f93e --- a/yay.sh +++ b/yay.sh @@ -64,6 +64,18 @@ yay -S \ gnome-keyring \ i3lock-fancy-dualmonitors-git \ lxrandr \ - feh - + feh \ + nano \ + nemo \ + nemo-fileroller \ + nemo-preview \ + nemo-image-converter \ + nemo-seahorse \ + nemo-terminal \ + fprint \ + cups \ + dnsmasq \ + etckeeper \ + flameshot \ + jshon