fix(bootstrap & nix): various fix for M2 support

Mayeu · Feb 17, 2023 · dd284bd · dd284bd
1 parent ea4d31c
commit dd284bd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/bin.symlink/install-nix.sh b/bin.symlink/install-nix.sh
@@ -6,7 +6,7 @@
 sh <(curl -L https://nixos.org/nix/install)
 
 echo "⤴️ Loading nix"
-source /etc/static/bashrc
+source /etc/bashrc
 
 echo "🚇 Adding my channels"
 nix-channel --add https://channels.nixos.org/nixpkgs-22.11-darwin nixpkgs

diff --git a/bin.symlink/mac-bootstrap b/bin.symlink/mac-bootstrap
@@ -33,7 +33,7 @@ brew install --cask \
 	blockblock \
 	carbon-copy-cloner \
 	little-snitch \
-	syncthing-app \
+	syncthing \
 	alfred \
 	macpass \
 	macfuse \
@@ -42,8 +42,6 @@ brew install --cask \
 	docker \
 	spotify \
 	calibre \
-	virtualbox \
-	virtualbox-extension-pack \
 	appcleaner \
 	zoom \
 	tor-browser \
@@ -58,10 +56,9 @@ brew install --cask \
 	chromium \
 	handbrake \
 	programmer-dvorak \
-	java \
 	mailmate \
 	kobo \
-	font-firacode-nerd-font \
+	font-fira-code-nerd-font \
 	google-chrome \
 	gitup \
 	macvim \
@@ -72,11 +69,14 @@ brew install --cask \
 	anki \
 	force-paste \
 	drawio \
-	vcv-rack \
 	discord \
 	the-unarchiver \
 	kodi \
 	darktable
+#vcv-rack \
+# java
+#virtualbox
+#virtualbox-extension-pack \
 #vscodium \
 #electrum \
 #stellarium \
@@ -106,27 +106,23 @@ brew install --cask \
 echo "🍺 Install cli apps"
 brew install \
 	ext4fuse \
-	ansible \
 	homebrew/cask-fonts/font-fira-code \
 	imageoptim-cli \
 	selecta \
 	borgmatic \
 	beancount \
-	mayeu/tap/beancount-scripts \
 	fava \
 	mayeu/tap/run-one \
 	mayeu/tap/flock \
-	mayeu/tap/habitica-cli \
-	mayeu/tap/lmt \
 	pinentry-mac \
-	hardlink-osx \
+	hardlink \
 	libnettle \
 	telnet \
 	adr-tools \
 	gawk \
-	pyenv-virtualenvwrapper \
 	editorconfig \
 	siril
+#ansible \
 #node \
 #nvm \
 #gromgit/fuse/sshfs \
@@ -139,6 +135,8 @@ brew install \
 #zsh-completion \
 #testssl \
 #topgrade \
+#pyenv-virtualenvwrapper \
+#mayeu/tap/beancount-scripts \
 
 ## To use pinentry-mac it must be added as "pinentry-program" in the
 # `~/.gnupg/gpg-agent.conf` configuration

diff --git a/nixpkgs.symlink/darwin-configuration.nix b/nixpkgs.symlink/darwin-configuration.nix
@@ -145,7 +145,6 @@ in
     sshfs
     terminal-notifier
     testssl
-    siril
   ];
 
   # Use a custom configuration.nix location.
-Original file line number
+Diff line change
@@ Expand Up / @@ -145,7 +145,6 @@ in @@
         sshfs
         terminal-notifier
         testssl
-        siril
       ];
       # Use a custom configuration.nix location.
@@ Expand Down @@