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

Merge branch 'main' into laptop

Browse Source
This commit is contained in:
tomasr
2026-06-12 14:32:38 +00:00
committed by GitHub
parent c1354a3b98 3836a6eb7c
commit 22bc2f218f
3 changed files with 119 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/utilities/nixGitCherryPicker.nix
+20
View File
@@ -1,5 +1,25 @@
{inputs, ...}: {
<<<<<<< desktop
flake.homeModules.nix-git-cherry-picker-laptop = {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": "laptop",
"remoteBranch": "desktop",
"nixConfigPath": "/home/tomasr/nixos/"
}
'';
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
];