Compare commits
2 Commits
d1494476b8
...
9be26d79cc
| Author | SHA1 | Date | |
|---|---|---|---|
| 9be26d79cc | |||
| 2821f4b6f4 |
Generated
+16
@@ -296,11 +296,27 @@
|
|||||||
"openspec": "openspec"
|
"openspec": "openspec"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
|
<<<<<<< HEAD
|
||||||
|
"lastModified": 1781500279,
|
||||||
|
"narHash": "sha256-810qVHwu6jVhu01FWj9dXuruK84Gw2smAlbu6FPBfeY=",
|
||||||
|
||||||| cd80ded
|
||||||
|
"lastModified": 1779944037,
|
||||||
|
"narHash": "sha256-jO6zAJjgc9n3SeDJW1EbV6CEqOa9DK+2AhTgWc+ImHQ=",
|
||||||
|
=======
|
||||||
"lastModified": 1781153970,
|
"lastModified": 1781153970,
|
||||||
"narHash": "sha256-OtC89zreW6Api7wpF5u76Jvkn8uQJiM+0yFFn/r+rj8=",
|
"narHash": "sha256-OtC89zreW6Api7wpF5u76Jvkn8uQJiM+0yFFn/r+rj8=",
|
||||||
|
>>>>>>> d1494476b864173592c6dc4a1f0645189cdca192
|
||||||
"ref": "refs/heads/master",
|
"ref": "refs/heads/master",
|
||||||
|
<<<<<<< HEAD
|
||||||
|
"rev": "050c273c65b36dc03c34a7547d80e88afff5ac48",
|
||||||
|
"revCount": 327,
|
||||||
|
||||||| cd80ded
|
||||||
|
"rev": "ae1fb97c21b311dc03a46e8d50867048e5568c88",
|
||||||
|
"revCount": 323,
|
||||||
|
=======
|
||||||
"rev": "8fae0726a53ecabb04f4a0931a17a25de6a05fbf",
|
"rev": "8fae0726a53ecabb04f4a0931a17a25de6a05fbf",
|
||||||
"revCount": 324,
|
"revCount": 324,
|
||||||
|
>>>>>>> d1494476b864173592c6dc4a1f0645189cdca192
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs"
|
"url": "ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ in {
|
|||||||
|
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
openwork
|
||||||
pomodoro-timer
|
pomodoro-timer
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user