diff --git a/README.MD b/README.MD new file mode 100644 index 0000000..8689942 --- /dev/null +++ b/README.MD @@ -0,0 +1,21 @@ +# 2ndbeam's cringe config +## Packages +``` +$ sudo pacman -S river lua lua-posix wlr-randr \ + waylock swaybg alacritty wofi \ + slurp grim wl-clipboard waybar \ + mpd mpc vimix-cursors fish +``` +## Setup +In config root directory run: +``` +$ fish ./setup.fish +``` +This will create symlinks to config files in inner directories. + +Do not move files, otherwise symlinks won't work. + +To remove symlinks run: +``` +$ fish ./clean.fish +``` diff --git a/clean.fish b/clean.fish new file mode 100755 index 0000000..1ed8334 --- /dev/null +++ b/clean.fish @@ -0,0 +1,24 @@ +#!/usr/bin/fish + +# This script removes all symlinks in ~/.config that were added by setup.fish. +set ignored ls (string split ' ' (cat ignored)) +set lscommand (string join ' --hide=' $ignored) +set directories (eval $lscommand) + +for directory in $directories + set confdir ~/.config/$directory + if ! test -d $confdir + echo Directory $confdir does not exist. Skipping... + continue + end + + set content (ls $confdir) + for file in $content + if test -L $confdir/$file + rm $confdir/$file + echo Removed $confdir/$file. + else + echo $confdir/$file is not symlink. Skipping... + end + end +end diff --git a/ignored b/ignored new file mode 100644 index 0000000..ff62286 --- /dev/null +++ b/ignored @@ -0,0 +1 @@ +ignored setup.fish clean.fish README.MD diff --git a/river/init.lua b/river/init.lua index a039a62..c6937b3 100755 --- a/river/init.lua +++ b/river/init.lua @@ -94,7 +94,7 @@ local river_options = { ['border-color-focused'] = '0xeceff4', ['border-color-unfocused'] = '0x81a1c1', ['border-color-urgent'] = '0xbf616a', - ['xcursor-theme'] = { 'Bibata-Modern-Ice', 24 }, + ['xcursor-theme'] = { 'Vimix-cursors', 24 }, ['background-color'] = '0x2e3440', -- Other options @@ -189,12 +189,6 @@ local mappings = { key = 'Q', command = 'exit', }, - -- Super+Shift+X to lock the screen - { - mod = { 'Super', 'Shift' }, - key = 'X', - command = { 'spawn', 'swaylock' }, - }, -- Super+{J,K} to focus next/previous view in the layout stack { mod = 'Super', diff --git a/setup.fish b/setup.fish index 6a03318..c6aff57 100755 --- a/setup.fish +++ b/setup.fish @@ -1,18 +1,28 @@ #!/usr/bin/fish -# This script makes symlinks to configuration files in directories -set directories (ls --hide=setup.fish) + +# This script makes symlinks to configuration files in inner directories +set ignored ls (string split ' ' (cat ignored)) +set lscommand (string join ' --hide=' $ignored) +set directories (eval $lscommand) + for directory in $directories set confdir ~/.config/$directory if ! test -d $confdir mkdir ~/.config/$directory + echo Created directory ~/.config/$directory. end + set content (ls $directory) for file in $content if ! test -e $confdir/$file ln -s (pwd)/$directory/$file $confdir/$file + echo Created $confdir/$file. end end end # Specific configs procedures -rename init.lua init ~/.config/river/init.lua +if test -e ~/.config/river/init.lua + rename init.lua init ~/.config/river/init.lua + echo Renamed ~/.config/river/init.lua to init. +end diff --git a/waybar/config.jsonc b/waybar/config.jsonc index 3e0cff5..8ad3f43 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -2,7 +2,7 @@ "output": "HDMI-A-1", "layer": "top", "position": "top", - "height": 30, + "height": 32, "spacing": 4, "modules-left": [ "river/tags" @@ -51,7 +51,7 @@ "output": "eDP-2", "layer": "top", "position": "top", - "height": 30, + "height": 32, "spacing": 4, "modules-left": [ "river/tags"