nixbook: git config, nixd, format
This commit is contained in:
parent
7322eaeb6f
commit
3bae7dc77c
6 changed files with 91 additions and 66 deletions
|
|
@ -5,6 +5,7 @@
|
|||
graph = "log --oneline --all --graph";
|
||||
amend = "commit --amend --no-edit";
|
||||
sdiff = "diff --staged";
|
||||
fpush = "push --force-with-lease";
|
||||
t = "tag --annotate";
|
||||
bclone = "!sh ${pkgs.writeShellScriptBin "bare-clone" ''
|
||||
url=$1
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@
|
|||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
} @ input: {
|
||||
programs.nixvim =
|
||||
{
|
||||
enable = true;
|
||||
}
|
||||
// (import ../../../lib/nixvim.nix {inherit pkgs;});
|
||||
// (import ../../../lib/nixvim.nix input);
|
||||
|
||||
programs.vscode = {
|
||||
extensions = [pkgs.vscode-extensions.asvetliakov.vscode-neovim];
|
||||
|
|
|
|||
|
|
@ -15,6 +15,11 @@ in {
|
|||
email = "tristan.beedell@cryoserver.com";
|
||||
terminal = false;
|
||||
};
|
||||
programs.git.extraConfig = {
|
||||
"includeIf \"gitdir:~/Documents/personal/\"" = {
|
||||
path = "~/Documents/personal/.gitconfig";
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = [
|
||||
pkgs.thunderbird
|
||||
|
|
@ -31,17 +36,19 @@ in {
|
|||
desktopName = "Microsoft Teams";
|
||||
})
|
||||
pkgs.devcontainer
|
||||
(pkgs.writeShellScriptBin "devcontainer-open" (let
|
||||
jq = "${pkgs.jq}/bin/jq";
|
||||
devcontainer = "${pkgs.devcontainer}/bin/devcontainer";
|
||||
in ''
|
||||
res=$(${devcontainer} up --workspace-folder .)
|
||||
outcome=$(echo $res | ${jq} -r '.outcome')
|
||||
[[ $outcome = "success" ]] || exit 1
|
||||
containerId=$(echo $res | ${jq} -r '.containerId')
|
||||
remoteWorkspaceFolder=$(echo $res | ${jq} -r '.remoteWorkspaceFolder')
|
||||
docker exec -it --workdir=$remoteWorkspaceFolder $containerId bash
|
||||
''))
|
||||
(pkgs.writeShellScriptBin "devcontainer-open" (
|
||||
let
|
||||
jq = "${pkgs.jq}/bin/jq";
|
||||
devcontainer = "${pkgs.devcontainer}/bin/devcontainer";
|
||||
in ''
|
||||
res=$(${devcontainer} up --workspace-folder .)
|
||||
outcome=$(echo $res | ${jq} -r '.outcome')
|
||||
[[ $outcome = "success" ]] || exit 1
|
||||
containerId=$(echo $res | ${jq} -r '.containerId')
|
||||
remoteWorkspaceFolder=$(echo $res | ${jq} -r '.remoteWorkspaceFolder')
|
||||
docker exec -it --workdir=$remoteWorkspaceFolder $containerId bash
|
||||
''
|
||||
))
|
||||
];
|
||||
|
||||
home.sessionVariables = {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue