Merge remote-tracking branch 'origin/main'

flake.nix

@@ -119,7 +119,7 @@
           ];
         };
       workm1 = let
-        system = "aarch64-linux";
+        system = "aarch64-darwin";
       in
         home-manager.lib.homeManagerConfiguration {
           pkgs = nixpkgs.legacyPackages.${system};

modules/home-manager/desktop.nix

@@ -7,11 +7,4 @@
     kitty
     wezterm
   ];
-
-  home.pointerCursor = {
-    name = "Bibata-Modern-Classic";
-    package = pkgs.bibata-cursors;
-    size = 64; # TODO: this doesn't seem to work -- at least in Sway
-    # some icons are also missing (hand2?)
-  };
 }

modules/home-manager/fish/shellInit.fish

@@ -66,6 +66,10 @@ set -U fish_pager_color_prefix blue # the string being completed
 set -U fish_pager_color_progress white\x1e\x2d\x2dbackground\x3d333 # status indicator at the bottom
 # set -U fish_pager_color_secondary \x2d\x2dbackground\x3d181818 # alternating rows
 
+if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish'
+	source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish'
+end
+
 function has_command --wraps=command --description "Exits non-zero if the given command cannot be found"
 	command --quiet --search $argv[1]
 end
@@ -74,6 +78,6 @@ if has_command rtx
 	rtx activate fish | source
 end
 
-for dir in ~/.cargo/bin ~/.nimble/bin ~/.local/bin
+for dir in ~/.cargo/bin ~/.nimble/bin ~/.local/bin /opt/homebrew/bin
-	fish_add_path $dir
+	test -d $dir && fish_add_path $dir
 end

modules/home-manager/linux-desktop.nix

@@ -22,4 +22,11 @@
       };
     };
   };
+
+  home.pointerCursor = {
+    name = "Bibata-Modern-Classic";
+    package = pkgs.bibata-cursors;
+    size = 64; # TODO: this doesn't seem to work -- at least in Sway
+    # some icons are also missing (hand2?)
+  };
 }

modules/home-manager/macos.nix

@@ -1,6 +1,5 @@
 {outputs, ...}: {
   imports = with outputs.homeManagerModules; [
-    common
     desktop
     pass
   ];