Merge branch 'main' of git.sealight.xyz:aynish/helm

home/profiles/cli/default.nix

@@ -10,8 +10,8 @@
     git-machete
     bottom
     gptfdisk
+    difftastic
     starship
-    iputils
     jq
     manix
     moreutils
@@ -42,7 +42,6 @@
     file
     lsof
     atool
-    strace
     zip
     unzip
     rsync
@@ -57,6 +56,8 @@
     gnupg
     syncthing
     dijo
+    nixfmt-rfc-style
+    nix-tree
     #ssb-patchwork
     fontconfig
     pandoc
@@ -148,6 +149,10 @@
 
       disconnect_keyboard
     '')
+  ] ++ lib.optionals pkgs.stdenv.isLinux [
+    # Linux-only packages
+    iputils
+    strace
   ];
 
   programs.zsh = {
@@ -158,6 +163,7 @@
     initContent = ''
       bindkey -v
       autopair-init
+      export PATH="$PATH:/Users/anishlakhwara/go/bin"
     '';
     sessionVariables = {
       EDITOR = "nvim";
@@ -228,7 +234,7 @@
     enableZshIntegration = true;
   };
 
-  services.kdeconnect.enable = true;
+  services.kdeconnect.enable = pkgs.stdenv.isLinux;
 
   home.shellAliases = {
     # quick cd
@@ -248,8 +254,8 @@
     tree = "ls --tree --icons";
     cat = "bat";
     unzip = "aunpack";
-    copy = "xclip -selection clipboard";
-    paste = "xclip -selection clipboard -o";
+    copy = if pkgs.stdenv.isDarwin then "pbcopy" else "xclip -selection clipboard";
+    paste = if pkgs.stdenv.isDarwin then "pbpaste" else "xclip -selection clipboard -o";
     rm = "echo USE TRASH, FOOL: trash ";
     trash = "trash-put";
     make-secret = "< /dev/urandom \\tr -dc _A-Za-z0-9 | head -c \${1:-32};echo;";
@@ -300,8 +306,14 @@
     nepl = "n repl '<nixpkgs>'";
     srch = "ns nixpkgs";
     orch = "ns override";
-    # need --impure for bitwig, something about my flake setup doesn't like allow unfree
-    nrb = "cd /tmp; sudo nixos-rebuild switch --impure --flake '/home/anish/usr/helm#curve'; cd $OLDPWD";
+    # Impure for bitwig on linux, not sure what it's for in darwin
+    nrb = ''
+      if [[ "$OSTYPE" == "darwin"* ]]; then
+        cd ~/usr/helm && sudo darwin-rebuild switch --impure --flake ".#Anishs-MacBook-Pro" && cd $OLDPWD
+      else
+        cd /tmp && sudo nixos-rebuild switch --flake  --impure '/home/anish/usr/helm#curve' && cd $OLDPWD
+      fi
+    '';
     nrt = "cd /tmp; sudo nixos-rebuild test --flake '/home/anish/usr/helm#curve'; cd $OLDPWD";
     ned = "cd /home/anish/usr/helm; vim; cd $OLDPWD";
     ncd = "cd /home/anish/usr/helm";