nixbook: expose pw scripts and add bare git clone alias

This commit is contained in:
Tristan 2024-08-16 16:27:12 +01:00
parent 24de630982
commit f478715f4b
3 changed files with 27 additions and 25 deletions

26
flake.lock generated
View file

@ -460,22 +460,6 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1723362943,
"narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a58bc8ad779655e790115244571758e8de055e3d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1721466660, "lastModified": 1721466660,
"narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=", "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=",
@ -491,7 +475,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_4": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1714912032, "lastModified": 1714912032,
"narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
@ -515,7 +499,9 @@
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_2", "nixpkgs": [
"nixpkgs"
],
"nuschtosSearch": "nuschtosSearch", "nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
@ -588,7 +574,7 @@
}, },
"sops-nix": { "sops-nix": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_2",
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
@ -617,7 +603,7 @@
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_3", "home-manager": "home-manager_3",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1722946882, "lastModified": 1722946882,

View file

@ -1,4 +1,4 @@
{ {pkgs, ...}: {
programs.git = { programs.git = {
enable = true; enable = true;
aliases = { aliases = {
@ -6,6 +6,25 @@
amend = "commit --amend --no-edit"; amend = "commit --amend --no-edit";
sdiff = "diff --staged"; sdiff = "diff --staged";
t = "tag --annotate"; t = "tag --annotate";
bclone = "!sh ${pkgs.writeShellScriptBin "bare-clone" ''
url=$1
basename=''${url##*/}
name=''${2:-''${basename%.*}}
mkdir "$name"
git clone --bare "$url" "$name/.bare" || {
rm -r "$name"
exit 1
}
cd "$name"
echo "gitdir: ./.bare" > .git
git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
git fetch origin
''}/bin/bare-clone";
}; };
delta = { delta = {
enable = true; enable = true;

View file

@ -55,14 +55,13 @@ in {
echo "$items" | ${my-deps.menu} | xargs -I_ rbw get _ | wl-copy -n echo "$items" | ${my-deps.menu} | xargs -I_ rbw get _ | wl-copy -n
''; '';
hotkeys = [{key = "P";}]; hotkeys = [{key = "P";}];
install = false;
} }
{ {
name = "bwusernamemenu"; name = "bwusernamemenu";
text = '' text = ''
items="$(rbw list)" items="$(rbw list)"
echo "$items" | ${my-deps.menu} | xargs -I_ rbw get --field username _ \ echo "$items" | ${my-deps.menu} | xargs -I_ rbw get --field username _ \
| awk '{print $2}' | wl-copy -n | wl-copy -n
''; '';
hotkeys = [ hotkeys = [
{ {
@ -70,7 +69,6 @@ in {
key = "P"; key = "P";
} }
]; ];
install = false;
} }
{ {
name = "bwotpmenu"; name = "bwotpmenu";
@ -84,7 +82,6 @@ in {
key = "P"; key = "P";
} }
]; ];
install = false;
} }
{ {
name = "screenshot"; name = "screenshot";