This commit is contained in:
Miguel Palhas
2025-10-22 11:20:03 +01:00
parent e17d9b8278
commit c9a4f52c31
4 changed files with 33 additions and 38 deletions
Generated
+6 -6
View File
@@ -151,11 +151,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758786164, "lastModified": 1761081701,
"narHash": "sha256-o1WyZI2T7yPywiY06Swt8AZH/ewKU1nLqDw8fw1fwPc=", "narHash": "sha256-IwpfaKg5c/WWQiy8b5QGaVPMvoEQ2J6kpwRFdpVpBNQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "232454052008027c8e925979d13a951e92729781", "rev": "9b4a2a7c4fbd75b422f00794af02d6edb4d9d315",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -317,11 +317,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1760524057, "lastModified": 1760878510,
"narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github" "type": "github"
}, },
"original": { "original": {
-6
View File
@@ -1,6 +0,0 @@
{ config, pkgs, ... }:
{
home.packages = with pkgs; [
ledger-live-desktop
];
}
+27 -25
View File
@@ -5,31 +5,33 @@
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Miguel Palhas"; settings = {
userEmail = "mpalhas@gmail.com"; user = {
aliases = { name = "Miguel Palhas";
ls = "log --color --graph --oneline --decorate --topo-order --pretty=format:'%C(yellow)%d%Creset %Cgreen(%cr)%Creset %C(bold blue)[%an]%Creset %s %Cred(%h)%Creset' --abbrev-commit"; email = "mpalhas@gmail.com";
ll = ''log --reverse --pretty=format:"%C(yellow)%h%Cred%d\ %Creset%s%Cblue\ [%an]" --decorate --numstat''; };
conf = "diff --name-only --diff-filter=U"; alias = {
ba = "branch -a"; ls = "log --color --graph --oneline --decorate --topo-order --pretty=format:'%C(yellow)%d%Creset %Cgreen(%cr)%Creset %C(bold blue)[%an]%Creset %s %Cred(%h)%Creset' --abbrev-commit";
pb = "publish"; ll = ''log --reverse --pretty=format:"%C(yellow)%h%Cred%d\ %Creset%s%Cblue\ [%an]" --decorate --numstat'';
ps = "push -u"; conf = "diff --name-only --diff-filter=U";
pr = "pull-request"; ba = "branch -a";
ppr = "push-pr"; pb = "publish";
cpr = "close-pr"; ps = "push -u";
opr = "open-pr"; pr = "pull-request";
f = "fetch"; ppr = "push-pr";
c = "commit --verbose"; cpr = "close-pr";
d = "diff"; opr = "open-pr";
dc = "diff --cached"; f = "fetch";
co = "checkout"; c = "commit --verbose";
s = "status -sb"; d = "diff";
b = "better-branch"; dc = "diff --cached";
rb = "rebase"; co = "checkout";
rbc = "rebase --continue"; s = "status -sb";
w = "commit -am 'wip'"; b = "better-branch";
}; rb = "rebase";
extraConfig = { rbc = "rebase --continue";
w = "commit -am 'wip'";
};
init = { init = {
defaultBranch = "main"; defaultBranch = "main";
}; };
-1
View File
@@ -23,7 +23,6 @@
../common/programs/3d.nix ../common/programs/3d.nix
../common/features/xdg.nix ../common/features/xdg.nix
../common/features/bluetooth.nix ../common/features/bluetooth.nix
../common/features/ledger.nix
./monitors.nix ./monitors.nix
]; ];