*changes since arch install

*added mangaterm
2022-09-17 02:25:46 -05:00 · 2022-09-17 02:25:46 -05:00 · b73c2b2114
parent 55499e20d4
commit b73c2b2114
16 changed files with 222 additions and 156 deletions
--- a/.config/bemenu/bemenu_opts.sh
+++ b/.config/bemenu/bemenu_opts.sh
@ -1,4 +1,4 @@
 #!/bin/sh
-#generated from: /home/alex/.config/bemenu/colors/base16-gruvbox-dark-hard
+#dmenu theme
 #export BEMENU_OPTS="-H 22   --tb #1d2021 --tf #fabd2f --hb #1d2021  --hf #ebdbb2 --sf #ebdbb2  --fb #1d2021 --sb #3c3836 --ff #ffffff --nb #1d2021  " #--nf #ebdbb2
- export BEMENU_OPTS="-H 22--tb #285577 --hb #285577 --tf #eeeeee --hf #eeeeee --nf #bbbbbb"
+ export BEMENU_OPTS="-H 24 --tb #285577 --hb #285577 --tf #eeeeee --hf #eeeeee --nf #bbbbbb"
--- a/.config/foot/foot.ini
+++ b/.config/foot/foot.ini
@ -8,7 +8,7 @@
 # title=foot
 # locked-title=no

- font=monospace:size=10
+ font=monospace:size=11
 # font-bold=<bold variant of regular font>
 # font-italic=<italic variant of regular font>
 # font-bold-italic=<bold+italic variant of regular font>
@ -110,40 +110,6 @@
 # search-box-match=<regular0> <regular3>     # black-on-yellow
 # urls=<regular3>

-[colors]
-# Base16 Gruvbox dark, medium - foot color config
-# Scheme by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
-
-#background=282828
-#foreground=d5c4a1
-#
-## normal
-#regular0=282828
-#regular1=fb4934
-#regular2=b8bb26
-#regular3=fabd2f
-#regular4=83a598
-#regular5=d3869b
-#regular6=8ec07c
-#regular7=d5c4a1
-#
-## bright
-#bright0=665c54
-#bright1=fe8019
-#bright2=3c3836
-#bright3=504945
-#bright4=bdae93
-#bright5=ebdbb2
-#bright6=d65d0e
-#bright7=fbf1c7
-#
-## misc
-#selection-background=d5c4a1
-#selection-foreground=282828
-#urls=bdae93
-#jump-labels=282828 fabd2f
-#scrollback-indicator=282828 bdae93
-
 [csd]
 # preferred=server
 # size=26
--- a/.config/lf/lfrc
+++ b/.config/lf/lfrc
@ -95,5 +95,5 @@ cmd compress ${{
    compress.sh -c "$fx"
 }}

-map c compress $fx 
-map C extract $f
+map c compress "$fx" 
+map C extract "$f"
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@ -14,7 +14,10 @@ call plug#begin('~/.local/share/nvim/plugged')
    Plug 'chriskempson/base16-vim'

    "language support
-    Plug 'tbastos/vim-lua'
+    "Plug 'tbastos/vim-lua'
+
+    Plug 'mattn/libcallex-vim', { 'do': 'make -C autoload' }
+    Plug 'bytesnake/vim-graphical-preview', { 'do': 'cargo build --release' }
 call plug#end()

 "enable ale completion
--- a/.config/river/init
+++ b/.config/river/init
@ -8,135 +8,125 @@
 # See the river(1), riverctl(1), and rivertile(1) man pages for complete
 # documentation.

-# Use the "logo" key as the primary modifier
-mod="Mod1"
+# Note: the "Super" modifier is also known as Logo, GUI, Windows, Mod4, etc.

-# Mod+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot)
-riverctl map normal $mod+Shift Return spawn alacritty
+# Super+Shift+Return to start an instance of foot (https://codeberg.org/dnkl/foot)
+riverctl map normal Super+Shift Return spawn foot

-# Mod+P open bemenu 
-riverctl map normal $mod P spawn "rofi -show run" 
+# Super+Q to close the focused view
+riverctl map normal Super Q close

