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 branch 'main' into desktop

Browse Source
This commit is contained in:
tomasr
2026-06-09 14:24:28 +00:00
committed by GitHub
parent 18d73c71c3 ccd9b3e97e
commit 2e0996938a
2 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/hosts/laptop.nix
+1
View File
@@ -66,6 +66,7 @@
librewolf
mullvad
neovim
nixGitCherryPicker-laptop
notewrapper
oh-my-zsh
ripgrep
modules/utilities/nixGitCherryPicker.nix
+22 -2
View File
@@ -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,11 +16,31 @@
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" = {
};
home.file-".config/nix-git-cherry-picker/config.json" = {
enable = true;
text = ''
{
@@ -30,5 +51,4 @@
'';
force = true;
};
};
}