Merge pull request #30 from ryan4yin/fern

feat: new aarch64-darwin host - fern
ryan4yin · Dec 20, 2023 · 932e1a2 · 932e1a2
2 parents a07dfbe + e70f726
commit 932e1a2
Show file tree

Hide file tree

Showing 10 changed files with 108 additions and 154 deletions.
diff --git a/Makefile b/Makefile
@@ -56,18 +56,25 @@ darwin-set-proxy:
 	sudo python3 scripts/darwin_set_proxy.py
 	sleep 1
 
+darwin-rollback:
+	./result/sw/bin/darwin-rebuild rollback
+
 ha: darwin-set-proxy
 	nix build .#darwinConfigurations.harmonica.system
 	./result/sw/bin/darwin-rebuild switch --flake .#harmonica
-	sleep 1
-
-ha-rollback:
-	./result/sw/bin/darwin-rebuild rollback
 
 ha-debug: darwin-set-proxy
 	nom build .#darwinConfigurations.harmonica.system --show-trace --verbose
 	./result/sw/bin/darwin-rebuild switch --flake .#harmonica --show-trace --verbose
-	sleep 1
+
+fe: darwin-set-proxy
+	nix build .#darwinConfigurations.fern.system
+	./result/sw/bin/darwin-rebuild switch --flake .#fern
+
+fe-debug: darwin-set-proxy
+	nom build .#darwinConfigurations.fern.system --show-trace --verbose
+	./result/sw/bin/darwin-rebuild switch --flake .#fern --show-trace --verbose
+
 
 ############################################################################
 #

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -143,9 +143,9 @@
     # secrets management
     agenix = {
       # lock with git commit at 0.14.0
-      # url = "github:ryantm/agenix/54693c91d923fecb4cf04c4535e3d84f8dec7919";
+      url = "github:ryantm/agenix/54693c91d923fecb4cf04c4535e3d84f8dec7919";
       # replaced with a type-safe reimplementation to get a better error message and less bugs.
-      url = "github:ryan4yin/ragenix";
+      # url = "github:ryan4yin/ragenix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

diff --git a/home/base/desktop/neovim/default.nix b/home/base/desktop/neovim/default.nix
@@ -47,7 +47,6 @@
           checkmake
           gcc # c/c++ compiler, required by nvim-treesitter!
           llvmPackages.clang-unwrapped # c/c++ tools with clang-tools such as clangd
-          gdb
           lldb
 
           #-- python
@@ -149,6 +148,7 @@
           else [
             #-- verilog / systemverilog
             verible
+            gdb
           ]
         );
     };