-# Mod+Q to close the focused view
-riverctl map normal $mod+Shift C close
+# Super+Shift+E to exit river
+riverctl map normal Super+Shift E exit

-# Mod+E to exit river
-riverctl map normal $mod+Shift Q exit
+# Super+J and Super+K to focus the next/previous view in the layout stack
+riverctl map normal Super J focus-view next
+riverctl map normal Super K focus-view previous

-# Mod+J and Mod+K to focus the next/previous view in the layout stack
-#riverctl map normal $mod J focus-view next
-#riverctl map normal $mod K focus-view previous
-
-# Mod+Shift+J and Mod+Shift+K to swap the focused view with the next/previous
+# Super+Shift+J and Super+Shift+K to swap the focused view with the next/previous
 # view in the layout stack
-#riverctl map normal $mod+Shift J swap next
-#riverctl map normal $mod+Shift K swap previous
+riverctl map normal Super+Shift J swap next
+riverctl map normal Super+Shift K swap previous

-# Mod+Period and Mod+Comma to focus the next/previous output
-riverctl map normal $mod Period focus-output next
-riverctl map normal $mod Comma focus-output previous
+# Super+Period and Super+Comma to focus the next/previous output
+riverctl map normal Super Period focus-output next
+riverctl map normal Super Comma focus-output previous

-# Mod+Shift+{Period,Comma} to send the focused view to the next/previous output
-riverctl map normal $mod+Shift Period send-to-output next
-riverctl map normal $mod+Shift Comma send-to-output previous
+# Super+Shift+{Period,Comma} to send the focused view to the next/previous output
+riverctl map normal Super+Shift Period send-to-output next
+riverctl map normal Super+Shift Comma send-to-output previous

-# Mod+Return to bump the focused view to the top of the layout stack
-riverctl map normal $mod Return zoom
+# Super+Return to bump the focused view to the top of the layout stack
+riverctl map normal Super Return zoom

-# Mod+H and Mod+L to decrease/increase the main ratio of rivertile(1)
-#riverctl map normal $mod H send-layout-cmd rivertile "main-ratio -0.05"
-#riverctl map normal $mod L send-layout-cmd rivertile "main-ratio +0.05"
+# Super+H and Super+L to decrease/increase the main ratio of rivertile(1)
+riverctl map normal Super H send-layout-cmd rivertile "main-ratio -0.05"
+riverctl map normal Super L send-layout-cmd rivertile "main-ratio +0.05"

-# Mod+Shift+H and Mod+Shift+L to increment/decrement the main count of rivertile(1)
-#riverctl map normal $mod+Shift H send-layout-cmd rivertile "main-count +1"
-#riverctl map normal $mod+Shift L send-layout-cmd rivertile "main-count -1"
+# Super+Shift+H and Super+Shift+L to increment/decrement the main count of rivertile(1)
+riverctl map normal Super+Shift H send-layout-cmd rivertile "main-count +1"
+riverctl map normal Super+Shift L send-layout-cmd rivertile "main-count -1"

-riverctl map normal $mod 
+# Super+Alt+{H,J,K,L} to move views
+riverctl map normal Super+Alt H move left 100
+riverctl map normal Super+Alt J move down 100
+riverctl map normal Super+Alt K move up 100
+riverctl map normal Super+Alt L move right 100

-# Mod+Alt+{H,J,K,L} to move views
-#riverctl map normal $mod+Mod1 H move left 100
-#riverctl map normal $mod+Mod1 J move down 100
-#riverctl map normal $mod+Mod1 K move up 100
-#riverctl map normal $mod+Mod1 L move right 100
+# Super+Alt+Control+{H,J,K,L} to snap views to screen edges
+riverctl map normal Super+Alt+Control H snap left
+riverctl map normal Super+Alt+Control J snap down
+riverctl map normal Super+Alt+Control K snap up
+riverctl map normal Super+Alt+Control L snap right

