aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xenv/.config/.profile5
-rw-r--r--env/.config/hypr/hyprland.conf.old (renamed from env/.config/hypr/hyprland.conf)0
-rw-r--r--env/.config/hypr/hyprland.lua418
-rwxr-xr-xenv/.local/bin/system/start-scripts/autostart.sh5
-rwxr-xr-xrun.sh19
-rwxr-xr-xruns-all/env.sh12
-rwxr-xr-xruns-all/get-reqs-arch.sh31
-rwxr-xr-xruns-all/get-reqs-arch/audio.sh1
-rwxr-xr-xruns-all/get-reqs-arch/fonts.sh1
-rwxr-xr-xruns-all/get-reqs-arch/for-vr.sh1
-rwxr-xr-xruns-all/get-reqs-arch/fun.sh1
-rwxr-xr-xruns-all/get-reqs-arch/hyprland.sh1
-rwxr-xr-xruns-all/get-reqs-arch/i3.sh3
-rwxr-xr-xruns-all/get-reqs-arch/ime.sh1
-rwxr-xr-xruns-all/get-reqs-arch/misc.sh1
-rwxr-xr-xruns-all/get-reqs-arch/sway.sh1
-rwxr-xr-xruns-all/get-reqs-arch/tools.sh1
-rwxr-xr-xruns-all/get-reqs-arch/vpn-stuff.sh1
-rwxr-xr-xruns-all/get-reqs-arch/wayland.sh1
-rwxr-xr-xruns-all/get-reqs-arch/web.sh1
-rwxr-xr-xruns-all/get-reqs-arch/xorg.sh3
-rwxr-xr-xruns/env.sh17
-rwxr-xr-xruns/get-reqs-arch.sh6
23 files changed, 484 insertions, 47 deletions
diff --git a/env/.config/.profile b/env/.config/.profile
index a08ca97..ba6ff67 100755
--- a/env/.config/.profile
+++ b/env/.config/.profile
@@ -66,6 +66,7 @@ alias vim=nvim
alias notes="cd ~/stuff/notes && vim notes.adoc && cd ~"
alias ts="tmux-sessionizer.sh"
alias fman="bash -c 'compgen -c' | fzf | xargs man"
+alias ffmpreg="ffmpeg $@"
alias LC="fukn loadkeys ~/.config/swapscape.map"
@@ -110,9 +111,5 @@ alias gitlol="git log --oneline --graph --decorate"
alias nodem="find . -name 'node_modules' -type d | xargs du -sh | sort -hr | fzf -m --header \"select witch ones to delete\" --preview 'cat $(dirname {})/package.json'|awk print '{print $2}' | xargs -r rm -rf"
-alias walltaker="stuff/manual-programs/git/walltaker-client/walltaker.sh"
-alias savewall="stuff/manual-programs/git/walltaker-client/save.sh"
-
-
xset r rate 300 50
# xset r off
diff --git a/env/.config/hypr/hyprland.conf b/env/.config/hypr/hyprland.conf.old
index 4d2f81a..4d2f81a 100644
--- a/env/.config/hypr/hyprland.conf
+++ b/env/.config/hypr/hyprland.conf.old
diff --git a/env/.config/hypr/hyprland.lua b/env/.config/hypr/hyprland.lua
new file mode 100644
index 0000000..83f375c
--- /dev/null
+++ b/env/.config/hypr/hyprland.lua
@@ -0,0 +1,418 @@
+-- This is an example Hyprland Lua config file.
+-- Refer to the wiki for more information.
+-- https://wiki.hypr.land/Configuring/Start/
+
+-- Please note not all available settings / options are set here.
+-- For a full list, see the wiki
+
+-- You can (and should!!) split this configuration into multiple files
+-- Create your files separately and then require them like this:
+-- require("myColors")
+
+
+hl.env("QT_QPA_PLATFORMTHEME","qt6ct")
+hl.env("QT_QPA_PLATFORM","wayland")
+hl.env("LIBVA_DRIVER_NAME","nvidia")
+hl.env("GBM_BACKEND","nvidia-drm")
+hl.env("XDG_CURRENT_DESKTOP","Hyprland")
+hl.env("XDG_SESSION_TYPE","wayland")
+--hl.env("XDG_SESSION_DESKTOP","Hyprland")
+hl.env("GDK_BACKEND","wayland,x11,*")
+hl.env("HYPRLAND_PER_MONITOR_WORKSPACES","1")
+
+
+
+------------------
+---- MONITORS ----
+------------------
+
+-- See https://wiki.hypr.land/Configuring/Basics/Monitors/
+hl.monitor({
+ output = "HDMI-A-1",
+ mode = "1920x1200@59.95",
+ position = "0x0",
+ scale = "1",
+})
+
+hl.monitor({
+ output = "DP-1",
+ mode = "1920x1080@60.00",
+ position = "auto",
+ scale = "1",
+})
+
+
+---------------------
+---- MY PROGRAMS ----
+---------------------
+
+-- Set programs that you use
+local terminal = "wezterm"
+local terminal2 = "st"
+local fileManager = "pcmanfm"
+local menu = "rofi -show drun"
+
+
+-------------------
+---- AUTOSTART ----
+-------------------
+
+-- See https://wiki.hypr.land/Configuring/Basics/Autostart/
+
+-- Autostart necessary processes (like notifications daemons, status bars, etc.)
+-- Or execute your favorite apps at launch like this:
+
+hl.on("hyprland.start", function ()
+ hl.exec_cmd("dbus-update-activation-environment --all")
+ hl.exec_cmd("$HOME/.local/bin/system/start-scripts/autostart.sh")
+ hl.exec_cmd("waybar & hyprpaper")
+end)
+
+
+-------------------------------
+---- ENVIRONMENT VARIABLES ----
+-------------------------------
+
+-- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Environment-variables/
+
+hl.env("XCURSOR_SIZE", "24")
+hl.env("HYPRCURSOR_SIZE", "24")
+
+
+-----------------------
+----- PERMISSIONS -----
+-----------------------
+
+-- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Permissions/
+-- Please note permission changes here require a Hyprland restart and are not applied on-the-fly
+-- for security reasons
+
+-- hl.config({
+-- ecosystem = {
+-- enforce_permissions = true,
+-- },
+-- })
+
+-- hl.permission("/usr/(bin|local/bin)/grim", "screencopy", "allow")
+-- hl.permission("/usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland", "screencopy", "allow")
+-- hl.permission("/usr/(bin|local/bin)/hyprpm", "plugin", "allow")
+
+
+-----------------------
+---- LOOK AND FEEL ----
+-----------------------
+
+-- Refer to https://wiki.hypr.land/Configuring/Basics/Variables/
+hl.config({
+ general = {
+ gaps_in = 1,
+ gaps_out = 1,
+
+ border_size = 1,
+
+ col = {
+ active_border = { colors = {"rgba(8568e6ee)", "rgba(cf68e6ee)"}, angle = 45 },
+ inactive_border = "rgba(595959aa)",
+ },
+
+ -- Set to true to enable resizing windows by clicking and dragging on borders and gaps
+ resize_on_border = false,
+
+ -- Please see https://wiki.hypr.land/Configuring/Advanced-and-Cool/Tearing/ before you turn this on
+ allow_tearing = false,
+
+ layout = "dwindle",
+ },
+
+ decoration = {
+ rounding = 0,
+ rounding_power = 2,
+
+ -- Change transparency of focused and unfocused windows
+ active_opacity = 1.0,
+ inactive_opacity = 1.0,
+
+ shadow = {
+ enabled = true,
+ range = 4,
+ render_power = 3,
+ color = 0xee1a1a1a,
+ },
+
+ blur = {
+ enabled = true,
+ size = 3,
+ passes = 1,
+ vibrancy = 0.1696,
+ },
+ },
+
+ animations = {
+ enabled = true,
+ },
+})
+
+-- Default curves and animations, see https://wiki.hypr.land/Configuring/Advanced-and-Cool/Animations/
+hl.curve("myBezier", { type = "bezier", points = { {0.05, 0.9}, {0.1, 1.08} } })
+
+-- Your animations
+hl.animation({ leaf = "windows", enabled = true, speed = 3, bezier = "myBezier" })
+hl.animation({ leaf = "windowsOut", enabled = true, speed = 3, bezier = "default", style = "popin 80%" })
+hl.animation({ leaf = "windowsMove", enabled = true, speed = 4, bezier = "myBezier" })
+hl.animation({ leaf = "border", enabled = true, speed = 10, bezier = "default" })
+hl.animation({ leaf = "fade", enabled = true, speed = 3, bezier = "default" })
+hl.animation({ leaf = "workspaces", enabled = true, speed = 2, bezier = "default" })
+hl.animation({ leaf = "specialWorkspace", enabled = true, speed = 3, bezier = "default", style = "slidefadevert" })
+
+--hl.curve("easeOutQuint", { type = "bezier", points = { {0.23, 1}, {0.32, 1} } })
+--hl.curve("easeInOutCubic", { type = "bezier", points = { {0.65, 0.05}, {0.36, 1} } })
+--hl.curve("linear", { type = "bezier", points = { {0, 0}, {1, 1} } })
+--hl.curve("almostLinear", { type = "bezier", points = { {0.5, 0.5}, {0.75, 1} } })
+--hl.curve("quick", { type = "bezier", points = { {0.15, 0}, {0.1, 1} } })
+--
+---- Default springs
+--hl.curve("easy", { type = "spring", mass = 1, stiffness = 71.2633, dampening = 15.8273644 })
+--
+--hl.animation({ leaf = "global", enabled = true, speed = 10, bezier = "default" })
+--hl.animation({ leaf = "border", enabled = true, speed = 5.39, bezier = "easeOutQuint" })
+--hl.animation({ leaf = "windows", enabled = true, speed = 4.79, spring = "easy" })
+--hl.animation({ leaf = "windowsIn", enabled = true, speed = 4.1, spring = "easy", style = "popin 87%" })
+--hl.animation({ leaf = "windowsOut", enabled = true, speed = 1.49, bezier = "linear", style = "popin 87%" })
+--hl.animation({ leaf = "fadeIn", enabled = true, speed = 1.73, bezier = "almostLinear" })
+--hl.animation({ leaf = "fadeOut", enabled = true, speed = 1.46, bezier = "almostLinear" })
+--hl.animation({ leaf = "fade", enabled = true, speed = 3.03, bezier = "quick" })
+--hl.animation({ leaf = "layers", enabled = true, speed = 3.81, bezier = "easeOutQuint" })
+--hl.animation({ leaf = "layersIn", enabled = true, speed = 4, bezier = "easeOutQuint", style = "fade" })
+--hl.animation({ leaf = "layersOut", enabled = true, speed = 1.5, bezier = "linear", style = "fade" })
+--hl.animation({ leaf = "fadeLayersIn", enabled = true, speed = 1.79, bezier = "almostLinear" })
+--hl.animation({ leaf = "fadeLayersOut", enabled = true, speed = 1.39, bezier = "almostLinear" })
+--hl.animation({ leaf = "workspaces", enabled = true, speed = 1.94, bezier = "almostLinear", style = "fade" })
+--hl.animation({ leaf = "workspacesIn", enabled = true, speed = 1.21, bezier = "almostLinear", style = "fade" })
+--hl.animation({ leaf = "workspacesOut", enabled = true, speed = 1.94, bezier = "almostLinear", style = "fade" })
+--hl.animation({ leaf = "zoomFactor", enabled = true, speed = 7, bezier = "quick" })
+
+-- Ref https://wiki.hypr.land/Configuring/Basics/Workspace-Rules/
+-- "Smart gaps" / "No gaps when only"
+-- uncomment all if you wish to use that.
+-- hl.workspace_rule({ workspace = "w[tv1]", gaps_out = 0, gaps_in = 0 })
+-- hl.workspace_rule({ workspace = "f[1]", gaps_out = 0, gaps_in = 0 })
+-- hl.window_rule({
+-- name = "no-gaps-wtv1",
+-- match = { float = false, workspace = "w[tv1]" },
+-- border_size = 0,
+-- rounding = 0,
+-- })
+-- hl.window_rule({
+-- name = "no-gaps-f1",
+-- match = { float = false, workspace = "f[1]" },
+-- border_size = 0,
+-- rounding = 0,
+-- })
+
+-- See https://wiki.hypr.land/Configuring/Layouts/Dwindle-Layout/ for more
+hl.config({
+ dwindle = {
+ preserve_split = true, -- You probably want this
+ },
+})
+
+-- See https://wiki.hypr.land/Configuring/Layouts/Master-Layout/ for more
+hl.config({
+ master = {
+ new_status = "master",
+ },
+})
+
+-- See https://wiki.hypr.land/Configuring/Layouts/Scrolling-Layout/ for more
+hl.config({
+ scrolling = {
+ fullscreen_on_one_column = true,
+ },
+})
+
+----------------
+---- MISC ----
+----------------
+
+hl.config({
+ misc = {
+ force_default_wallpaper = -1, -- Set to 0 or 1 to disable the anime mascot wallpapers
+ disable_hyprland_logo = false, -- If true disables the random hyprland logo / anime girl background. :(
+ },
+})
+
+
+---------------
+---- INPUT ----
+---------------
+
+hl.config({
+ input = {
+ kb_layout = "us",
+ kb_variant = "",
+ kb_model = "",
+ kb_options = "caps:swapescape",
+ kb_rules = "",
+
+ follow_mouse = 1,
+
+ sensitivity = 0, -- -1.0 - 1.0, 0 means no modification.
+
+ touchpad = {
+ natural_scroll = false,
+ },
+ },
+})
+
+hl.gesture({
+ fingers = 3,
+ direction = "horizontal",
+ action = "workspace"
+})
+
+-- Example per-device config
+-- See https://wiki.hypr.land/Configuring/Advanced-and-Cool/Devices/ for more
+hl.device({
+ name = "epic-mouse-v1",
+ sensitivity = -0.5,
+})
+
+
+---------------------
+---- KEYBINDINGS ----
+---------------------
+
+local mainMod = "SUPER" -- Sets "Windows" key as main modifier
+
+-- Example binds, see https://wiki.hypr.land/Configuring/Basics/Binds/ for more
+hl.bind(mainMod .. " + RETURN", hl.dsp.exec_cmd(terminal))
+hl.bind(mainMod .. " + SHIFT + RETURN", hl.dsp.exec_cmd(terminal2))
+local closeWindowBind = hl.bind(mainMod .. " + Q", hl.dsp.window.close())
+-- closeWindowBind:set_enabled(false)
+hl.bind(mainMod .. " + SHIFT + Q", hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch 'hl.dsp.exit()'"))
+--hl.bind(mainMod .. " + E", hl.dsp.exec_cmd(fileManager))
+hl.bind(mainMod .. " + SPACE", hl.dsp.window.float({ action = "toggle" }))
+hl.bind(mainMod .. " + D", hl.dsp.exec_cmd(menu))
+hl.bind(mainMod .. " + P", hl.dsp.window.pseudo())
+hl.bind(mainMod .. " + I", hl.dsp.layout("togglesplit")) -- dwindle only
+hl.bind(mainMod .. "+ F", hl.dsp.window.fullscreen({ mode = "maximized", action = "toggle" }))
+hl.bind(mainMod .. "+ SHIFT + F", hl.dsp.window.fullscreen({ action = "toggle" }))
+
+-- Move focus with mainMod + arrow keys
+hl.bind(mainMod .. " + h", hl.dsp.focus({ direction = "left" }))
+hl.bind(mainMod .. " + l", hl.dsp.focus({ direction = "right" }))
+hl.bind(mainMod .. " + k", hl.dsp.focus({ direction = "up" }))
+hl.bind(mainMod .. " + j", hl.dsp.focus({ direction = "down" }))
+
+hl.bind(mainMod .. " + SHIFT + h", hl.dsp.window.move({ direction = "left" }))
+hl.bind(mainMod .. " + SHIFT + l", hl.dsp.window.move({ direction = "right" }))
+hl.bind(mainMod .. " + SHIFT + k", hl.dsp.window.move({ direction = "up" }))
+hl.bind(mainMod .. " + SHIFT + j", hl.dsp.window.move({ direction = "down" }))
+
+hl.bind(mainMod .. " + R", hl.dsp.submap("resize"))
+
+-- Start a submap called "resize".
+hl.define_submap("resize", function()
+
+ -- Set repeating binds for resizing the active window.
+ hl.bind(mainMod .. " + L", hl.dsp.window.resize({ x = 50, y = 0, relative = true}), { repeating = true })
+ hl.bind(mainMod .. " + H", hl.dsp.window.resize({ x = -50, y = 0, relative = true}), { repeating = true })
+ hl.bind(mainMod .. " + K", hl.dsp.window.resize({ x = 0, y = 50, relative = true}), { repeating = true })
+ hl.bind(mainMod .. " + L", hl.dsp.window.resize({ x = 0, y = -50, relative = true}), { repeating = true })
+
+ -- Use `reset` to go back to the global submap
+ hl.bind(mainMod .. " + E", hl.dsp.submap("reset"))
+
+end)
+
+-- Switch workspaces with mainMod + [0-9]
+-- Move active window to a workspace with mainMod + SHIFT + [0-9]
+
+hl.bind(mainMod .. " + O", hl.dsp.focus({ monitor = "+1" }))
+hl.bind(mainMod .. " + SHIFT + O", hl.dsp.window.move({ monitor = "+1" }))
+
+for i = 1, 10 do
+ local key = i % 10 -- 10 maps to key 0
+ hl.workspace_rule({ workspace = i, monitor = "HDMI-A-1", default = (i == 1)})
+ hl.workspace_rule({ workspace = i + 10, monitor = "DP-1", default = (i == 1)})
+
+ hl.bind(mainMod .. " + " .. key, hl.dsp.focus({ workspace = "r~"..i }))
+ hl.bind(mainMod .. " + SHIFT + " .. key, hl.dsp.window.move({ workspace = "r~"..i, follow = false }))
+end
+
+-- Example special workspace (scratchpad)
+hl.bind(mainMod .. " + S", hl.dsp.workspace.toggle_special("magic"))
+hl.bind(mainMod .. " + SHIFT + S", hl.dsp.window.move({ workspace = "special:magic" }))
+
+-- Scroll through existing workspaces with mainMod + scroll
+hl.bind(mainMod .. " + mouse_down", hl.dsp.focus({ workspace = "e+1" }))
+hl.bind(mainMod .. " + mouse_up", hl.dsp.focus({ workspace = "e-1" }))
+
+-- Move/resize windows with mainMod + LMB/RMB and dragging
+hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(), { mouse = true })
+hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true })
+
+-- Laptop multimedia keys for volume and LCD brightness
+hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"), { locked = true, repeating = true })
+hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"), { locked = true, repeating = true })
+hl.bind("XF86AudioMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"), { locked = true, repeating = true })
+hl.bind("XF86AudioMicMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"), { locked = true, repeating = true })
+hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%+"), { locked = true, repeating = true })
+hl.bind("XF86MonBrightnessDown",hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%-"), { locked = true, repeating = true })
+
+-- Requires playerctl
+hl.bind("XF86AudioNext", hl.dsp.exec_cmd("playerctl next"), { locked = true })
+hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
+hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
+hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), { locked = true })
+
+
+--------------------------------
+---- WINDOWS AND WORKSPACES ----
+--------------------------------
+
+-- See https://wiki.hypr.land/Configuring/Basics/Window-Rules/
+-- and https://wiki.hypr.land/Configuring/Basics/Workspace-Rules/
+
+-- Example window rules that are useful
+
+local suppressMaximizeRule = hl.window_rule({
+ -- Ignore maximize requests from all apps. You'll probably like this.
+ name = "suppress-maximize-events",
+ match = { class = ".*" },
+
+ suppress_event = "maximize",
+})
+-- suppressMaximizeRule:set_enabled(false)
+
+hl.window_rule({
+ -- Fix some dragging issues with XWayland
+ name = "fix-xwayland-drags",
+ match = {
+ class = "^$",
+ title = "^$",
+ xwayland = true,
+ float = true,
+ fullscreen = false,
+ pin = false,
+ },
+
+ no_focus = true,
+})
+
+-- Layer rules also return a handle.
+-- local overlayLayerRule = hl.layer_rule({
+-- name = "no-anim-overlay",
+-- match = { namespace = "^my-overlay$" },
+-- no_anim = true,
+-- })
+-- overlayLayerRule:set_enabled(false)
+
+-- Hyprland-run windowrule
+hl.window_rule({
+ name = "move-hyprland-run",
+ match = { class = "hyprland-run" },
+
+ move = "20 monitor_h-120",
+ float = true,
+})
diff --git a/env/.local/bin/system/start-scripts/autostart.sh b/env/.local/bin/system/start-scripts/autostart.sh
index 4a09cae..db9d31f 100755
--- a/env/.local/bin/system/start-scripts/autostart.sh
+++ b/env/.local/bin/system/start-scripts/autostart.sh
@@ -4,9 +4,10 @@ cd "$(dirname "$0")"
sleep 0.1
xset s 0
nitrogen --restore &
-if [ "$XDG_CURRENT_DESKTOP" == "sway:wlroots" ]; then
+
+if [ "$WAYLAND_DISPLAY" ]; then
PID=$(pidof swaybg)
- swaybg -o HDMI-A-1 -i "/home/iceyrazor/stuff/media/wallpapers/purple/IMG_0276.jpg" -m fill -o DP-1 -i "/home/iceyrazor/stuff/media/wallpapers/purple/IMG_0276.jpg" -m fill & disown
+ swaybg -o HDMI-A-1 -i "/home/iceyrazor/stuff/media/wallpapers/neotheta2.png" -m fill -o DP-1 -i "/home/iceyrazor/stuff/media/wallpapers/neotheta2.png" -m fill & disown
sleep 0.4s
kill $PID
fi
diff --git a/run.sh b/run.sh
index e2c54c8..c06feed 100755
--- a/run.sh
+++ b/run.sh
@@ -10,6 +10,9 @@ while getopts "al" opt; do
;;
l) list_runs=1
;;
+ *) echo invalid args
+ exit
+ ;;
esac
done
@@ -17,12 +20,12 @@ shift $((OPTIND-1))
[ "${1:-}" = "--" ] && shift
-script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+script_dir="$( cd "$( dirname "$0" )" || exit > /dev/null && pwd )"
-runs_dir="$(find $script_dir/runs -mindepth 1 -maxdepth 1 -type f -executable)"
-runs_dir_all="$(find $script_dir/runs-all -mindepth 1 -maxdepth 1 -type f -executable)"
+runs_dir="$(find "$script_dir/runs" -mindepth 1 -maxdepth 1 -type f -executable)"
+runs_dir_all="$(find "$script_dir/runs-all" -mindepth 1 -maxdepth 1 -type f -executable)"
-if [ $list_runs == 1 ]; then
+if [ $list_runs = 1 ]; then
printf " runs --------------\n"
ls "$script_dir/runs"
printf "\n runs-all ----------\n"
@@ -33,18 +36,18 @@ fi
if [ "$1" != "" ]; then
[ -e "$script_dir/runs/$1.sh" ] && . "$script_dir/runs/$1.sh"
- if [ $run_runs_all == 1 ]; then
+ if [ $run_runs_all = 1 ]; then
. "$script_dir/runs-all/$1.sh"
fi
else
for s in $runs_dir; do
- echo running $s
+ echo "running $s"
. "$s"
done
- if [ $run_runs_all == 1 ]; then
+ if [ $run_runs_all = 1 ]; then
for s in $runs_dir_all; do
- echo running $s
+ echo "running $s"
. "$s"
done
fi
diff --git a/runs-all/env.sh b/runs-all/env.sh
index 970fe3f..a3ae7e7 100755
--- a/runs-all/env.sh
+++ b/runs-all/env.sh
@@ -1,7 +1,7 @@
#!/bin/sh
echo DEPLOYING ENV ALL
-cp -r $script_dir/env/. "$DEV_ENV"
-[ -d "$script_dir/env_private/env/" ] && cp -r $script_dir/env_private/env/. "$DEV_ENV"
+cp -r "$script_dir/env/." "$DEV_ENV"
+[ -d "$script_dir/env_private/env/" ] && cp -r "$script_dir/env_private/env/." "$DEV_ENV"
if [ ! -f "/etc/profile" ]; then
@@ -9,17 +9,17 @@ if [ ! -f "/etc/profile" ]; then
echo SKIPPING SETTING \$PATH
else
export PATH=""
- source /etc/profile
+ . /etc/profile
paths="$PATH"
- path_dirs="$(find $DEV_ENV/.local/bin/scripts -type d)"
+ path_dirs="$(find "$DEV_ENV/.local/bin/scripts" -type d)"
yt_cli_dir="$(find ~/stuff/ -name youtube-playlist-cli -type d)"
path_dirs="$path_dirs
$yt_cli_dir
$(find ~/stuff/ -name theme-setter -type d)
$(find ~/.local/bin/blender* -maxdepth 0 -type d)
-$(find $script_dir/keep/scripts -type d)
-$(find $script_dir/env_private/keep/scripts -type d)"
+$(find "$script_dir/keep/scripts" -type d)
+$(find "$script_dir/env_private/keep/scripts" -type d)"
for s in $path_dirs; do
echo "adding $s to path"
diff --git a/runs-all/get-reqs-arch.sh b/runs-all/get-reqs-arch.sh
index 1292cdc..abc25d6 100755
--- a/runs-all/get-reqs-arch.sh
+++ b/runs-all/get-reqs-arch.sh
@@ -1,37 +1,40 @@
-#!/bin/sh
+#!/bin/bash
. /etc/os-release
-if [ "$ID" == "artix" ] || [ "$ID" == "arch" ]; then
+if [ "$ID" = "artix" ] || [ "$ID" = "arch" ]; then
sudo="sudo"
- [ doas ] && sudo="doas"
+ which doas && sudo="doas"
echo GETTING ALL REQS ARCH
#aur
install_aur=0
- read -p "install aur manager? [y/N]" uin
- if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then
+ printf "install aur manager? [y/N]"
+ read -r uin
+ if [ "$uin" = "y" ] || [ "$uin" = "Y" ]; then
install_aur=1
fi
- aurm="paru"
- if [ $install_aur == 1 ]; then
- git clone https://aur.archlinux.org/paru.git
- cd paru
- makepkg -si
- fi
+ export aurm="paru"
#ask what to install
- reqs_dir="$(find $script_dir/runs-all/get-reqs-arch -mindepth 1 -maxdepth 1 -type f -executable)"
+ reqs_dir="$(find "$script_dir/runs-all/get-reqs-arch" -mindepth 1 -maxdepth 1 -type f -executable)"
reqs_list=()
for s in $reqs_dir; do
- read -p "$s? [y/N]" uin
- if [ "$uin" == "y" ] || [ "$uin" == "Y" ]; then
+ printf -- "%s? [y/N]" "$s"
+ read -r uin
+ if [ "$uin" = "y" ] || [ "$uin" = "Y" ]; then
reqs_list+=("$s")
fi
done
echo --------------
+ if [ $install_aur = 1 ]; then
+ git clone https://aur.archlinux.org/paru.git
+ cd paru || exit
+ makepkg -si
+ fi
+
#install
for s in "${reqs_list[@]}"; do
echo "running $s"
diff --git a/runs-all/get-reqs-arch/audio.sh b/runs-all/get-reqs-arch/audio.sh
index f5588ab..ce4747d 100755
--- a/runs-all/get-reqs-arch/audio.sh
+++ b/runs-all/get-reqs-arch/audio.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
$sudo pacman -S --noconfirm pipewire-pulse pipewire-alsa pipewire-jack
$sudo pacman -S --noconfirm qpwgraph
diff --git a/runs-all/get-reqs-arch/fonts.sh b/runs-all/get-reqs-arch/fonts.sh
index 6fa3410..595a230 100755
--- a/runs-all/get-reqs-arch/fonts.sh
+++ b/runs-all/get-reqs-arch/fonts.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
$sudo pacman -S --noconfirm font-manager ttf-inconsolata ttf-jetbrains-mono ttf-jetbrains-mono-nerd noto-fonts-emoji
$aurm -S --noconfirm ttf-b612
diff --git a/runs-all/get-reqs-arch/for-vr.sh b/runs-all/get-reqs-arch/for-vr.sh
index 486c8e7..1d8634d 100755
--- a/runs-all/get-reqs-arch/for-vr.sh
+++ b/runs-all/get-reqs-arch/for-vr.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
$sudo pacman -S --noconfirm cli11 eigen glib2 glib2-devel nlohmann-json patch
# $sudo pacman -S --noconfirm boost-libs boost #solarxr
diff --git a/runs-all/get-reqs-arch/fun.sh b/runs-all/get-reqs-arch/fun.sh
index 2299334..55c727d 100755
--- a/runs-all/get-reqs-arch/fun.sh
+++ b/runs-all/get-reqs-arch/fun.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
$sudo pacman -S --noconfirm fastfetch steam mpv mpv-mpris mpd
$sudo pacman -S --noconfirm mpd-mpris rmpc cowsay openrgb
diff --git a/runs-all/get-reqs-arch/hyprland.sh b/runs-all/get-reqs-arch/hyprland.sh
index 78f9b8a..4925a40 100755
--- a/runs-all/get-reqs-arch/hyprland.sh
+++ b/runs-all/get-reqs-arch/hyprland.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
$sudo pacman -S --noconfirm hyprland xdg-desktop-portal-hyprland wlogout hyprlock
. wayland.sh
diff --git a/runs-all/get-reqs-arch/i3.sh b/runs-all/get-reqs-arch/i3.sh
index 873ba51..ecdac9b 100755
--- a/runs-all/get-reqs-arch/i3.sh
+++ b/runs-all/get-reqs-arch/i3.sh
@@ -1,6 +1,7 @@
+#!/bin/sh
$sudo pacman -S --noconfirm i3 i3blocks
git clone --depth 1 https://github.com/vivien/i3blocks-contrib "$DEV_ENV/.config/i3blocks/git-dir"
-mv $DEV_ENV/.config/i3blocks/git-dir/* "$DEV_ENV/.config/i3blocks/"
+mv "$DEV_ENV/.config/i3blocks/git-dir/*" "$DEV_ENV/.config/i3blocks/"
$sudo rm -r "$DEV_ENV/.config/i3blocks/git-dir"
diff --git a/runs-all/get-reqs-arch/ime.sh b/runs-all/get-reqs-arch/ime.sh
index a389271..4dc1821 100755
--- a/runs-all/get-reqs-arch/ime.sh
+++ b/runs-all/get-reqs-arch/ime.sh
@@ -1 +1,2 @@
+#!/bin/sh
$sudo pacman -S --noconfirm fcitx5-im fcitx5-mozc fcitx5-im-emoji-picker-git
diff --git a/runs-all/get-reqs-arch/misc.sh b/runs-all/get-reqs-arch/misc.sh
index b85e738..7053c12 100755
--- a/runs-all/get-reqs-arch/misc.sh
+++ b/runs-all/get-reqs-arch/misc.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
$sudo pacman -S --noconfirm v4l2loopback-dkms sddm lxappearance reflector gnome-keyring seahorse yt-dlp grim slurp libnotify
$aurm -S --noconfirm obs-studio-git gpu-screen-recorder gpu-screen-recorder-gtk urlview
diff --git a/runs-all/get-reqs-arch/sway.sh b/runs-all/get-reqs-arch/sway.sh
index 14f5aa1..77ca5ee 100755
--- a/runs-all/get-reqs-arch/sway.sh
+++ b/runs-all/get-reqs-arch/sway.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
$sudo pacman -S --noconfirm xdg-desktop-portal-wlr sway
. wayland.sh
diff --git a/runs-all/get-reqs-arch/tools.sh b/runs-all/get-reqs-arch/tools.sh
index 0722b43..7ef85c8 100755
--- a/runs-all/get-reqs-arch/tools.sh
+++ b/runs-all/get-reqs-arch/tools.sh
@@ -1,3 +1,4 @@
+#!/bin/sh
$sudo pacman -S --noconfirm zsh ntfs-3g inetutils doas gvfs-mtp btop htop wezterm rxvt-unicode lf ripgrep rofi-wayland networkmanager bat
$sudo pacman -S --noconfirm atuin
$aurm -S librewolf-bin
diff --git a/runs-all/get-reqs-arch/vpn-stuff.sh b/runs-all/get-reqs-arch/vpn-stuff.sh
index 3c8529a..b7e4529 100755
--- a/runs-all/get-reqs-arch/vpn-stuff.sh
+++ b/runs-all/get-reqs-arch/vpn-stuff.sh
@@ -1 +1,2 @@
+#!/bin/sh
$sudo pacman -S --noconfirm openvpn networkmanager-openvpn openresolv
diff --git a/runs-all/get-reqs-arch/wayland.sh b/runs-all/get-reqs-arch/wayland.sh
index a1fd2f6..2d5efcd 100755
--- a/runs-all/get-reqs-arch/wayland.sh
+++ b/runs-all/get-reqs-arch/wayland.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
$sudo pacman -S --noconfirm wayland waybar xdg-desktop-portal xdg-desktop-portal-gtk qt6-wayland qt5-wayland xorg-xwayland
$aurm -S --noconfirm dunst-git sddm-theme-tokyo-night-git
diff --git a/runs-all/get-reqs-arch/web.sh b/runs-all/get-reqs-arch/web.sh
index bd392fa..3c6e34a 100755
--- a/runs-all/get-reqs-arch/web.sh
+++ b/runs-all/get-reqs-arch/web.sh
@@ -1,2 +1,3 @@
+#!/bin/sh
$sudo pacman -S --noconfirm asciidoc asciidoctor
$aurm -S --noconfirm ruby-asciidoctor-diagram ruby-asciidoctor-diagram-plantuml
diff --git a/runs-all/get-reqs-arch/xorg.sh b/runs-all/get-reqs-arch/xorg.sh
index 2a37188..15177b1 100755
--- a/runs-all/get-reqs-arch/xorg.sh
+++ b/runs-all/get-reqs-arch/xorg.sh
@@ -1 +1,2 @@
-$sudo pacman -S --noconfirm xorg-server xorg-xinit libxft libxinerama
+#!/bin/sh
+$sudo pacman -S --noconfirm xlibre-server xorg-xinit libxft libxinerama
diff --git a/runs/env.sh b/runs/env.sh
index aba0c05..7f34098 100755
--- a/runs/env.sh
+++ b/runs/env.sh
@@ -2,13 +2,14 @@
echo DEPLOYING ENV
-cp $script_dir/env/.bashrc "$DEV_ENV"
-cp $script_dir/env/.bash_profile "$DEV_ENV"
-cp $script_dir/env/.vimrc "$DEV_ENV"
+cp "$script_dir/env/.bashrc" "$DEV_ENV"
+cp "$script_dir/env/.bash_profile" "$DEV_ENV"
+cp "$script_dir/env/.vimrc" "$DEV_ENV"
mkdir "$DEV_ENV/.config"
-cp $script_dir/env/.config/.profile "$DEV_ENV/.config"
-cp -r $script_dir/env/.config/nvim "$DEV_ENV/.config"
-cp -r $script_dir/env/.config/tmux "$DEV_ENV/.config"
-cp -r $script_dir/env/.config/wezterm "$DEV_ENV/.config"
+cp "$script_dir/env/.config/.profile" "$DEV_ENV/.config"
+cp -r "$script_dir/env/.config/nvim" "$DEV_ENV/.config"
+cp -r "$script_dir/env/.config/vis" "$DEV_ENV/.config"
+cp -r "$script_dir/env/.config/tmux" "$DEV_ENV/.config"
+cp -r "$script_dir/env/.config/wezterm" "$DEV_ENV/.config"
-echo -----------------
+echo "-----------------"
diff --git a/runs/get-reqs-arch.sh b/runs/get-reqs-arch.sh
index 932afdf..e27b762 100755
--- a/runs/get-reqs-arch.sh
+++ b/runs/get-reqs-arch.sh
@@ -1,12 +1,12 @@
#!/bin/sh
. /etc/os-release
-if [ "$ID" == "artix" ] || [ "$ID" == "arch" ]; then
+if [ "$ID" = "artix" ] || [ "$ID" = "arch" ]; then
sudo="sudo"
- [ doas ] && sudo="doas"
+ which doas && sudo="doas"
echo GETTING MIN REQS
- $sudo pacman -S neovim rsync man-db wget git fzf grep
+ $sudo pacman -S neovim rsync man-db wget git fzf ugrep
$sudo pacman -S lf
echo -------------