Merge branch 'main' into desktop

modules/hosts/laptop.nix

@@ -66,6 +66,7 @@
       librewolf
       mullvad
       neovim
+      nixGitCherryPicker-laptop
       notewrapper
       oh-my-zsh
       ripgrep

modules/utilities/nixGitCherryPicker.nix

@@ -1,4 +1,5 @@
 {inputs, ...}: {
+<<<<<<< desktop
   flake.homeModules.nix-git-cherry-picker-laptop = {pkgs, ...}: {
     home.packages = [
       inputs.nix-git-cherry-picker.packages.${pkgs.system}.default
@@ -15,20 +16,39 @@
       force = true;
     };
   };
+  flake.homeModules.nix-git-cherry-picker-desktop = {pkgs, ...}: {
+=======
+  flake.homeModules.nixGitCherryPicker-laptop = {pkgs, ...}: {
+>>>>>>> main
+    home.packages = [
+      inputs.nix-git-cherry-picker.packages.${pkgs.system}.default
+    ];
+    home.file.".config/nix-git-cherry-picker/config.json" = {
+      enable = true;
+      text = ''
+        {
+          "localBranch": "laptop",
+          "remoteBranch": "desktop",
+          "nixConfigPath": "/home/tomasr/nixos/"
+        }
+      '';
+      force = true;
+    };
+  };
   flake.homeModules.nix-git-cherry-picker-desktop = {pkgs, ...}: {
     home.packages = [
       inputs.nix-git-cherry-picker.packages.${pkgs.system}.default
     ];
-    home.file.".config/nix-git-cherry-picker/config.json" = {
-      enable = true;
-      text = ''
-        {
-          "localBranch": "desktop",
-          "remoteBranch": "laptop",
-          "nixConfigPath": "/home/tomasr/nixos/"
-        }
-      '';
-      force = true;
-    };
   };
-}
+  home.file-".config/nix-git-cherry-picker/config.json" = {
+    enable = true;
+    text = ''
+      {
+        "localBranch": "desktop",
+        "remoteBranch": "laptop",
+        "nixConfigPath": "/home/tomasr/nixos/"
+      }
+    '';
+    force = true;
+  };
+}