-# Mod+Alt+Control+{H,J,K,L} to snap views to screen edges
-#riverctl map normal $mod+Mod1+Control H snap left
-#riverctl map normal $mod+Mod1+Control J snap down
-#riverctl map normal $mod+Mod1+Control K snap up
-#riverctl map normal $mod+Mod1+Control L snap right
+# Super+Alt+Shift+{H,J,K,L} to resize views
+riverctl map normal Super+Alt+Shift H resize horizontal -100
+riverctl map normal Super+Alt+Shift J resize vertical 100
+riverctl map normal Super+Alt+Shift K resize vertical -100
+riverctl map normal Super+Alt+Shift L resize horizontal 100

-# Mod+Alt+Shif+{H,J,K,L} to resize views
-#riverctl map normal $mod+Mod1+Shift H resize horizontal -100
-#riverctl map normal $mod+Mod1+Shift J resize vertical 100
-#riverctl map normal $mod+Mod1+Shift K resize vertical -100
-#riverctl map normal $mod+Mod1+Shift L resize horizontal 100
+# Super + Left Mouse Button to move views
+riverctl map-pointer normal Super BTN_LEFT move-view

-riverctl map normal $mod J focus-view next 
-riverctl map normal $mod K focus-view previous 
-
-
-# Mod + Left Mouse Button to move views
-riverctl map-pointer normal $mod BTN_LEFT move-view
-
-# Mod + Right Mouse Button to resize views
-riverctl map-pointer normal $mod BTN_RIGHT resize-view
+# Super + Right Mouse Button to resize views
+riverctl map-pointer normal Super BTN_RIGHT resize-view

 for i in $(seq 1 9)
 do
    tags=$((1 << ($i - 1)))

-    # Mod+[1-9] to focus tag [0-8]
-    riverctl map normal $mod $i set-focused-tags $tags
+    # Super+[1-9] to focus tag [0-8]
+    riverctl map normal Super $i set-focused-tags $tags

-    # Mod+Shift+[1-9] to tag focused view with tag [0-8]
-    riverctl map normal $mod+Shift $i set-view-tags $tags
+    # Super+Shift+[1-9] to tag focused view with tag [0-8]
+    riverctl map normal Super+Shift $i set-view-tags $tags

-    # Mod+Ctrl+[1-9] to toggle focus of tag [0-8]
-    riverctl map normal $mod+Control $i toggle-focused-tags $tags
+    # Super+Ctrl+[1-9] to toggle focus of tag [0-8]
+    riverctl map normal Super+Control $i toggle-focused-tags $tags

-    # Mod+Shift+Ctrl+[1-9] to toggle tag [0-8] of focused view
-    riverctl map normal $mod+Shift+Control $i toggle-view-tags $tags
+    # Super+Shift+Ctrl+[1-9] to toggle tag [0-8] of focused view
+    riverctl map normal Super+Shift+Control $i toggle-view-tags $tags
 done

-# Mod+0 to focus all tags
-# Mod+Shift+0 to tag focused view with all tags
+# Super+0 to focus all tags
+# Super+Shift+0 to tag focused view with all tags
 all_tags=$(((1 << 32) - 1))
-riverctl map normal $mod 0 set-focused-tags $all_tags
-riverctl map normal $mod+Shift 0 set-view-tags $all_tags
+riverctl map normal Super 0 set-focused-tags $all_tags
+riverctl map normal Super+Shift 0 set-view-tags $all_tags

-# Mod+f to toggle float
-riverctl map normal $mod F toggle-float
+# Super+Space to toggle float
+riverctl map normal Super Space toggle-float

-# Mod+Shift+F to toggle fullscreen
-riverctl map normal $mod+Shift F toggle-fullscreen
+# Super+F to toggle fullscreen
+riverctl map normal Super F toggle-fullscreen

-# Mod+{Up,Right,Down,Left} to change layout orientation
-riverctl map normal $mod Up    send-layout-cmd rivertile "main-location top"
-riverctl map normal $mod Right send-layout-cmd rivertile "main-location right"
-riverctl map normal $mod Down  send-layout-cmd rivertile "main-location bottom"
-riverctl map normal $mod Left  send-layout-cmd rivertile "main-location left"
+# Super+{Up,Right,Down,Left} to change layout orientation
+riverctl map normal Super Up    send-layout-cmd rivertile "main-location top"
+riverctl map normal Super Right send-layout-cmd rivertile "main-location right"
+riverctl map normal Super Down  send-layout-cmd rivertile "main-location bottom"
+riverctl map normal Super Left  send-layout-cmd rivertile "main-location left"

 # Declare a passthrough mode. This mode has only a single mapping to return to
 # normal mode. This makes it useful for testing a nested wayland compositor
 riverctl declare-mode passthrough

