tomasr/nixos
1
0
Fork 0
mirror of https://github.com/tomasriveral/nixos.git synced 2026-08-12 02:28:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge conflict handled

Browse Source
This commit is contained in:
tomasr
2026-06-13 09:21:11 +02:00
parent 2471741462
commit 406baf2a5d
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/utilities/nixGitCherryPicker.nix
-20
View File
@@ -1,5 +1,4 @@
{inputs, ...}: { {inputs, ...}: {
<<<<<<< desktop
flake.homeModules.nix-git-cherry-picker-laptop = {pkgs, ...}: { flake.homeModules.nix-git-cherry-picker-laptop = {pkgs, ...}: {
home.packages = [ home.packages = [
inputs.nix-git-cherry-picker.packages.${pkgs.system}.default inputs.nix-git-cherry-picker.packages.${pkgs.system}.default
@@ -16,25 +15,6 @@
force = true; 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, ...}: { flake.homeModules.nix-git-cherry-picker-desktop = {pkgs, ...}: {
home.packages = [ home.packages = [
inputs.nix-git-cherry-picker.packages.${pkgs.system}.default inputs.nix-git-cherry-picker.packages.${pkgs.system}.default