From: Siraaj Khandkar <siraaj@khandkar.net>
Date: Thu, 14 Nov 2019 23:44:18 +0000 (-0500)
Subject: Merge branch 'mac'
X-Git-Url: https://git.xandkar.net/?a=commitdiff_plain;h=7d24acabcb96117ff2b51538640ac8fb8cc9c8d9;hp=2402773ffd11ee809d4115ab49e07d18462a9edf;p=khome.git

Merge branch 'mac'
---

diff --git a/Makefile b/Makefile
index 261b5a5..0e973dc 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,9 @@ MAKEFLAGS := --no-builtin-rules
 
 DEPS := $(wildcard deps/*)
 
-.PHONY: home pkgs_deb_install pkgs_deb_purge pkgs deps $(DEPS) pkgs_snap_classic pkgs_snap_strict
+.PHONY: home pkgs_deb_install pkgs_deb_purge pkgs_debian pkgs_mac pkgs_brew_install pkgs_brew_cask_install deps $(DEPS) pkgs_snap_classic pkgs_snap_strict mpdconf
 
-home:
+home: mpdconf
 	@cp  -Rp  home/bin           $(HOME)/
 	@cp  -Rp  home/lib           $(HOME)/
 	@cp       home/.compton.conf $(HOME)/
@@ -13,16 +13,32 @@ home:
 	@cp       home/.fonts.conf   $(HOME)/
 	@fc-cache                    $(HOME)/.fonts
 	@cp       home/.Rprofile     $(HOME)/
-	@cp       home/.mpdconf      $(HOME)/
 	@cp       home/.tmux.conf    $(HOME)/
 	@cp       home/.xbindkeysrc  $(HOME)/
 
-pkgs:
+mpdconf:
+	@mkdir -p ~/Archives/Audio
+	@mkdir -p ~/var/lib/mpd/playlists
+	@mkdir -p ~/var/log/mpd
+	@mkdir -p ~/var/run/mpd
+	@cp home/.mpdconf $(HOME)/
+
+pkgs_debian:
 	$(MAKE) pkgs_deb_install
 	$(MAKE) pkgs_deb_purge
 	$(MAKE) pkgs_snap_classic
 	$(MAKE) pkgs_snap_strict
 
+pkgs_mac:
+	$(MAKE) pkgs_brew_install
+	$(MAKE) pkgs_brew_cask_install
+
+pkgs_brew_install: list pkgs-brew-install.list
+	brew install $(shell ./list pkgs-brew-install.list)
+
+pkgs_brew_cask_install: list pkgs-brew-cask-install.list
+	brew cask install $(shell ./list pkgs-brew-cask-install.list)
+
 pkgs_deb_install: list pkgs-deb-install.list
 	sudo apt install $(shell ./list pkgs-deb-install.list)
 
diff --git a/home/.mpdconf b/home/.mpdconf
index 80142e3..a2b752e 100644
--- a/home/.mpdconf
+++ b/home/.mpdconf
@@ -1,15 +1,13 @@
 #
-music_directory                    "/home/siraaj/Archives/Audio"
-playlist_directory                 "/home/siraaj/var/lib/mpd/playlists"
-db_file                            "/home/siraaj/var/lib/mpd/tag_cache"
-log_file                           "/home/siraaj/var/log/mpd/mpd.log"
-pid_file                           "/home/siraaj/var/run/mpd/pid"
-state_file                         "/home/siraaj/var/lib/mpd/state"
-sticker_file                       "/home/siraaj/var/lib/mpd/sticker.sql"
-user                               "siraaj"
-group                              "siraaj"
+music_directory                    "~/Archives/Audio"
+playlist_directory                 "~/var/lib/mpd/playlists"
+db_file                            "~/var/lib/mpd/tag_cache"
+log_file                           "~/var/log/mpd/mpd.log"
+pid_file                           "~/var/run/mpd/pid"
+state_file                         "~/var/lib/mpd/state"
+sticker_file                       "~/var/lib/mpd/sticker.sql"
 bind_to_address                    "localhost"
-bind_to_address                    "/home/siraaj/var/run/mpd/socket"
+bind_to_address                    "~/var/run/mpd/socket"
 #port                              "6600"
 log_level                         "verbose"  # "default", "secure" or "verbose"
 #gapless_mp3_playback              "yes"
@@ -34,7 +32,7 @@ audio_output {
 audio_output {
     type    "fifo"
     name    "pcm.fifo"
-    path    "/home/siraaj/var/run/mpd/pcm.fifo"
+    path    "~/var/run/mpd/pcm.fifo"
     format  "44100:16:2"
 }
 
diff --git a/home/lib/login_functions.sh b/home/lib/login_functions.sh
index fd9beaf..b8e9f41 100644
--- a/home/lib/login_functions.sh
+++ b/home/lib/login_functions.sh
@@ -2,7 +2,7 @@
 # TODO: Consider using numfmt instead of awk
 tdu() {
     du "$1" \
-    | sort -n -k 1 -r --parallel="$(nproc)" \
+    | sort -n -k 1 -r \
     | head -50 \
     | awk '
         {
diff --git a/pkgs-brew-cask-install.list b/pkgs-brew-cask-install.list
new file mode 100644
index 0000000..c0c91e3
--- /dev/null
+++ b/pkgs-brew-cask-install.list
@@ -0,0 +1,4 @@
+#
+qutebrowser
+rider
+visual-studio-code
diff --git a/pkgs-brew-install.list b/pkgs-brew-install.list
new file mode 100644
index 0000000..07618e6
--- /dev/null
+++ b/pkgs-brew-install.list
@@ -0,0 +1,15 @@
+#
+coreutils
+htop
+macvim
+mono
+neofetch
+ranger
+tig
+tmux
+tree
+
+# MPD
+mpd
+ncmpc
+ncmpcpp