-# Mod+F11 to enter passthrough mode
-riverctl map normal $mod F11 enter-mode passthrough
+# Super+F11 to enter passthrough mode
+riverctl map normal Super F11 enter-mode passthrough

-# Mod+F11 to return to normal mode
-riverctl map passthrough $mod F11 enter-mode normal
+# Super+F11 to return to normal mode
+riverctl map passthrough Super F11 enter-mode normal

 # Various media key mapping examples for both normal and locked mode which do
 # not have a modifier
 for mode in normal locked
 do
-    # Eject the optical drive
+    # Eject the optical drive (well if you still have one that is)
    riverctl map $mode None XF86Eject spawn 'eject -T'

    # Control pulse audio volume with pamixer (https://github.com/cdemoulins/pamixer)
-    riverctl map $mode None XF86AudioRaiseVolume  spawn 'pamixer -i 5'
-    riverctl map $mode None XF86AudioLowerVolume  spawn 'pamixer -d 5'
-    riverctl map $mode None XF86AudioMute         spawn 'pamixer --toggle-mute'
+    riverctl map $mode None XF86AudioRaiseVolume  spawn 'vol.sh -i 0.02'
+    riverctl map $mode None XF86AudioLowerVolume  spawn 'vol.sh -d 0.02'
+    riverctl map $mode None XF86AudioMute         spawn 'vol.sh --toggle-mute'

    # Control MPRIS aware media players with playerctl (https://github.com/altdesktop/playerctl)
    riverctl map $mode None XF86AudioMedia spawn 'playerctl play-pause'
@ -144,7 +134,7 @@ do
    riverctl map $mode None XF86AudioPrev  spawn 'playerctl previous'
    riverctl map $mode None XF86AudioNext  spawn 'playerctl next'

-    # Control screen backlight brighness with light (https://github.com/haikarainen/light)
+    # Control screen backlight brightness with light (https://github.com/haikarainen/light)
    riverctl map $mode None XF86MonBrightnessUp   spawn 'light -A 5'
    riverctl map $mode None XF86MonBrightnessDown spawn 'light -U 5'
 done
@ -154,7 +144,7 @@ riverctl background-color 0x002b36
 riverctl border-color-focused 0x93a1a1
 riverctl border-color-unfocused 0x586e75

-# Set repeat rate
+# Set keyboard repeat rate
 riverctl set-repeat 50 300

 # Make certain views start floating
@ -164,16 +154,7 @@ riverctl float-filter-add title "popup title with spaces"
 # Set app-ids and titles of views which should use client side decorations
 riverctl csd-filter-add app-id "gedit"

-# Set and exec into the default layout generator, rivertile.
+# Set the default layout generator to be rivertile and start it.
 # River will send the process group of the init executable SIGTERM on exit.
 riverctl default-layout rivertile
-
-riverctl xcursor-theme Adwaita 
-
-#hardware config
-sh ~/.config/river/hw_config
-
-#startup programs
-sh ~/.local/inits/river.sh
-
-exec rivertile
+rivertile -view-padding 6 -outer-padding 6
--- a/.config/shell/cleanup.sh
+++ b/.config/shell/cleanup.sh
@ -31,3 +31,4 @@ export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
 export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android"
 export MBSYNCRC="${XDG_CONFIG_HOME:-$HOME/.config}/mbsync/config"
 export ELECTRUMDIR="${XDG_DATA_HOME:-$HOME/.local/share}/electrum"
+export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
--- a/.config/swaylock/config
+++ b/.config/swaylock/config
@ -1,10 +1,2 @@
 font=mono
-color=3B4252
-inside-color=2E3440
-inside-caps-lock-color=88c0d0
-inside-ver-color=88c0d0
-inside-wrong-color=BF616A
-ring-color=A3BE8C
-ring-caps-lock-color=5E81AC
-key-hl-color=E5E9F0
-bs-hl-color=D08770
+color=111111
--- a/.config/swhkd/swhkdrc
+++ b/.config/swhkd/swhkdrc
@ -15,3 +15,6 @@ super + o

 super + s
    ss.sh -s
