From ebbcdbfe2a37851ee84af548869a545cebecc615 Mon Sep 17 00:00:00 2001 From: kevindirect Date: Sat, 19 Aug 2023 20:26:18 -0700 Subject: [PATCH] optimus-manager->envycontrol,lf->joshuto --- .Xresources | 2 +- .config/.gitignore | 1 + .config/bspwm/bspwmrc | 3 +-- .config/lemurs/wms/.xinitrc | 1 + .config/lemurs/wms/bspwm | 7 +++++++ .config/picom/picom.conf | 19 ++++++------------- .config/polybar/config.ini | 29 +---------------------------- .config/qutebrowser/config.yml | 2 +- .config/sxhkd/sxhkdrc | 10 +++++----- .local/bin | 2 +- .profile | 4 ++-- .xinitrc | 14 +++++++------- README.md | 3 +-- 13 files changed, 35 insertions(+), 62 deletions(-) create mode 120000 .config/lemurs/wms/.xinitrc create mode 100755 .config/lemurs/wms/bspwm diff --git a/.Xresources b/.Xresources index 7e829eb..d182012 100644 --- a/.Xresources +++ b/.Xresources @@ -7,7 +7,7 @@ !! Global and Terminal Font Settings !! (Set Monospace font alias in $XDG_CONFIG_HOME/fontconfig/fonts.conf) -*.font: Monospace:pixelsize=32:dpi:192:antialias:true:autohint:false:hinting:true; 32 +*.font: Monospace:pixelsize=28:dpi:192:antialias:true:autohint:false:hinting:true; 28 Xft.antialias: true Xft.autohint: false Xft.hinting: true diff --git a/.config/.gitignore b/.config/.gitignore index f589b68..8b04b88 100644 --- a/.config/.gitignore +++ b/.config/.gitignore @@ -20,6 +20,7 @@ !/joshuto/** !/julia/** !/kak/** +!/lemurs/** !/lf/** !/ncmpcpp/** !/neofetch/** diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index 7516933..2f59a3d 100755 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -53,9 +53,8 @@ bspc config window_gap 8 # Rules bspc rule -r "*" state=tiled sticky=off follow=off -bspc rule -a Qutebrowser focus=on state=tiled sticky=off follow=off +# bspc rule -a Qutebrowser focus=off state=tiled sticky=off follow=off bspc rule -a Zathura state=tiled follow=off sticky=off -bspc rule -a RuneLite state=floating # bspc rule -a Nyxt state=tiled #bspc rule -a Gimp desktop='^8' state=floating follow=on #bspc rule -a Chromium desktop='^2' diff --git a/.config/lemurs/wms/.xinitrc b/.config/lemurs/wms/.xinitrc new file mode 120000 index 0000000..578de72 --- /dev/null +++ b/.config/lemurs/wms/.xinitrc @@ -0,0 +1 @@ +/home/kev/.xinitrc \ No newline at end of file diff --git a/.config/lemurs/wms/bspwm b/.config/lemurs/wms/bspwm new file mode 100755 index 0000000..8430341 --- /dev/null +++ b/.config/lemurs/wms/bspwm @@ -0,0 +1,7 @@ +#!/bin/sh +# defines the bspwm environment for lemurs + +[ "$(gfxmode)" = 'nvidia' ] && polybar-msg cmd restart # polybar misses bspwm socket on nvidia mode + +sxhkd & +exec bspwm -c "$XDG_CONFIG_HOME/bspwm/bspwmrc" diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index 7f96df7..f486d7c 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -13,20 +13,13 @@ fading = true; fade-in-step = 0.1; fade-out-step = 0.1; -# Transparency Rules TODO - port floating windows to bspwm rice -#opacity-rule = [ -# "100:focused && I3_FLOATING_WINDOW@:32c = 1 && _NET_WM_STATE@:a = '_NET_WM_STATE_STICKY'", # focused hovering window -# "60:!focused && I3_FLOATING_WINDOW@:32c = 1 && _NET_WM_STATE@:a = '_NET_WM_STATE_STICKY'" # unfocused hovering window -# #"80:name = 'st'" -# #"80:name = 'st-256color'" -#]; +# backend = "xrender"; # default +# backend = "glx"; +# backend = "xr_glx_hybrid"; -# GLX Backend -backend = "glx"; -vsync = true; # Reduces single monitor tearing -#vsync = "opengl-oml"; # Also reduces single monitor tearing - -use-damage = false # Fixes flickering window issue that started after version 7.5: https://github.com/yshui/picom/issues/375 +# vsync = true; # Reduces single monitor tearing +# vsync = "opengl-oml"; # Also reduces single monitor tearing +# use-damage = false # Fixes flickering window issue that started after version 7.5: https://github.com/yshui/picom/issues/375 # Brodies screen tearing options #glx-no-stencil = true; diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini index c0f0a71..a08c308 100644 --- a/.config/polybar/config.ini +++ b/.config/polybar/config.ini @@ -23,6 +23,7 @@ linecolorDark = #cccccc ;Top bar [bar/main] +enable-ipc = true ;Location ;--------- @@ -102,34 +103,6 @@ tray-padding = 1 ;-----------------; ; Builtin Modules ; ;-----------------; -; [module/i3] -; type = internal/i3 -; pin-workspaces = true -; strip-wsnumbers = false -; enable-scroll = false -; ws-icon-0 = 1;%{T5}1%{T-} -; ws-icon-1 = 2;%{T5}2%{T-} -; ws-icon-2 = 3;%{T5}3%{T-} -; ws-icon-3 = 4;%{T5}4%{T-} -; ws-icon-4 = 5;%{T5}5%{T-} -; ws-icon-5 = 6;%{T5}6%{T-} -; ws-icon-6 = 7;%{T5}7%{T-} -; ws-icon-7 = 8;%{T5}8%{T-} -; ws-icon-8 = 9;%{T5}9%{T-} -; ws-icon-9 = 0;%{T5}0%{T-} -; label-focused = %icon% -; label-focused-foreground = ${colors.linecolor} -; label-focused-padding = 1 -; label-unfocused = %icon% -; label-unfocused-foreground = ${colors.linecolorDark} -; label-unfocused-padding = 1 -; label-visible = %icon% -; label-visible-foreground = ${colors.linecolorDark} -; label-visible-padding = 1 -; label-separator = | -; label-separator-padding = 0.6 - - [module/bspwm] type = internal/bspwm pin-workspaces = true diff --git a/.config/qutebrowser/config.yml b/.config/qutebrowser/config.yml index 0dea698..9ea6752 100644 --- a/.config/qutebrowser/config.yml +++ b/.config/qutebrowser/config.yml @@ -151,7 +151,7 @@ window.hide_decoration: True ## ZOOM # 250% puts most text at about .24" height # Based on tan(.6°) * distance where distance = 24" -zoom.default: '175%' +zoom.default: '85%' ## FONTS # fonts.default_size: '10px' diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index 0f807dc..415887c 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -44,9 +44,9 @@ super + z super + f $TERMINAL -e $FILE -# Joshtuo File manager (experimental) -super + shift + z - $TERMINAL -e joshuto +# +# super + shift + z +# $TERMINAL -e # Web browser ($BROWSER env variable) super + b @@ -208,9 +208,9 @@ super + shift + BackSpace super + shift + x prompt 'Shutdown computer?' 'sudo -A shutdown -h now' -# Switch graphics (nvidia<->hybrid) +# Switch startup graphics mode (nvidia<->hybrid) super + shift + n - prompt 'switch graphics?' "$XDG_SCRIPT_HOME/gfxtools/gfxswitch" + prompt 'Switch startup graphics mode?' "$XDG_SCRIPT_HOME/gfxtools/gfxstartswitch" # Change display super + F3 diff --git a/.local/bin b/.local/bin index e5323c5..22cebe7 160000 --- a/.local/bin +++ b/.local/bin @@ -1 +1 @@ -Subproject commit e5323c59cf05febc93da13a68eb9ec41e0a0db92 +Subproject commit 22cebe7c2d272d19272c39a164ec4beb08aa5c80 diff --git a/.profile b/.profile index 1293ea3..d83646e 100644 --- a/.profile +++ b/.profile @@ -28,7 +28,7 @@ export EDITOR=$VISUAL export PAGER='bat' export BROWSER='qutebrowser' export READER='zathura' -export FILE='lf' +export FILE='joshuto' export TASK_CLIENT='superproductivity' export EMAIL_CLIENT='tutanota-desktop' export BIB="$HOME/Documents/LaTeX/uni.bib" @@ -94,7 +94,7 @@ export LF_ICONS="di=:fi=:tw=:ow=:ln=:or=:ex=󱐌:\ # echo "$0" | grep "zsh$" >/dev/null && [ -f "$ZDOTDIR/.zshrc" ] && source "$ZDOTDIR/.zshrc" # Start graphical server if bspwm not already running -[ "$(tty)" = "/dev/tty1" ] && ! pgrep -x bspwm >/dev/null && exec startx +# [ "$(tty)" = "/dev/tty1" ] && ! pgrep -x bspwm >/dev/null && exec startx # Switch escape <-> caps for tty sudo -n loadkeys "$XDG_SCRIPT_HOME/ttymaps.kmap" 2>/dev/null diff --git a/.xinitrc b/.xinitrc index 66b95e3..dc48558 100755 --- a/.xinitrc +++ b/.xinitrc @@ -7,13 +7,13 @@ # Xorg runtime config file. displayset & # Set the display/background -sxhkd & # Bind hotkeys -setxkbmap -option caps:super -option altwin:menu_win && \ # Map caps to mod, menu button to win, details: /usr/share/X11/xkb/rules/evdev.lst - killall xcape 2>/dev/null ; xcape -e 'Super_L=Escape' & # Mod by itself is now escape, TODO: do the same for right window button -xset r rate 300 50 & # Increase xrate, speeds up key input -unclutter & # Remove mouse when idle +exec "$XDG_CONFIG_HOME/polybar/launch.sh" & picom --config "$XDG_CONFIG_HOME/picom/picom.conf" & # picom for transparency and to reduce tearing dunst & # dunst for notifications +xset r rate 300 50 & # Increase xrate, speeds up key input +unclutter & # Remove mouse when idle redshift -l "$("$XDG_SCRIPT_HOME/apitools/geoloc" | tr ',' ':')" & -exec "$XDG_CONFIG_HOME/polybar/launch.sh" & -exec bspwm -c "$XDG_CONFIG_HOME/bspwm/bspwmrc" +setxkbmap -option caps:super -option altwin:menu_win && \ # Map caps to mod, menu button to win, details: /usr/share/X11/xkb/rules/evdev.lst + killall xcape 2>/dev/null ; xcape -e 'Super_L=Escape' # Mod by itself is now escape, TODO: do the same for right window button + +[ -f "$HOME/.Xresources" ] && xrdb -merge "$HOME/.Xresources" # for some reason lemurs doesnt load Xresources properly (issue #153) diff --git a/README.md b/README.md index ac371fb..1eaafb9 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,7 @@ My [arch linux](https://archlinux.org/) / [bspwm](https://github.com/baskerville * compositor: [picom](https://github.com/yshui/picom) * terminal: [xst](https://github.com/gnotclub/xst) (a [st](https://st.suckless.org) fork) || [alacritty](https://alacritty.org) (backup) * status bar: [polybar](https://polybar.github.io) +* file manager: [joshuto](https://github.com/kamiyaa/joshuto) * file manager: [lf](https://pkg.go.dev/github.com/gokcehan/lf) && [pistol](https://github.com/doronbehar/pistol) && [dragon](https://github.com/mwh/dragon) * notifications: [dunst](https://dunst-project.org) * launcher: [rofi](https://github.com/davatorium/rofi) @@ -73,9 +74,7 @@ My [arch linux](https://archlinux.org/) / [bspwm](https://github.com/baskerville ## TODO * nushell -* lf -> joshuto * bspwm -> leftwm? -* lightdm -> lemurs (wait until v1.0) * more tmux config (or tab-rs) * swhkd * check out [luakit](https://github.com/luakit/luakit)