zoriya/flake
1
0
Fork 0
mirror of https://github.com/zoriya/flake.git synced 2025-12-06 06:36:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update stuff

Browse Source
This commit is contained in:
Zoe Roux
2025-10-21 15:11:03 +02:00
parent b3479548cc
commit 5342865b4e
2 changed files with 59 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
flake.lock generated
View File

@@ -56,11 +56,11 @@
]
},
"locked": {
"lastModified": 1759362264,
"narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
"lastModified": 1760948891,
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
"type": "github"
},
"original": {
@@ -79,11 +79,11 @@
]
},
"locked": {
"lastModified": 1759523803,
"narHash": "sha256-PTod9NG+i3XbbnBKMl/e5uHDBYpwIWivQ3gOWSEuIEM=",
"lastModified": 1760663237,
"narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835",
"rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
"type": "github"
},
"original": {
@@ -146,11 +146,11 @@
]
},
"locked": {
"lastModified": 1760239230,
"narHash": "sha256-eqSP/BAbQwNTlQ/6yuK0yILzZAPNNj91gp6oIfVtu/E=",
"lastModified": 1761005073,
"narHash": "sha256-r6qbieh8iC1q1eCaWv15f4UIp8SeGffwswhNSA1Qk3s=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c4aaddeaecc09554c92518fd904e3e84b497ed09",
"rev": "84e1adb0cdd13f5f29886091c7234365e12b1e7f",
"type": "github"
},
"original": {
@@ -187,11 +187,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1760227502,
"narHash": "sha256-xOc+y9NWsSdpqsSzX0DErThQ1netOiWZwOguvcXA7WQ=",
"lastModified": 1761005134,
"narHash": "sha256-9bSlfRleXFl50M6AnurWr1oKDTk3uF5DaTVHxeds0CY=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "0f104711589baa734fd51dd306f3976298e1d2e7",
"rev": "3a6201e41d13f1a73b2e2c734dbd36b4c42584b0",
"type": "github"
},
"original": {
@@ -203,11 +203,11 @@
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1760226073,
"narHash": "sha256-VBWMWwZutNJo5KLaIMTOhP0KCYAUY9NUOK7UhAcgdCM=",
"lastModified": 1761000337,
"narHash": "sha256-fBz9U/k/YWoS4QgcoQ54NKDEopTdL2zI0gzLlWv/xR8=",
"owner": "neovim",
"repo": "neovim",
"rev": "bc2fe135d11865b8ac33214e351312f5f454c4e8",
"rev": "b67eff38fe19876ab228007897224ec04b58aa40",
"type": "github"
},
"original": {
@@ -223,11 +223,11 @@
]
},
"locked": {
"lastModified": 1758805352,
"narHash": "sha256-BHdc43Lkayd+72W/NXRKHzX5AZ+28F3xaUs3a88/Uew=",
"lastModified": 1760721282,
"narHash": "sha256-aAHphQbU9t/b2RRy2Eb8oMv+I08isXv2KUGFAFn7nCo=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "c48e963a5558eb1c3827d59d21c5193622a1477c",
"rev": "c3211fcd0c56c11ff110d346d4487b18f7365168",
"type": "github"
},
"original": {
@@ -243,11 +243,11 @@
]
},
"locked": {
"lastModified": 1760241904,
"narHash": "sha256-OD7QnaGEVNdukYEbJbUNWPsvnDrpbZOZxVIk6Pt9Jhw=",
"lastModified": 1760846226,
"narHash": "sha256-xmU8kAsRprJiTGBTaGrwmjBP3AMA9ltlrxHKFuy5JWc=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "c9f5ea45f25652ec2f771f9426ccacb21cbbaeaa",
"rev": "5024e1901239a76b7bf94a4cd27f3507e639d49e",
"type": "github"
},
"original": {
@@ -276,11 +276,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1760106635,
"narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
"lastModified": 1760958188,
"narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
"rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
"type": "github"
},
"original": {
@@ -298,11 +298,11 @@
]
},
"locked": {
"lastModified": 1759833546,
"narHash": "sha256-rOfkgIiiZNPUbf61OqEym60wXEODeDG8XH+gV/SUoUc=",
"lastModified": 1760536587,
"narHash": "sha256-wfWqt+igns/VazjPLkyb4Z/wpn4v+XIjUeI3xY/1ENg=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "7c0c0f4c3a51761434f18209fa9499b8579ff730",
"rev": "f98ee1de1fa36eca63c67b600f5d617e184e82ea",
"type": "github"
},
"original": {
@@ -329,11 +329,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1760038930,
"narHash": "sha256-Oncbh0UmHjSlxO7ErQDM3KM0A5/Znfofj2BSzlHLeVw=",
"lastModified": 1760878510,
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0b4defa2584313f3b781240b29d61f6f9f7e0df3",
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github"
},
"original": {
@@ -360,11 +360,11 @@
"tmux": {
"flake": false,
"locked": {
"lastModified": 1759745633,
"narHash": "sha256-W7Z6ECsj0PuL+Z+tTI+cNq/ba+iyoKsdmnFDm/u2rGQ=",
"lastModified": 1760950867,
"narHash": "sha256-81CIlZt+eG4m4HqVQgSbEjCHexF+1+QvaK86HOms1LQ=",
"owner": "tmux",
"repo": "tmux",
"rev": "0ff2676a2594aa6a26de7232e605640c28021f28",
"rev": "35ad72e56ffb2e8e09a2e2ac59bee0912fe45c6c",
"type": "github"
},
"original": {
@@ -381,11 +381,11 @@
]
},
"locked": {
"lastModified": 1760120816,
"narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=",
"lastModified": 1760945191,
"narHash": "sha256-ZRVs8UqikBa4Ki3X4KCnMBtBW0ux1DaT35tgsnB1jM4=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "761ae7aff00907b607125b2f57338b74177697ed",
"rev": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2",
"type": "github"
},
"original": {

49
modules/cli/tools/git.nix
View File

@@ -1,8 +1,4 @@
{
config,
lib,
...
}: {
{lib, ...}: {
options.git = {
useRsa = lib.mkEnableOption "Use rsa instead of ed25519";
};
@@ -21,24 +17,28 @@
# # TODO: figure out a way to specify all repositories in ~/projects & ~/work at run time
# repositories = [];
# };
aliases = {
master =
#bash
''
!git symbolic-ref --short refs/remotes/$(git remote | head -n 1)/HEAD | sed 's@.*/@@'
'';
cleanup =
#bash
''
!git branch --merged | grep -vE "^([+*]|\s*($(git master))\s*$)" | xargs git branch --delete 2>/dev/null
'';
nuke =
#bash
''
!git reset --hard HEAD && git clean -df .
'';
};
extraConfig = {
settings = {
user = {
name = "Zoe Roux";
email = "zoe.roux@zoriya.dev";
};
alias = {
master =
#bash
''
!git symbolic-ref --short refs/remotes/$(git remote | head -n 1)/HEAD | sed 's@.*/@@'
'';
cleanup =
#bash
''
!git branch --merged | grep -vE "^([+*]|\s*($(git master))\s*$)" | xargs git branch --delete 2>/dev/null
'';
nuke =
#bash
''
!git reset --hard HEAD && git clean -df .
'';
};
gpg = {
format = "ssh";
ssh.allowedSignersFile = "~/.ssh/allowed_signers";
@@ -96,8 +96,5 @@
};
};
};
userEmail = "zoe.roux@zoriya.dev";
userName = "Zoe Roux";
};
}