+
+ctrl + alt + delete
+    waylogout
--- a/.config/waylock/waylock.toml
+++ b/.config/waylock/waylock.toml
@ -0,0 +1,9 @@
+# waylock.toml
+
+[colors]
+# Specify the initial color of the lock screen.
+init_color = 0x000000
+# Specify the color of the lock screen after input is received.
+input_color = 0x005577
+# Specify the color of the lock screen on authentication failure.
+fail_color = 0xcc3333
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@ -82,7 +82,8 @@ if ! [ -f $HOME/.local/share/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting
 fi

 # prompt stuff
-pfetch
+#pfetch
+colorscript -r

 #if [ -f "/usr/bin/starship" ]; then
 #    eval "$(starship init zsh)"
--- a/.local/bin/mangaterm
+++ b/.local/bin/mangaterm
@ -0,0 +1,97 @@
+#!/bin/bash
+
+#using PID for dirname in case multiple instances are opened they do not interfere
+CACHEDIR="$HOME/.cache/mangaterm"
+TMPDIR="$CACHEDIR/$$"
+
+help() {
+    echo "Read manga/comics in the terminal"
+    echo "    mangaterm.sh DIRECTORY"
+    echo "    mangaterm.sh FILE"
+    echo ""
+    echo "keybindings:"
+    echo "    j -> next page"
+    echo "    k -> previous page"
+    echo "    q -> quit"
+    echo ""
+}
+
+disp() {
+    FILE="$DIR"/"$(echo "$FILES" | head -n "$1" | tail -n 1)" 
+    clear
+    [ -f "$FILE" ] && chafa -C on "$FILE"
+
+    echo -n "$FILE"
+}
+
+close() {
+    rm -rf "$TMPDIR"
+    clear
+    exit
+}
+
+
+readDir() {
+    DIR="$(echo "$1" | xargs)"
+
+    #if opening an archive that created a subdirectory, open subdirectories until there are multiple files
+    SDIR="$(ls -A "$DIR")"
+    if [ "$(echo "$SDIR" | wc -l)" = "1" ]; then
+        echo "==============="
+        ls "$SDIR"
+        echo "XXXXXXXXXXXXXX"
+        if [ -d "$DIR/$SDIR" ]; then  
+            readDir "$DIR"/"$SDIR" 
+        fi
+    fi
+
+    echo "before FILES"
+    FILES="$(ls "$DIR")"
+    LEN="$(echo "$FILES" | wc -l)"
+
+    disp "1"
+
+    I=1
+    while read -n 1 char; do
+        if [ "$char" = "j" ]; then
+                I=$((I + 1))
+            elif [ "$char" = "k" ]; then
+                I=$((I - 1))
+            elif [ "$char" = "q" ]; then
+                close
+            fi
+
+        if [ "$I" -ge "$LEN" ] || [ "$I" -le "0" ]; then
+            if [ "$I" -ge "$LEN" ]; then
+                I="$LEN"
+            elif [ "$I" -le "0" ]; then
+                I=0
+            fi 
+        fi
+
+        disp "$I" 
+    done
+
+    close
+}
+
+handleFile() {
+    case $(file --mime-type "$1" -b) in
+        inode/directory) readDir "$1" ;; 
+        application/zip) unzip "$1" -d "$TMPDIR" && readDir "$TMPDIR" ;; 
+        application/*rar) 7z x "$1" -o"$TMPDIR" && readDir "$TMPDIR" ;;
+        application/gzip) tar xzvf "$1" --directory="$TMPDIR" && readDir "$TMPDIR" ;;
+        application/pdf) pdftoppm -jpeg "$1" "$TMPDIR"/page && readDir "$TMPDIR" ;;
+        *) help ;;
+
+    esac
+}
+
+mkdir -p "$TMPDIR"
+
+ARGS="$1"
+if [ "$(echo "$1" | cut -c1-1)" = "-" ]; then
+   foot -e mangaterm "$2" 2>/dev/null > /dev/null
+fi
+
+handleFile "$ARGS"
--- a/.local/installers/arch/arch-install.sh
+++ b/.local/installers/arch/arch-install.sh
@ -181,7 +181,7 @@ configure() {
        echo "permit nopass :wheel as root cmd /sbin/reboot" >> ~/.cache/doas.conf
        sudo cp ~/.cache/doas.conf /etc/doas.conf
        rm ~/.cache/doas.conf
-        doas pacman -R sudo && doas ln -s /bin/doas /bin/sudo                            #TODO ARCH SPECIFIC
+        doas pacman -R sudo  #&& doas ln -s /bin/doas /bin/sudo                            #TODO ARCH SPECIFIC
    fi


@ -199,12 +199,12 @@ configure() {
    sudo sh -c 'echo "FONT=Lat2-Terminus16" >> /etc/vconsole.conf'

    #set grub theme
-    sudo sed -i 's/#GRUB_COLOR_NORMAL/GRUB_COLOR_NORMAL/g' /etc/default/grub
-    sudo sed -i 's/#GRUB_COLOR_HIGHLIGHT/GRUB_COLOR_HIGHLIGHT/g' /etc/default/grub
+    #sudo sed -i 's/#GRUB_COLOR_NORMAL/GRUB_COLOR_NORMAL/g' /etc/default/grub
+    #sudo sed -i 's/#GRUB_COLOR_HIGHLIGHT/GRUB_COLOR_HIGHLIGHT/g' /etc/default/grub

    #nix configuration
        #add user to nix-users group
-    sudo adduser -a -G nix-users "$USER"
+    #sudo adduser -a -G nix-users "$USER"
        #add nix unstable channel
    #nix-channel --add https://nixos.org/channels/nixpkgs-unstable
    #nix-channel --update
@ -230,7 +230,7 @@ configure() {

 base() {

-    #enable repos (lib32, community, and universe) and install yay
+    #enable repos (lib32, community, and universe) and install yay 
    enable_repos

    #install all packages in $PKGS
--- a/.local/installers/arch/pkgs/aur.list
+++ b/.local/installers/arch/pkgs/aur.list
@ -1,4 +1,3 @@
-lf
 mutt-wizard
 htim
 jmtpfs
@ -18,3 +17,6 @@ rofi-lbonn-wayland-git
 pipe-viewer-git
 connman-gtk
 opendoas-sudo
+shell-color-scripts
+lf-sixel-git
+swhkd-git
--- a/.local/installers/arch/pkgs/base.list
+++ b/.local/installers/arch/pkgs/base.list
@ -80,3 +80,7 @@ bc
 firefox
 ungoogled-chromium
 flatpak
+waylock
+bemenu-wayland
+foot
+libsixel
--- a/.local/scripts/compress.sh
+++ b/.local/scripts/compress.sh
@ -24,8 +24,12 @@ mkname() {

 compress() {
    set -f
+    echo "@ = $@"
    FILES="$(echo "$@" | xargs -0)"
+    echo "FILES = $FILES"
+
    DIRNAME="$(basename "$FILES")"
+    echo "DIRNAME = $DIRNAME"

    if ! [ -d "$DIRNAME" ]; then
        DIRNAME="$(mkname "$@")"
@ -73,7 +77,10 @@ help () {
 }

 #get all input except first argument, if first argument has a '-' and save in ARGS
-ARGS="$( echo "$@" | sed 's/^-.* //g' )" 
+#ARGS="$( echo "$@" | sed 's/^-.* //g' )" 
+ARGS="$(echo "$2")"
+
+echo "ARGS = $ARGS"

 if [ "$1" = "-c" ]; then
    compress "$ARGS"
--- a/.profile
+++ b/.profile
@ -86,6 +86,6 @@ export AWT_TOOLKIT=MToolkit
 if [ "$(tty)" = /dev/tty1 ]; then
    #exec dbus-launch sway
    #exec dbus-launch Hyprland 
-    #sh "$HOME"/.local/init/init.sh -i "$HOME"/.local/init/startup &
    exec dbus-launch dwl -s somebar 
+    #exec dbus-launch river
 fi