lander/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: lander:d1cbb35ab5ff86cc798a84ddb103a93b8f8cefa7
Branches Tags
lander:main
...
compare: lander:cc070c8c4223d4e95d9be308a8f7e021ec6a1611
Branches Tags
lander:main

6 commits
d1cbb35ab5 ... cc070c8c42

Author SHA1 Message Date
Lander Van den Bulcke
cc070c8c42
feat: add basf git identity 
Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>
 2025-09-19 10:23:12 +02:00
Lander Van den Bulcke
c54dce3817
feat: use mergiraf 
Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>
 2025-09-19 10:09:42 +02:00
Lander Van den Bulcke
49a41b42a6
fix: pin catpuccin to 25.05 
Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>
 2025-09-19 10:03:03 +02:00
Lander Van den Bulcke
de68762f22
fix: use correct difftastic settings 
Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>
 2025-09-19 09:57:48 +02:00
Lander Van den Bulcke
43e348b732
chore: nix flake update 
Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>
 2025-09-19 09:57:08 +02:00
Lander Van den Bulcke
66332b0991
feat: enable difftastic 
Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>
 2025-09-19 09:53:44 +02:00
3 changed files with 94 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

107
flake.lock generated
View file

@ -21,15 +21,16 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1757929733, "lastModified": 1754766435,
"narHash": "sha256-dzKGtCdGbW7v95MS6pxb97u025JP24QsqCLE5bHAumI=", "narHash": "sha256-DT8CQoqV2haX+Fo16WXAt9gKCSXOZH9ZfnV++Br+qcM=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "039cd59357bc6fdd8d9848717069fbc9ee609a73", "rev": "e339d6d822fa81c39d1ab89694b4ee2cfc830c9a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "catppuccin", "owner": "catppuccin",
"ref": "release-25.05",
"repo": "nix", "repo": "nix",
"type": "github" "type": "github"
} }
@ -98,11 +99,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1757508292, "lastModified": 1758160037,
"narHash": "sha256-7lVWL5bC6xBIMWWDal41LlGAG+9u2zUorqo3QCUL4p4=", "narHash": "sha256-fXelTdjdILspZ1IUU9aICB1+PXwSFiF8j+7ujwo1VpQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "146f45bee02b8bd88812cfce6ffc0f933788875a", "rev": "4f554162fff88e77655073d352eec0cea71103a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -180,11 +181,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1741352980, "lastModified": 1749398372,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -202,11 +203,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738453229, "lastModified": 1749398372,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -380,16 +381,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729958008, "lastModified": 1748294338,
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "ixx", "repo": "ixx",
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NuschtOS", "owner": "NuschtOS",
"ref": "v0.0.6", "ref": "v0.0.8",
"repo": "ixx", "repo": "ixx",
"type": "github" "type": "github"
} }
@ -441,16 +442,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1756266583, "lastModified": 1758070117,
"narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -473,11 +474,11 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1740877520, "lastModified": 1748740939,
"narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "147dee35aab2193b174e4c0868bd80ead5ce755c", "rev": "656a64127e9d791a334452c6b6606d17539476e2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -488,11 +489,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1757745802, "lastModified": 1758198701,
"narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", "narHash": "sha256-7To75JlpekfUmdkUZewnT6MoBANS0XVypW6kjUOXQwc=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", "rev": "0147c2f1d54b30b5dd6d4a8c8542e8d7edf93b5d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -536,11 +537,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1757810152, "lastModified": 1758070117,
"narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", "narHash": "sha256-uLwwHFCZnT1c3N3biVe/0hCkag2GSrf9+M56+Okf+WY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9a094440e02a699be5c57453a092a8baf569bdad", "rev": "e9b7f2ff62b35f711568b1f0866243c7c302028d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -552,11 +553,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1741246872, "lastModified": 1751011381,
"narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -568,11 +569,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1738797219, "lastModified": 1750811787,
"narHash": "sha256-KRwX9Z1XavpgeSDVM/THdFd6uH8rNm/6R+7kIbGa+2s=", "narHash": "sha256-rD/978c35JXz6JLAzciTIOCMenPumF6zrQOj4rVZeHE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1da52dd49a127ad74486b135898da2cef8c62665", "rev": "992f916556fcfaa94451ebc7fc6e396134bbf5b1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -639,14 +640,15 @@
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"nuschtosSearch": "nuschtosSearch" "nuschtosSearch": "nuschtosSearch",
"systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1741098523, "lastModified": 1751144320,
"narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", "narHash": "sha256-KJsKiGfkfXFB23V26NQ1p+UPsexI6NKtivnrwSlWWdQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "03065fd4708bfdf47dd541d655392a60daa25ded", "rev": "ceb52aece5d571b37096945c2815604195a04eb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -666,11 +668,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738508923, "lastModified": 1749730855,
"narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -686,11 +688,11 @@
"nixpkgs": "nixpkgs_7" "nixpkgs": "nixpkgs_7"
}, },
"locked": { "locked": {
"lastModified": 1741350116, "lastModified": 1750779888,
"narHash": "sha256-QKp83UTH0hGc7TYkQdX5JdagvBnP5169WyxXkMrkPqY=", "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "ca78dfc9652483f3ae52cfe70fdfbfe664451e2b", "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -796,6 +798,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tidal-src": { "tidal-src": {
"flake": false, "flake": false,
"locked": { "locked": {

2
flake.nix
View file

@ -17,7 +17,7 @@
disko.inputs.nixpkgs.follows = "nixpkgs"; disko.inputs.nixpkgs.follows = "nixpkgs";
# theme # theme
catppuccin.url = "github:catppuccin/nix"; catppuccin.url = "github:catppuccin/nix/release-25.05";
# Home manager # Home manager
home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.url = "github:nix-community/home-manager/release-25.05";

47
home/lander/features/cli/git/default.nix
View file

@ -23,23 +23,25 @@ in
package = pkgs.gitAndTools.gitFull; package = pkgs.gitAndTools.gitFull;
extraConfig = { extraConfig = {
user =
let
name = "Lander Van den Bulcke";
signingKey = "CA5B1C34E649BF92";
mkIdentity = email: {
name = name;
signingKey = signingKey;
email = email;
};
in
{
# extremely important, otherwise git will attempt to guess a default user identity. see `man git-config` for more details # extremely important, otherwise git will attempt to guess a default user identity. see `man git-config` for more details
user.useConfigOnly = true; useConfigOnly = true;
personal = mkIdentity "landervandenbulcke@gmail.com";
# the `inuits` identity inuits = mkIdentity "landervdb@inuits.eu";
user.inuits.name = "Lander Van den Bulcke"; olly = mkIdentity "landervdb@o11y.eu";
user.inuits.email = "landervdb@inuits.eu"; basf = mkIdentity "lander.van-den-bulcke@partners.basf.com";
user.inuits.signingKey = "CA5B1C34E649BF92"; };
# the `olly` identity
user.olly.name = "Lander Van den Bulcke";
user.olly.email = "landervdb@o11y.eu";
user.olly.signingKey = "CA5B1C34E649BF92";
# the `personal` identity
user.personal.name = "Lander Van den Bulcke";
user.personal.email = "landervandenbulcke@gmail.com";
user.personal.signingKey = "CA5B1C34E649BF92";
# editor # editor
core.editor = "nvim"; core.editor = "nvim";
@ -61,12 +63,25 @@ in
# sign your commits! # sign your commits!
commit.gpgsign = true; commit.gpgsign = true;
# diff3 merge
merge.conflictStyle = "diff3";
}; };
# This is optional, as `git identity` will call the `git-identity` script by itself, however # This is optional, as `git identity` will call the `git-identity` script by itself, however
# setting it up explicitly as an alias gives you autocomplete # setting it up explicitly as an alias gives you autocomplete
aliases = { aliases = {
identity = "! git-identity"; identity = "! git-identity";
id = "! git-identity"; id = "! git-identity";
}; };
# use difftastic
difftastic = {
enable = true;
enableAsDifftool = true;
}; };
};
# use mergiraf
programs.mergiraf.enable = true;
} }