From b48cea9c40e80e0303f055f78b1e51a59b07b723 Mon Sep 17 00:00:00 2001
From: Tom Barrett <spalf0@gmail.com>
Date: Wed, 23 Oct 2019 09:13:32 -0500
Subject: new abbrs, removed comments, use /home/tom, added more requirements
---
.config/fish/fish_variables | 2 ++
.config/user-dirs.dirs | 7 -------
build | 17 +++++++++++------
required | 3 +++
4 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index bdfdf75..c020444 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -7,6 +7,8 @@ SETUVAR __fish_init_2_3_0:\x1d
SETUVAR __fish_init_3_x:\x1d
SETUVAR _fish_abbr_ifconfig:ip\x20addr
SETUVAR _fish_abbr_vim:nvim
+SETUVAR _fish_abbr_v:nvim
+SETUVAR _fish_abbr_m:make
SETUVAR fish_color_autosuggestion:64DF85
SETUVAR fish_color_cancel:\x2dr
SETUVAR fish_color_command:00BF32
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index bc33f74..e98602f 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -1,10 +1,3 @@
-# This file is written by xdg-user-dirs-update
-# If you want to change or add directories, just edit the line you're
-# interested in. All local changes will be retained on the next run.
-# Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
-# homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
-# absolute path. No other format is supported.
-#
XDG_DESKTOP_DIR="$HOME/"
XDG_DOWNLOAD_DIR="$HOME/downloads/"
XDG_TEMPLATES_DIR="$HOME/downloads/"
diff --git a/build b/build
index a5bd1ad..9f2d3f0 100755
--- a/build
+++ b/build
@@ -1,15 +1,14 @@
#!/bin/bash
# var setup
-HOME_DIR='/home/tom'
-RC_DIR=$HOME_DIR'/src/rc'
+RC_DIR=$HOME'/src/rc'
# git setup
git config --global user.name "Tom Barrett"
git config --global user.email "tom@tombarrett.xyz"
# dwm setup
-DWM_DIR=$HOME_DIR'/src/dwm'
+DWM_DIR=$HOME'/src/dwm'
git clone https://git.suckless.org/dwm $DWM_DIR
patch $DWM_DIR'/dwm.c' $RC_DIR'/dwm/vanitygaps.diff'
@@ -20,18 +19,24 @@ cp $RC_DIR'/dwm/config.h' $DWM_DIR
make -C $DWM_DIR
# dwmstatus setup
-DWMSTS_DIR=$HOME_DIR'/src/dwmstatus'
+DWMSTS_DIR=$HOME'/src/dwmstatus'
git clone https://git.suckless.org/dwmstatus $DWMSTS_DIR
patch $DWMSTS_DIR'/dwmstatus.c' $RC_DIR'/dwmstatus/custom.diff'
make -C $DWMSTS_DIR
+# fish setup
+cp -r $RC_DIR'/.config/fish' $HOME'/.config/'
+
+# freedesktop setup
+cp $RC_DIR'/.config/user-dirs.dirs' $HOME'/.config/'
+
# xorg setup
-cp $RC_DIR'/.xinitrc' $HOME_DIR
+cp $RC_DIR'/.xinitrc' $HOME
# autostart script
-cp $RC_DIR'/.autostart' $HOME_DIR
+cp $RC_DIR'/.autostart' $HOME
# extras
#vboxmanage setproperty machinefolder /home/tom/vms
diff --git a/required b/required
index 93ce480..6da39fb 100755
--- a/required
+++ b/required
@@ -5,8 +5,11 @@ apt install w3m \
xorg-dev \
nitrogen \
arandr \
+ scrot \
+ feh \
xinit \
htop \
+ ncdu \
tree \
fish \
git \
--
cgit v1.2.3