Skip to content

Commit

Permalink
optimus-manager->envycontrol,lf->joshuto
Browse files Browse the repository at this point in the history
  • Loading branch information
kpa28-git committed Aug 20, 2023
1 parent 576964c commit ebbcdbf
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 62 deletions.
2 changes: 1 addition & 1 deletion .Xresources
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions .config/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
!/joshuto/**
!/julia/**
!/kak/**
!/lemurs/**
!/lf/**
!/ncmpcpp/**
!/neofetch/**
Expand Down
3 changes: 1 addition & 2 deletions .config/bspwm/bspwmrc
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 1 addition & 0 deletions .config/lemurs/wms/.xinitrc
7 changes: 7 additions & 0 deletions .config/lemurs/wms/bspwm
Original file line number Diff line number Diff line change
@@ -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"
19 changes: 6 additions & 13 deletions .config/picom/picom.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
29 changes: 1 addition & 28 deletions .config/polybar/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ linecolorDark = #cccccc

;Top bar
[bar/main]
enable-ipc = true

;Location
;---------
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .config/qutebrowser/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
10 changes: 5 additions & 5 deletions .config/sxhkd/sxhkdrc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .local/bin
Submodule bin updated from e5323c to 22cebe
4 changes: 2 additions & 2 deletions .profile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions .xinitrc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit ebbcdbf

Please sign in to comment.