From c53bd8ed04c0f71c28cd96aab78905ec8a5b6b24 Mon Sep 17 00:00:00 2001 From: Jellyfish Date: Sat, 18 Jan 2025 16:58:58 -0800 Subject: [PATCH] updated Makefile with current code interests --- .config/bspwm/bspwmrc | 12 ++++ .config/pulse/aurelia-runtime | 1 + .config/sxhkd/sxhkdrc | 121 ++++++++++++++++++++++++++++++++++ .config/wezterm/wezterm.lua | 12 ++++ Makefile | 23 +++---- setup.sh | 6 -- 6 files changed, 154 insertions(+), 21 deletions(-) create mode 100755 .config/bspwm/bspwmrc create mode 120000 .config/pulse/aurelia-runtime create mode 100755 .config/sxhkd/sxhkdrc create mode 100644 .config/wezterm/wezterm.lua delete mode 100755 setup.sh diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc new file mode 100755 index 0000000..a5bf2c9 --- /dev/null +++ b/.config/bspwm/bspwmrc @@ -0,0 +1,12 @@ +#! /bin/sh + +pgrep -x sxhkd > /dev/null || sxhkd & + +bspc monitor -d I II III + +bspc config border_width 2 +bspc config window_gap 12 + +bspc config split_ratio 0.52 +bspc config borderless_monocle true +bspc config gapless_monocle true diff --git a/.config/pulse/aurelia-runtime b/.config/pulse/aurelia-runtime new file mode 120000 index 0000000..77c8636 --- /dev/null +++ b/.config/pulse/aurelia-runtime @@ -0,0 +1 @@ +/tmp/pulse-Zwz6kTSwrL9s \ No newline at end of file diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc new file mode 100755 index 0000000..8e52c3c --- /dev/null +++ b/.config/sxhkd/sxhkdrc @@ -0,0 +1,121 @@ +# +# wm independent hotkeys +# + +# terminal emulator +super + Return + wezterm + +# 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 window +super + g + bspc node -s biggest.window + +# +# 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 window in the current desktop +super + {_,shift + }c + bspc node -f {next,prev}.local.!hidden.window + +# 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} diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua new file mode 100644 index 0000000..ae59b56 --- /dev/null +++ b/.config/wezterm/wezterm.lua @@ -0,0 +1,12 @@ +local wezterm = require("wezterm") + +local config = wezterm.config_builder() + +config.window_decorations = "RESIZE" +config.enable_tab_bar = false + +-- Setting the font and the colorscheme comes later + + + +return config diff --git a/Makefile b/Makefile index e0159ed..6367360 100644 --- a/Makefile +++ b/Makefile @@ -1,40 +1,33 @@ -all: base graphical languages +all: base graphical languages tools base: setup - setup: - sudo xbps-install -y stow xtools neovim tmux yazi zsh + sudo xbps-install -y stow xtools neovim tmux yazi zsh autorandr stow . - graphical: graphical-xorg graphical-river graphical-xorg: - sudo xbps-install -y xorg picom feh bspwm wezterm firefox + sudo xbps-install -y xorg picom feh bspwm sxhkd wezterm firefox graphical-river: sudo xbps-install -y river wezterm firefox -languages: rust zig haskell java kotlin javascript +languages: rust haskell java javascript rust: sudo xbps-install -y rustup mkdir --parents ~/projects/rust -zig: - sudo xbps-install -y zig zls - mkdir --parents ~/projects/zig - haskell: sudo xbps-install -y ghc - mkdir --parents ~/projects/zig + mkdir --parents ~/projects/haskell java: sudo xbps-install -y openjdk21 maven gradle mkdir --parents ~/projects/java -kotlin: - sudo xbps-install -y kotlin maven gradle - mkdir --parents ~/projects/kotlin - javascript: + sudo xbps-install -y nodejs + mkdir --parents ~/projects/javascript + diff --git a/setup.sh b/setup.sh deleted file mode 100755 index dcbc615..0000000 --- a/setup.sh +++ /dev/null @@ -1,6 +0,0 @@ - -# I wonder what the best way to separate these would truly be... -# Probably like: - -# Essentials -sudo xbps-install git stow xtools neovim tmux river ghostty rustup starship fish-shell fastfetch