From bcdde328db2a39012ff86211030c2931fe9bafd7 Mon Sep 17 00:00:00 2001 From: Juni Kim Date: Fri, 3 Mar 2023 21:31:55 -0500 Subject: [PATCH] stow --- dots/berryrice/notes.txt | 9 + .../polybar/.config/polybar/config.ini | 224 ++++++++++++++++++ .../polybar/.config/polybar/launch.sh | 11 + dots/berryrice/rofi/.config/rofi/config.rasi | 14 ++ .../share/rofi/themes/catppuccin-frappe.rasi | 111 +++++++++ .../share/rofi/themes/catppuccin-latte.rasi | 111 +++++++++ .../rofi/themes/catppuccin-macchiato.rasi | 111 +++++++++ .../share/rofi/themes/catppuccin-mocha.rasi | 111 +++++++++ dots/berryrice/stow | 5 + dots/berryrice/wm/.config/berry/autostart | 32 +++ dots/berryrice/wm/.config/berry/sxhkdrc | 70 ++++++ dots/berryrice/wm/.config/picom/picom.conf | 19 ++ dots/i3rice/stow | 5 + .../{i3config => i3rice/wm/.config/i3/config} | 0 dots/{ => i3rice/wm/.config/picom}/picom.conf | 0 .../wm/.config/polybar/config.ini} | 0 dots/vimrc | 77 ------ install_alpine.sh | 53 ++--- 18 files changed, 850 insertions(+), 113 deletions(-) create mode 100644 dots/berryrice/notes.txt create mode 100644 dots/berryrice/polybar/.config/polybar/config.ini create mode 100755 dots/berryrice/polybar/.config/polybar/launch.sh create mode 100644 dots/berryrice/rofi/.config/rofi/config.rasi create mode 100644 dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-frappe.rasi create mode 100644 dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-latte.rasi create mode 100644 dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-macchiato.rasi create mode 100644 dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-mocha.rasi create mode 100755 dots/berryrice/stow create mode 100755 dots/berryrice/wm/.config/berry/autostart create mode 100755 dots/berryrice/wm/.config/berry/sxhkdrc create mode 100644 dots/berryrice/wm/.config/picom/picom.conf create mode 100755 dots/i3rice/stow rename dots/{i3config => i3rice/wm/.config/i3/config} (100%) rename dots/{ => i3rice/wm/.config/picom}/picom.conf (100%) rename dots/{polybar.ini => i3rice/wm/.config/polybar/config.ini} (100%) delete mode 100644 dots/vimrc diff --git a/dots/berryrice/notes.txt b/dots/berryrice/notes.txt new file mode 100644 index 0000000..2fb5843 --- /dev/null +++ b/dots/berryrice/notes.txt @@ -0,0 +1,9 @@ +- pipewire, pipewire-plugin-pulse, wireplumber +- xdg-desktop-portal + +Rofi: +~/.local/share/rofi/themes contains theme +apk add papairus-icon-theme librsvg gdk-pixbuf-dev rofi + +Polybar: +- font-arimo font-jetbrains-mono-nerd diff --git a/dots/berryrice/polybar/.config/polybar/config.ini b/dots/berryrice/polybar/.config/polybar/config.ini new file mode 100644 index 0000000..77e65c6 --- /dev/null +++ b/dots/berryrice/polybar/.config/polybar/config.ini @@ -0,0 +1,224 @@ +;========================================================== +; +; +; ██████╗ ██████╗ ██╗ ██╗ ██╗██████╗ █████╗ ██████╗ +; ██╔══██╗██╔═══██╗██║ ╚██╗ ██╔╝██╔══██╗██╔══██╗██╔══██╗ +; ██████╔╝██║ ██║██║ ╚████╔╝ ██████╔╝███████║██████╔╝ +; ██╔═══╝ ██║ ██║██║ ╚██╔╝ ██╔══██╗██╔══██║██╔══██╗ +; ██║ ╚██████╔╝███████╗██║ ██████╔╝██║ ██║██║ ██║ +; ╚═╝ ╚═════╝ ╚══════╝╚═╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝ +; +; +; To learn more about how to configure Polybar +; go to https://github.com/polybar/polybar +; +; The README contains a lot of information +; +;========================================================== + +[colors] +background = #1E1E2E +background-alt = #313244 +foreground = #cdd6f4 +primary = #89b4fa +secondary = #a6e3a1 +alert = #f38ba8 +disabled = #707880 + +[bar/base] +width = 100% +height = 24pt +radius = 0 + +background = ${colors.background} +foreground = ${colors.foreground} + +line-size = 3pt + +border-size = 4pt +border-color = #00000000 + +padding-left = 0 +padding-right = 1 +module-margin = 1 + +separator = | +separator-foreground = ${colors.disabled} + +font-0 = JetBrains Mono Nerd Font;2 +font-1 = unifont:fontformat=truetype:size=8:antialias=false;0 +font-2 = siji:pixelsize=10;1 +font-3 = "Arimo:pixelsize=12;0" +cursor-click = pointer +cursor-scroll = ns-resize +enable-ipc = true + +[bar/workspaces] +width = 300 +inherit = bar/base +modules-center = xworkspaces-roleless + +[bar/top] +width = 300 +offset-x = 100%:-300 +inherit = bar/base +modules-center = date eth wlan + +[bar/bottom] +padding-left = 1 +inherit = bar/base +bottom = true +width = 100% +modules-left = pulseaudio backlight +modules-center = xwindow +modules-right = filesystem memory cpu + +[module/xworkspaces-roleless] +type = internal/xworkspaces + +label-active = ● +label-active-background = ${colors.background-alt} +label-active-underline= ${colors.primary} +label-active-padding = 1 + +label-occupied = ● +label-occupied-padding = 1 + +label-urgent = ● +label-urgent-background = ${colors.alert} +label-urgent-padding = 1 + +label-empty = ○ +label-empty-foreground = ${colors.disabled} +label-empty-padding = 1 + +[module/xworkspaces-role] +type = internal/xworkspaces + +label-active = %icon% +label-active-background = ${colors.background-alt} +label-active-underline= ${colors.primary} +label-active-padding = 1 + +label-occupied = %icon% +label-occupied-padding = 1 + +label-urgent = %icon% +label-urgent-background = ${colors.alert} +label-urgent-padding = 1 + +label-empty = %icon% +label-empty-foreground = ${colors.disabled} +label-empty-padding = 1 + +icon-0 = 0; +icon-1 = 1;爵 +icon-2 = 2; +icon-3 = 3; +icon-4 = 4; +icon-5 = 5; +icon-6 = 6; +icon-7 = 7;8 +icon-8 = 8;9 + +[module/xwindow] +type = internal/xwindow +label = %title:0:30:...% +label-padding = 1 + +[module/filesystem] +type = internal/fs +interval = 25 + +mount-0 = / + +label-mounted = %{F#a6e3a1}%mountpoint%%{F-} %percentage_used%% + +label-unmounted = %mountpoint% not mounted +label-unmounted-foreground = ${colors.disabled} + +[module/pulseaudio] +type = internal/pulseaudio + +format-volume-prefix = "VOL " +format-volume-prefix-foreground = ${colors.primary} +format-volume = + +label-volume = %percentage%% +label-muted = muted +label-muted-foreground = ${colors.disabled} + +[module/backlight] +type = internal/xbacklight +format = + +; Available tokens: +; %percentage% (default) +label = %percentage%% + +; Only applies if is used +ramp-0 = 🌕 +ramp-1 = 🌔 +ramp-2 = 🌓 +ramp-3 = 🌒 +ramp-4 = 🌑 + +[module/xkeyboard] +type = internal/xkeyboard +blacklist-0 = num lock + +label-layout = %layout% +label-layout-foreground = ${colors.primary} + +label-indicator-padding = 2 +label-indicator-margin = 1 +label-indicator-foreground = ${colors.background} +label-indicator-background = ${colors.secondary} + +[module/memory] +type = internal/memory +interval = 2 +format-prefix = "RAM " +format-prefix-foreground = ${colors.primary} +label = %percentage_used:2%% + +[module/cpu] +type = internal/cpu +interval = 2 +format-prefix = "CPU " +format-prefix-foreground = ${colors.primary} +label = %percentage:2%% + +[network-base] +type = internal/network +interval = 5 +format-connected = +format-disconnected = +label-disconnected = %{F#a6e3a1}%ifname%%{F#707880} disconnected + +[module/wlan] +inherit = network-base +interface-type = wireless +#label-connected = %{F#a6e3a1}%ifname%%{F-} %essid% %local_ip% +label-connected = %{F#a6e3a1}%ifname%%{F-} %essid% + +[module/eth] +inherit = network-base +interface-type = wired +label-connected = %{F#a6e3a1}%ifname%%{F-} + +[module/date] +type = internal/date +interval = 1 + +date = %OI:%M %p +date-alt = %Y-%m-%d %H:%M:%S + +label = %date% +label-foreground = ${colors.primary} + +[settings] +screenchange-reload = true +pseudo-transparency = true + +; vim:ft=dosini diff --git a/dots/berryrice/polybar/.config/polybar/launch.sh b/dots/berryrice/polybar/.config/polybar/launch.sh new file mode 100755 index 0000000..74ad27c --- /dev/null +++ b/dots/berryrice/polybar/.config/polybar/launch.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +pkill polybar + +bar() { + polybar -c "$HOME/.config/polybar/config.ini" "$@" & +} + +bar top +bar workspaces +bar bottom diff --git a/dots/berryrice/rofi/.config/rofi/config.rasi b/dots/berryrice/rofi/.config/rofi/config.rasi new file mode 100644 index 0000000..3cbfa78 --- /dev/null +++ b/dots/berryrice/rofi/.config/rofi/config.rasi @@ -0,0 +1,14 @@ +configuration{ + modi: "drun,window"; + icon-theme: "Papirus"; + show-icons: true; + terminal: "alacritty"; + drun-display-format: "{icon} {name}"; + location: 0; + disable-history: false; + hide-scrollbar: true; + display-drun: "  Run "; + display-window: " 﩯 Window"; + sidebar-mode: true; +} +@theme "catppuccin-macchiato" diff --git a/dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-frappe.rasi b/dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-frappe.rasi new file mode 100644 index 0000000..e6e8783 --- /dev/null +++ b/dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-frappe.rasi @@ -0,0 +1,111 @@ +* { + bg-col: #303446; + bg-col-light: #303446; + border-col: #303446; + selected-col: #303446; + blue: #8caaee; + fg-col: #c6d0f5; + fg-col2: #e78284; + grey: #737994; + + width: 600; + font: "JetBrainsMono Nerd Font 14"; +} + +element-text, element-icon , mode-switcher { + background-color: inherit; + text-color: inherit; +} + +window { + height: 360px; + border: 3px; + border-color: @border-col; + background-color: @bg-col; +} + +mainbox { + background-color: @bg-col; +} + +inputbar { + children: [prompt,entry]; + background-color: @bg-col; + border-radius: 5px; + padding: 2px; +} + +prompt { + background-color: @blue; + padding: 6px; + text-color: @bg-col; + border-radius: 3px; + margin: 20px 0px 0px 20px; +} + +textbox-prompt-colon { + expand: false; + str: ":"; +} + +entry { + padding: 6px; + margin: 20px 0px 0px 10px; + text-color: @fg-col; + background-color: @bg-col; +} + +listview { + border: 0px 0px 0px; + padding: 6px 0px 0px; + margin: 10px 0px 0px 20px; + columns: 2; + lines: 5; + background-color: @bg-col; +} + +element { + padding: 5px; + background-color: @bg-col; + text-color: @fg-col ; +} + +element-icon { + size: 25px; +} + +element selected { + background-color: @selected-col ; + text-color: @fg-col2 ; +} + +mode-switcher { + spacing: 0; + } + +button { + padding: 10px; + background-color: @bg-col-light; + text-color: @grey; + vertical-align: 0.5; + horizontal-align: 0.5; +} + +button selected { + background-color: @bg-col; + text-color: @blue; +} + +message { + background-color: @bg-col-light; + margin: 2px; + padding: 2px; + border-radius: 5px; +} + +textbox { + padding: 6px; + margin: 20px 0px 0px 20px; + text-color: @blue; + background-color: @bg-col-light; +} diff --git a/dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-latte.rasi b/dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-latte.rasi new file mode 100644 index 0000000..6826db6 --- /dev/null +++ b/dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-latte.rasi @@ -0,0 +1,111 @@ +* { + bg-col: #eff1f5; + bg-col-light: #eff1f5; + border-col: #eff1f5; + selected-col: #eff1f5; + blue: #1e66f5; + fg-col: #4c4f69; + fg-col2: #d20f39; + grey: #9ca0b0; + + width: 600; + font: "JetBrainsMono Nerd Font 14"; +} + +element-text, element-icon , mode-switcher { + background-color: inherit; + text-color: inherit; +} + +window { + height: 360px; + border: 3px; + border-color: @border-col; + background-color: @bg-col; +} + +mainbox { + background-color: @bg-col; +} + +inputbar { + children: [prompt,entry]; + background-color: @bg-col; + border-radius: 5px; + padding: 2px; +} + +prompt { + background-color: @blue; + padding: 6px; + text-color: @bg-col; + border-radius: 3px; + margin: 20px 0px 0px 20px; +} + +textbox-prompt-colon { + expand: false; + str: ":"; +} + +entry { + padding: 6px; + margin: 20px 0px 0px 10px; + text-color: @fg-col; + background-color: @bg-col; +} + +listview { + border: 0px 0px 0px; + padding: 6px 0px 0px; + margin: 10px 0px 0px 20px; + columns: 2; + lines: 5; + background-color: @bg-col; +} + +element { + padding: 5px; + background-color: @bg-col; + text-color: @fg-col ; +} + +element-icon { + size: 25px; +} + +element selected { + background-color: @selected-col ; + text-color: @fg-col2 ; +} + +mode-switcher { + spacing: 0; + } + +button { + padding: 10px; + background-color: @bg-col-light; + text-color: @grey; + vertical-align: 0.5; + horizontal-align: 0.5; +} + +button selected { + background-color: @bg-col; + text-color: @blue; +} + +message { + background-color: @bg-col-light; + margin: 2px; + padding: 2px; + border-radius: 5px; +} + +textbox { + padding: 6px; + margin: 20px 0px 0px 20px; + text-color: @blue; + background-color: @bg-col-light; +} diff --git a/dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-macchiato.rasi b/dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-macchiato.rasi new file mode 100644 index 0000000..696d769 --- /dev/null +++ b/dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-macchiato.rasi @@ -0,0 +1,111 @@ +* { + bg-col: #24273a; + bg-col-light: #24273a; + border-col: #24273a; + selected-col: #24273a; + blue: #8aadf4; + fg-col: #cad3f5; + fg-col2: #ed8796; + grey: #6e738d; + + width: 600; + font: "JetBrainsMono Nerd Font 14"; +} + +element-text, element-icon , mode-switcher { + background-color: inherit; + text-color: inherit; +} + +window { + height: 360px; + border: 3px; + border-color: @border-col; + background-color: @bg-col; +} + +mainbox { + background-color: @bg-col; +} + +inputbar { + children: [prompt,entry]; + background-color: @bg-col; + border-radius: 5px; + padding: 2px; +} + +prompt { + background-color: @blue; + padding: 6px; + text-color: @bg-col; + border-radius: 3px; + margin: 20px 0px 0px 20px; +} + +textbox-prompt-colon { + expand: false; + str: ":"; +} + +entry { + padding: 6px; + margin: 20px 0px 0px 10px; + text-color: @fg-col; + background-color: @bg-col; +} + +listview { + border: 0px 0px 0px; + padding: 6px 0px 0px; + margin: 10px 0px 0px 20px; + columns: 2; + lines: 5; + background-color: @bg-col; +} + +element { + padding: 5px; + background-color: @bg-col; + text-color: @fg-col ; +} + +element-icon { + size: 25px; +} + +element selected { + background-color: @selected-col ; + text-color: @fg-col2 ; +} + +mode-switcher { + spacing: 0; + } + +button { + padding: 10px; + background-color: @bg-col-light; + text-color: @grey; + vertical-align: 0.5; + horizontal-align: 0.5; +} + +button selected { + background-color: @bg-col; + text-color: @blue; +} + +message { + background-color: @bg-col-light; + margin: 2px; + padding: 2px; + border-radius: 5px; +} + +textbox { + padding: 6px; + margin: 20px 0px 0px 20px; + text-color: @blue; + background-color: @bg-col-light; +} diff --git a/dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-mocha.rasi b/dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-mocha.rasi new file mode 100644 index 0000000..38c0b80 --- /dev/null +++ b/dots/berryrice/rofi/.local/share/rofi/themes/catppuccin-mocha.rasi @@ -0,0 +1,111 @@ +* { + bg-col: #1e1e2e; + bg-col-light: #1e1e2e; + border-col: #1e1e2e; + selected-col: #1e1e2e; + blue: #89b4fa; + fg-col: #cdd6f4; + fg-col2: #f38ba8; + grey: #6c7086; + + width: 600; + font: "JetBrainsMono Nerd Font 14"; +} + +element-text, element-icon , mode-switcher { + background-color: inherit; + text-color: inherit; +} + +window { + height: 360px; + border: 3px; + border-color: @border-col; + background-color: @bg-col; +} + +mainbox { + background-color: @bg-col; +} + +inputbar { + children: [prompt,entry]; + background-color: @bg-col; + border-radius: 5px; + padding: 2px; +} + +prompt { + background-color: @blue; + padding: 6px; + text-color: @bg-col; + border-radius: 3px; + margin: 20px 0px 0px 20px; +} + +textbox-prompt-colon { + expand: false; + str: ":"; +} + +entry { + padding: 6px; + margin: 20px 0px 0px 10px; + text-color: @fg-col; + background-color: @bg-col; +} + +listview { + border: 0px 0px 0px; + padding: 6px 0px 0px; + margin: 10px 0px 0px 20px; + columns: 2; + lines: 5; + background-color: @bg-col; +} + +element { + padding: 5px; + background-color: @bg-col; + text-color: @fg-col ; +} + +element-icon { + size: 25px; +} + +element selected { + background-color: @selected-col ; + text-color: @fg-col2 ; +} + +mode-switcher { + spacing: 0; + } + +button { + padding: 10px; + background-color: @bg-col-light; + text-color: @grey; + vertical-align: 0.5; + horizontal-align: 0.5; +} + +button selected { + background-color: @bg-col; + text-color: @blue; +} + +message { + background-color: @bg-col-light; + margin: 2px; + padding: 2px; + border-radius: 5px; +} + +textbox { + padding: 6px; + margin: 20px 0px 0px 20px; + text-color: @blue; + background-color: @bg-col-light; +} diff --git a/dots/berryrice/stow b/dots/berryrice/stow new file mode 100755 index 0000000..c154394 --- /dev/null +++ b/dots/berryrice/stow @@ -0,0 +1,5 @@ +#!/bin/sh + +DIR="$(realpath "$(dirname "$0")")" +set -x +stow -d "$DIR" -t "$HOME" $@ diff --git a/dots/berryrice/wm/.config/berry/autostart b/dots/berryrice/wm/.config/berry/autostart new file mode 100755 index 0000000..36d1d22 --- /dev/null +++ b/dots/berryrice/wm/.config/berry/autostart @@ -0,0 +1,32 @@ +#!/bin/bash + + +pgrep -x sxhkd 2> /dev/null || sxhkd -c ~/.config/berry/sxhkdrc & + +feh --bg-fill ~/wallpaper/banner.jpg +pkill picom; picom & +ruler & +~/.config/polybar/launch.sh & + +# Set decoration geometry +berryc border_width 0 +berryc inner_border_width 0 +berryc title_height 30 +berryc edge_gap 42 42 6 6 + +berryc draw_text false + +# Set decoration colors +berryc focus_color 292D3E +berryc unfocus_color 292D3E + +berryc inner_focus_color 89b4fa +berryc inner_unfocus_color 585b70 + +berryc text_focus_color cdd6f4 +berryc text_unfocus_color cdd6f4 + +# Other options +berryc smart_place "true" +berryc edge_lock "true" +berryc set_font "JetBrains Mono Nerd Font-9" diff --git a/dots/berryrice/wm/.config/berry/sxhkdrc b/dots/berryrice/wm/.config/berry/sxhkdrc new file mode 100755 index 0000000..b6896f8 --- /dev/null +++ b/dots/berryrice/wm/.config/berry/sxhkdrc @@ -0,0 +1,70 @@ +# +# wm independent hotkeys +# + +# terminal emulator +super + shift + Return + alacritty -e tmux + +super + shift + a + alacritty + +super + shift + w + firefox + +# program launcher +super + space + rofi -show drun + +super + w + rofi -show window + +# make sxhkd reload its configuration files: +super + Escape + pkill -USR1 -x sxhkd + +# +# berry hotkeys +# + +super + {h, j, k, l} + berryc window_move {-50 0, 0 50, 0 -50, 50 0} + +super + shift + {h, j, k, l} + berryc window_resize {-50 0, 0 50, 0 -50, 50 0} + +super + {1-9} + berryc switch_workspace {0-9} + +super + shift + {1-9} + berryc send_to_workspace {0-9} + +super + m + berryc window_monocle + +super + f + berryc fullscreen + +super + p + berryc snap_right + +super + o + berryc snap_left + +super + n + berryc toggle_decorations + +super + {Tab,r} + berryc cycle_focus + +super + shift + e + killall berry + +super + shift + q + berryc window_close + +super + c + berryc window_center + +~button1 + berryc pointer_focus diff --git a/dots/berryrice/wm/.config/picom/picom.conf b/dots/berryrice/wm/.config/picom/picom.conf new file mode 100644 index 0000000..0e4ebe0 --- /dev/null +++ b/dots/berryrice/wm/.config/picom/picom.conf @@ -0,0 +1,19 @@ +#vim:ft=conf + +fade-in-step = 1.0 +fade-out-step = 1.0 + +backend = "xrender" +#backend = "glx" + +opacity-rule = [ + "100:class_g = 'Brave-browser'" +] + +blur-background-exclude = [ + "class_g = 'zoom'" +] + +rounded-corners-exclude = [ + "class_g = 'Polybar'" +] diff --git a/dots/i3rice/stow b/dots/i3rice/stow new file mode 100755 index 0000000..c154394 --- /dev/null +++ b/dots/i3rice/stow @@ -0,0 +1,5 @@ +#!/bin/sh + +DIR="$(realpath "$(dirname "$0")")" +set -x +stow -d "$DIR" -t "$HOME" $@ diff --git a/dots/i3config b/dots/i3rice/wm/.config/i3/config similarity index 100% rename from dots/i3config rename to dots/i3rice/wm/.config/i3/config diff --git a/dots/picom.conf b/dots/i3rice/wm/.config/picom/picom.conf similarity index 100% rename from dots/picom.conf rename to dots/i3rice/wm/.config/picom/picom.conf diff --git a/dots/polybar.ini b/dots/i3rice/wm/.config/polybar/config.ini similarity index 100% rename from dots/polybar.ini rename to dots/i3rice/wm/.config/polybar/config.ini diff --git a/dots/vimrc b/dots/vimrc deleted file mode 100644 index 5309e17..0000000 --- a/dots/vimrc +++ /dev/null @@ -1,77 +0,0 @@ -filetype plugin indent on -filetype on - -" options -set nu -set rnu - -set mouse+=a -set linebreak -set shiftwidth=2 -set tabstop=2 -set softtabstop=2 -set expandtab -set smarttab -set shiftround -set autoindent -set textwidth=80 -set colorcolumn=80 -set list -set nowrap - -set undofile nohlsearch incsearch - -set scrolloff=7 - -autocmd FileType tex,text set nosmarttab autoindent -autocmd Filetype python set textwidth=0 formatprg=autopep8 shiftwidth=4 tabstop=4 softtabstop=4 -autocmd FileType c,cpp,slang set nosmarttab autoindent -autocmd Filetype markdown set nosmarttab shiftwidth=4 tabstop=4 softtabstop=4 autoindent - -" Remaps - -let g:mapleader=" " -nnoremap j gj -nnoremap k gk - -nnoremap , h -nnoremap , j -nnoremap , k -nnoremap , l - -nnoremap h -nnoremap j -nnoremap k -nnoremap l - -inoremap ā -inoremap ē -inoremap ī -inoremap ō -inoremap ū - -nnoremap :w:!texbld run compile -nnoremap :w:!./test.sh - -vnoremap J :m '>+1gv=gv -vnoremap K :m '<-2gv=gv - -nnoremap J mzJ`z -nnoremap zz -nnoremap zz -nnoremap n nzzzv -nnoremap N Nzzzv - -xnoremap p _dP -vnoremap y +y -nnoremap y +y -nnoremap Y +Y -nnoremap x :!chmod +x %:p -nnoremap X :!chmod -x % -nnoremap e :! %:p - - -" Status Line -" https://www.tdaly.co.uk/projects/vim-statusline-generator/ -" - diff --git a/install_alpine.sh b/install_alpine.sh index 993312f..01d9474 100755 --- a/install_alpine.sh +++ b/install_alpine.sh @@ -96,20 +96,9 @@ EOF echo "Dylan Araps scripts" cd "$HOME" || exit 1; mkdir -p repos - git clone https://github.com/dylanaraps/pfetch "$HOME/repos/pfetch" - git clone https://github.com/dylanaraps/neofetch "$HOME/repos/neofetch" - git clone https://github.com/dylanaraps/fff "$HOME/repos/fff" - - cd "$HOME/repos/pfetch" || exit 1; - doas make install || exit 2; - cd "$HOME" || exit 1; - - cd "$HOME/repos/neofetch" || exit 1; - doas make install || exit 2; - cd "$HOME" || exit 1; - - cd "$HOME/repos/fff" || exit 1; - doas make install || exit 2; + git clone https://github.com/dylanaraps/pfetch "$HOME/repos/pfetch" && cd "$HOME/repos/pfetch" && doas make install + git clone https://github.com/dylanaraps/neofetch "$HOME/repos/neofetch" && cd "$HOME/repos/neofetch" && doas make install + git clone https://github.com/dylanaraps/fff "$HOME/repos/fff" && cd "$HOME/repos/fff" && doas make install cd "$HOME" || exit 1; } @@ -164,7 +153,7 @@ EOF doas apk add nfs-utils samba cifs-utils mkdir -p "$HOME/nfs/rpi" && mkdir -p "$HOME/nfs/d2" echo 'export WORKSPACES=$HOME/nfs/d2/ohsg11/s2:$HOME/nfs/rpi/ohsg11/s2:$WORKSPACES' >> ~/.zshrc - echo "alias schoolmount='doas mount 192.168.1.34:/srv/nfs ~/nfs/rpi'" >> ~/.zshrc + echo "alias schoolmount='doas mount 192.168.1.179:/srv/nfs ~/nfs/rpi'" >> ~/.zshrc cat <> ~/.zshrc alias d2mount='doas mount.cifs -o username=junikim,uid=\$(id -u),gid=\$(id -g) //157.245.86.196/d2nas ~/nfs/d2' EOF @@ -173,29 +162,12 @@ EOF graphical() { # xorg and drivers doas setup-xorg-base - doas apk add xf86-video-qxl xf86-video-vmware virtualbox-guest-additions-x11 mesa-egl xrandr - doas apk add xf86-input-evdev + doas apk add xf86-video-qxl xf86-video-vmware virtualbox-guest-additions-x11 mesa-egl xrandr xf86-input-evdev xsel # wm applications - doas apk add i3wm alacritty polybar i3lock rofi feh picom firefox - - # misc - doas apk add xsel - - # fonts - doas apk add font-jetbrains-mono-nerd terminus-font ttf-inconsolata ttf-dejavu font-noto font-noto-cjk ttf-font-awesome font-noto-extra - - mkdir -p "$HOME/.local/share/fonts" || exit 1 - wget https://github.com/fauno/siji/raw/master/ttf/siji.ttf -O "$HOME/.local/share/fonts/siji.ttf" || exit 1 - fc-cache -rv - - mkdir -p "$HOME/.config/polybar" || exit 1 - mkdir -p "$HOME/.config/i3" || exit 1 - mkdir -p "$HOME/.config/picom" || exit 1 - cp "$DIR/dots/polybar.ini" "$HOME/.config/polybar/config" || exit 1 - cp "$DIR/dots/i3config" "$HOME/.config/i3/config" || exit 1 - sed -i "s/brave-browser/firefox/" "$HOME/.config/i3/config" - cp "$DIR/dots/picom.conf" "$HOME/.config/picom/picom.conf" || exit 1 + doas apk add i3wm alacritty polybar i3lock feh picom firefox stow + # rofi dependencies + doas apk add papairus-icon-theme librsvg gdk-pixbuf-dev rofi mkdir -p "$HOME/.config/alacritty" || exit 1 cp "$DIR/dots/alacritty.yml" "$HOME/.config/alacritty/alacritty.yml" || exit 1 @@ -205,6 +177,15 @@ EOF mkdir -p "$HOME/wallpaper" wget https://alpinelinux.org/banner.jpg -O "$HOME/wallpaper/banner.jpg" sed -i "s|exec --no-startup-id nitrogen --restore|exec --no-startup-id feh --bg-fill ~/wallpaper/banner.jpg|" "$HOME/.config/i3/config" + + # fonts + doas apk add font-jetbrains-mono-nerd terminus-font ttf-inconsolata ttf-dejavu font-noto font-noto-cjk ttf-font-awesome font-noto-extra font-arimo + mkdir -p "$HOME/.local/share/fonts" || exit 1 + wget https://github.com/fauno/siji/raw/master/ttf/siji.ttf -O "$HOME/.local/share/fonts/siji.ttf" || exit 1 + fc-cache -rv + + "$DIR/dots/i3rice/stow" wm + sed -i "s/brave-browser/firefox/" "$HOME/.config/i3/config" } (dev && sysinfo && dotfiles && vimconfigs) || exit 1