more configuration for darwin

4 files changed, 42 insertions, 23 deletions

diff --git a/home/profiles/darwin.nix b/home/profiles/darwin.nix
new file mode 100644
index 0000000..4575176
--- /dev/null
+++ b/home/profiles/darwin.nix
@@ -0,0 +1,33 @@
+{ config, pkgs, ... }:
+{
+  home.stateVersion = "23.05";
+
+  imports = [
+    ./git.nix
+    ./zsh.nix
+    ./dev.nix
+    ./tmux.nix
+  ];
+
+  home.packages = with pkgs; [
+    jq
+    direnv
+    nix-direnv
+    tree
+    nixfmt
+    nixpkgs-fmt
+    rnix-lsp
+  ];
+
+  programs = {
+    direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+      enableZshIntegration = true;
+      config = {
+        global.disable_stdin = true;
+        global.strict_env = true;
+      };
+    };
+  };
+}
diff --git a/home/profiles/dev.nix b/home/profiles/dev.nix
index e2806ab..dd9409d 100644
--- a/home/profiles/dev.nix
+++ b/home/profiles/dev.nix
@@ -1,13 +1,5 @@
 { pkgs, config, ... }:
 let
-  ruststable = (pkgs.rust-bin.stable.latest.default.override {
-    extensions = [
-      "rust-src"
-      "rust-analyzer-preview"
-      "rust-analysis"
-      "rustfmt-preview"
-    ];
-  });
   pythonEnv = pkgs.python3.withPackages (p: with p; [
     black
     click
@@ -25,20 +17,19 @@ in
     enable = true;
     goPath = ".local/share/pkg.go";
     goBin = ".local/bin.go";
-    goPrivate = [ "git.fcuny.net" "golang.fcuny.net" ];
-    package = pkgs.go_1_18;
+    package = pkgs.go_1_20;
   };
 
   home.packages = with pkgs; [
     go-tools
     pythonEnv
     google-cloud-sdk
-    ruststable
+    golangci-lint
+    gopls
   ];
 
   home.sessionPath = [
     config.home.sessionVariables.GOBIN
-    "$CARGO_HOME/bin"
   ];
 
   home.sessionVariables = with config.xdg; {
@@ -47,6 +38,5 @@ in
     PYLINTHOME = "${cacheHome}/pylint";
     PYTHON_EGG_CACHE = "${cacheHome}/python-eggs";
     MYPY_CACHE_DIR = "${cacheHome}/mypy";
-    CARGO_HOME = "${dataHome}/cargo";
   };
 }
diff --git a/home/profiles/git.nix b/home/profiles/git.nix
index cf90da6..6846a08 100644
--- a/home/profiles/git.nix
+++ b/home/profiles/git.nix
@@ -1,7 +1,7 @@
-{ self, lib, pkgs, config, ... }:
+{ lib, pkgs, config, ... }:
 let
   sshPub = builtins.fromTOML (
-    builtins.readFile "${self}/configs/ssh-pubkeys.toml"
+    builtins.readFile ../../configs/ssh-pubkeys.toml
   );
 in
 {
@@ -14,7 +14,7 @@ in
 
     signing = {
       key = "key::${sshPub.ykey-laptop}";
-      signByDefault = true;
+      signByDefault = false;
     };
 
     extraConfig = {
@@ -68,7 +68,6 @@ in
 '';
 
   home.packages = with pkgs; [
-    tools.git-blame-stats
     gitAndTools.pre-commit
   ];
 }
diff --git a/home/profiles/zsh.nix b/home/profiles/zsh.nix
index 82e0057..756ee9d 100644
--- a/home/profiles/zsh.nix
+++ b/home/profiles/zsh.nix
@@ -39,13 +39,10 @@
       dhcp-leasese = "xdg-open http://192.168.6.1:8067/";
     };
 
-    prezto = {
+    oh-my-zsh = {
       enable = true;
-      prompt.theme = "minimal";
-      pmodules = [
-        "prompt"
-        "git"
-      ];
+      plugins = ["git"];
+      theme = "robbyrussell";
     };
   };
 }