update Makefile system + clean up
This commit is contained in:
joachimschmidt557
parent
f6f011b4f2
commit
c7ba83acf9
6 changed files with 34 additions and 191 deletions
33
Makefile
33
Makefile
|
|
@ -1,14 +1,11 @@
|
||||||
DESTDIR=$(HOME)
|
DESTDIR=$(HOME)
|
||||||
PREFIX=/.config
|
PREFIX=/.config
|
||||||
|
|
||||||
fish:
|
fish: $(DESTDIR)$(PREFIX)/fish/config.fish
|
||||||
install -Dm600 fish/config.fish $(DESTDIR)$(PREFIX)/fish/config.fish
|
|
||||||
|
|
||||||
i3:
|
i3: $(DESTDIR)$(PREFIX)/i3/config
|
||||||
install -Dm600 i3/config $(DESTDIR)$(PREFIX)/i3/config
|
|
||||||
|
|
||||||
i3status:
|
i3status: $(DESTDIR)$(PREFIX)/i3status/config
|
||||||
install -Dm600 i3status/config $(DESTDIR)$(PREFIX)/i3status/config
|
|
||||||
|
|
||||||
vis:
|
vis:
|
||||||
install -Dm600 vis/visrc.lua $(DESTDIR)$(PREFIX)/vis/visrc.lua
|
install -Dm600 vis/visrc.lua $(DESTDIR)$(PREFIX)/vis/visrc.lua
|
||||||
|
|
@ -17,20 +14,28 @@ vis:
|
||||||
Xresources:
|
Xresources:
|
||||||
install -Dm600 Xresources $(DESTDIR)/.Xresources
|
install -Dm600 Xresources $(DESTDIR)/.Xresources
|
||||||
|
|
||||||
bspwm:
|
|
||||||
install -Dm700 bspwm/bspwmrc $(DESTDIR)$(PREFIX)/bspwm/bspwmrc
|
|
||||||
|
|
||||||
sxhkd:
|
|
||||||
install -Dm600 sxhkd/sxhkdrc $(DESTDIR)$(PREFIX)/sxhkd/sxhkdrc
|
|
||||||
|
|
||||||
fontconfig:
|
fontconfig:
|
||||||
install -Dm600 fontconfig/fonts.conf $(DESTDIR)$(PREFIX)/fontconfig/fonts.conf
|
install -Dm600 fontconfig/fonts.conf $(DESTDIR)$(PREFIX)/fontconfig/fonts.conf
|
||||||
fc-cache
|
fc-cache
|
||||||
|
|
||||||
srcfile:
|
srcfile: $(DESTDIR)/src/.srcfile
|
||||||
ln -sf $(PWD)/srcfiles/src $(DESTDIR)/src/.srcfile
|
|
||||||
|
|
||||||
st:
|
st:
|
||||||
install -Dm600 st/config.def.h $(DESTDIR)/src/st/config.def.h
|
install -Dm600 st/config.def.h $(DESTDIR)/src/st/config.def.h
|
||||||
|
|
||||||
.PHONY: fish i3 i3status vis Xresources bspwm sxhkd fontconfig srcfile st
|
.PHONY: fish i3 i3status vis Xresources bspwm sxhkd fontconfig srcfile st
|
||||||
|
|
||||||
|
|
||||||
|
## Actual file operations
|
||||||
|
|
||||||
|
$(DESTDIR)$(PREFIX)/fish/config.fish: $(PWD)/fish/config.fish
|
||||||
|
ln -sf $^ $@
|
||||||
|
|
||||||
|
$(DESTDIR)$(PREFIX)/i3/config: $(PWD)/i3/config
|
||||||
|
ln -sf $^ $@
|
||||||
|
|
||||||
|
$(DESTDIR)$(PREFIX)/i3status/config: $(PWD)/i3status/config
|
||||||
|
ln -sf $^ $@
|
||||||
|
|
||||||
|
$(DESTDIR)/src/.srcfile: $(PWD)/srcfiles/src
|
||||||
|
ln -sf $^ $@
|
||||||
|
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
sxhkd &
|
|
||||||
|
|
||||||
bspc monitor -d I II III IV V VI VII VIII IX X
|
|
||||||
|
|
||||||
bspc config border_width 2
|
|
||||||
bspc config window_gap 0
|
|
||||||
|
|
||||||
bspc config split_ratio 0.5
|
|
||||||
bspc config borderless_monocle true
|
|
||||||
bspc config gapless_monocle true
|
|
||||||
|
|
||||||
bspc rule -a Gimp desktop='^8' state=floating follow=on
|
|
||||||
bspc rule -a Chromium desktop='^2'
|
|
||||||
bspc rule -a mplayer2 state=floating
|
|
||||||
bspc rule -a Kupfer.py focus=on
|
|
||||||
bspc rule -a Screenkey manage=off
|
|
||||||
|
|
@ -1,39 +1,19 @@
|
||||||
# Custom fish config
|
set -gx PATH /opt/jdk8u242-b08/bin $PATH
|
||||||
|
set -gx PATH $HOME/src/nim/bin $PATH
|
||||||
# Set path
|
set -gx PATH $HOME/src/zig/build/bin $PATH
|
||||||
set -gx PATH $HOME/nim/bin $PATH
|
|
||||||
set -gx PATH $HOME/.nimble/bin $PATH
|
set -gx PATH $HOME/.nimble/bin $PATH
|
||||||
set -gx PATH $HOME/.cabal/bin $PATH
|
set -gx PATH $HOME/.ghcup/bin $PATH
|
||||||
set -gx PATH $HOME/crystal/bin $PATH
|
set -gx PATH $HOME/racket/bin $PATH
|
||||||
set -gx PATH $HOME/.cargo/bin $PATH
|
set -gx PATH $HOME/.cargo/bin $PATH
|
||||||
set -gx PATH $HOME/bin $PATH
|
set -gx PATH /usr/local/lib/nodejs/node-v12.15.0-linux-x64/bin $PATH
|
||||||
set -gx PATH /usr/local/go/bin $PATH
|
|
||||||
set -gx PATH $HOME/go/bin $PATH
|
|
||||||
set -gx PATH $HOME/zig/build $PATH
|
|
||||||
set -gx PATH /usr/local/lib/nodejs/node-v12.12.0-linux-x64/bin $PATH
|
|
||||||
|
|
||||||
# TeXLive
|
|
||||||
set -gx PATH /usr/local/texlive/2019/bin/x86_64-linux $PATH
|
|
||||||
set -gx MANPATH :/usr/local/texlive/2019/texmf-dist/doc/man
|
|
||||||
set -gx INFOPATH /usr/local/texlive/2019/texmf-dist/doc/info $INFOPATH
|
|
||||||
|
|
||||||
set -gx INFOPATH /usr/local/share/info $INFOPATH
|
|
||||||
|
|
||||||
# Environment vars
|
|
||||||
# Set EDITOR
|
|
||||||
set -gx EDITOR /usr/local/bin/vis
|
set -gx EDITOR /usr/local/bin/vis
|
||||||
|
|
||||||
# Set NIMM_OPEN
|
# Nice aliases
|
||||||
set -gx NIMMM_OPEN $HOME/bin/nope
|
alias m='nimmm'
|
||||||
|
alias gs='git status'
|
||||||
|
alias gp='git pull'
|
||||||
|
alias e='emacs & ; disown'
|
||||||
|
|
||||||
# GOPATH
|
# opam configuration
|
||||||
set -gx GOPATH $HOME/go
|
source /home/joachim/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true
|
||||||
|
|
||||||
# Quicker quitting
|
|
||||||
alias :q=exit
|
|
||||||
alias m=nimmm
|
|
||||||
alias emacs='env TERM=xterm-256color emacs'
|
|
||||||
alias emacsclient='env TERM=xterm-256color emacsclient -t'
|
|
||||||
|
|
||||||
# Vi key bindings
|
|
||||||
fish_vi_key_bindings
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
function fish_greeting --description 'Print greeting'
|
|
||||||
echo "Welcome to fish"
|
|
||||||
echo "What's up today:"
|
|
||||||
calcurse -a
|
|
||||||
end
|
|
||||||
|
|
@ -206,3 +206,5 @@ git git@github.com:joachimschmidt557/zig-clap zig-clap
|
||||||
git git@github.com:joachimschmidt557/zig zig-fork
|
git git@github.com:joachimschmidt557/zig zig-fork
|
||||||
git git@github.com:joachimschmidt557/auspice auspice-fork
|
git git@github.com:joachimschmidt557/auspice auspice-fork
|
||||||
git git@github.com:d120/djangocms djangocms
|
git git@github.com:d120/djangocms djangocms
|
||||||
|
git https://github.com/Nazgul07/BitCrypt BitCrypt
|
||||||
|
git https://github.com/fengb/wazm wazm
|
||||||
|
|
|
||||||
121
sxhkd/sxhkdrc
121
sxhkd/sxhkdrc
|
|
@ -1,121 +0,0 @@
|
||||||
#
|
|
||||||
# wm independent hotkeys
|
|
||||||
#
|
|
||||||
|
|
||||||
# terminal emulator
|
|
||||||
super + Return
|
|
||||||
st
|
|
||||||
|
|
||||||
# program launcher
|
|
||||||
super + @space
|
|
||||||
dmenu_run
|
|
||||||
|
|
||||||
# make sxhkd reload its configuration files:
|
|
||||||
super + Escape
|
|
||||||
pkill -USR1 -x sxhkd
|
|
||||||
|
|
||||||
#
|
|
||||||
# bspwm hotkeys
|
|
||||||
#
|
|
||||||
|
|
||||||
# quit/restart bspwm
|
|
||||||
super + alt + {q,r}
|
|
||||||
bspc {quit,wm -r}
|
|
||||||
|
|
||||||
# close and kill
|
|
||||||
super + {_,shift + }w
|
|
||||||
bspc node -{c,k}
|
|
||||||
|
|
||||||
# alternate between the tiled and monocle layout
|
|
||||||
super + m
|
|
||||||
bspc desktop -l next
|
|
||||||
|
|
||||||
# send the newest marked node to the newest preselected node
|
|
||||||
super + y
|
|
||||||
bspc node newest.marked.local -n newest.!automatic.local
|
|
||||||
|
|
||||||
# swap the current node and the biggest node
|
|
||||||
super + g
|
|
||||||
bspc node -s biggest
|
|
||||||
|
|
||||||
#
|
|
||||||
# state/flags
|
|
||||||
#
|
|
||||||
|
|
||||||
# set the window state
|
|
||||||
super + {t,shift + t,s,f}
|
|
||||||
bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
|
|
||||||
|
|
||||||
# set the node flags
|
|
||||||
super + ctrl + {m,x,y,z}
|
|
||||||
bspc node -g {marked,locked,sticky,private}
|
|
||||||
|
|
||||||
#
|
|
||||||
# focus/swap
|
|
||||||
#
|
|
||||||
|
|
||||||
# focus the node in the given direction
|
|
||||||
super + {_,shift + }{h,j,k,l}
|
|
||||||
bspc node -{f,s} {west,south,north,east}
|
|
||||||
|
|
||||||
# focus the node for the given path jump
|
|
||||||
super + {p,b,comma,period}
|
|
||||||
bspc node -f @{parent,brother,first,second}
|
|
||||||
|
|
||||||
# focus the next/previous node in the current desktop
|
|
||||||
super + {_,shift + }c
|
|
||||||
bspc node -f {next,prev}.local
|
|
||||||
|
|
||||||
# focus the next/previous desktop in the current monitor
|
|
||||||
super + bracket{left,right}
|
|
||||||
bspc desktop -f {prev,next}.local
|
|
||||||
|
|
||||||
# focus the last node/desktop
|
|
||||||
super + {grave,Tab}
|
|
||||||
bspc {node,desktop} -f last
|
|
||||||
|
|
||||||
# focus the older or newer node in the focus history
|
|
||||||
super + {o,i}
|
|
||||||
bspc wm -h off; \
|
|
||||||
bspc node {older,newer} -f; \
|
|
||||||
bspc wm -h on
|
|
||||||
|
|
||||||
# focus or send to the given desktop
|
|
||||||
super + {_,shift + }{1-9,0}
|
|
||||||
bspc {desktop -f,node -d} '^{1-9,10}'
|
|
||||||
|
|
||||||
#
|
|
||||||
# preselect
|
|
||||||
#
|
|
||||||
|
|
||||||
# preselect the direction
|
|
||||||
super + ctrl + {h,j,k,l}
|
|
||||||
bspc node -p {west,south,north,east}
|
|
||||||
|
|
||||||
# preselect the ratio
|
|
||||||
super + ctrl + {1-9}
|
|
||||||
bspc node -o 0.{1-9}
|
|
||||||
|
|
||||||
# cancel the preselection for the focused node
|
|
||||||
super + ctrl + space
|
|
||||||
bspc node -p cancel
|
|
||||||
|
|
||||||
# cancel the preselection for the focused desktop
|
|
||||||
super + ctrl + shift + space
|
|
||||||
bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
|
|
||||||
|
|
||||||
#
|
|
||||||
# move/resize
|
|
||||||
#
|
|
||||||
|
|
||||||
# expand a window by moving one of its side outward
|
|
||||||
super + alt + {h,j,k,l}
|
|
||||||
bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}
|
|
||||||
|
|
||||||
# contract a window by moving one of its side inward
|
|
||||||
super + alt + shift + {h,j,k,l}
|
|
||||||
bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}
|
|
||||||
|
|
||||||
# move a floating window
|
|
||||||
super + {Left,Down,Up,Right}
|
|
||||||
bspc node -v {-20 0,0 20,0 -20,20 0}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue