Compare commits
No commits in common. "d04de6b67440090ec4c8f6b7b9f536cf1761d714" and "eddb85da99e8031389246b4a6326b10635c1007e" have entirely different histories.
d04de6b674
...
eddb85da99
4 changed files with 7 additions and 19 deletions
9
Justfile
9
Justfile
|
@ -7,14 +7,7 @@ update:
|
||||||
nix flake update --commit-lock-file
|
nix flake update --commit-lock-file
|
||||||
|
|
||||||
build machine="":
|
build machine="":
|
||||||
#!/usr/bin/env bash
|
nixos-rebuild --flake .#{{machine}} build
|
||||||
set -euxo pipefail
|
|
||||||
nixos-rebuild --flake .#{{machine}} --log-format internal-json build |& nom --json
|
|
||||||
|
|
||||||
pkg name:
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -euxo pipefail
|
|
||||||
nix build --log-format internal-json -v .#{{name}} |& nom --json
|
|
||||||
|
|
||||||
diff:
|
diff:
|
||||||
nvd diff /run/current-system ./result
|
nvd diff /run/current-system ./result
|
||||||
|
|
14
flake.nix
14
flake.nix
|
@ -235,9 +235,9 @@
|
||||||
|
|
||||||
packages = {
|
packages = {
|
||||||
git-repo-go = pkgs.callPackage ./pkgs/git-repo-go { };
|
git-repo-go = pkgs.callPackage ./pkgs/git-repo-go { };
|
||||||
gitu = pkgs.callPackage ./pkgs/gitu { };
|
|
||||||
incus-ui = pkgs.callPackage ./pkgs/incus-ui { };
|
incus-ui = pkgs.callPackage ./pkgs/incus-ui { };
|
||||||
openfga = pkgs.callPackage ./pkgs/openfga { };
|
openfga = pkgs.callPackage ./pkgs/openfga { };
|
||||||
|
gitu = pkgs.callPackage ./pkgs/gitu { };
|
||||||
zed = pkgs.callPackage ./pkgs/zed { };
|
zed = pkgs.callPackage ./pkgs/zed { };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -257,23 +257,21 @@
|
||||||
config.packages.git-repo-go
|
config.packages.git-repo-go
|
||||||
inputs'.colmena.packages.colmena
|
inputs'.colmena.packages.colmena
|
||||||
just
|
just
|
||||||
|
nodejs
|
||||||
|
nodePackages.typescript-language-server
|
||||||
|
nodePackages.yaml-language-server
|
||||||
|
nodePackages.vscode-css-languageserver-bin
|
||||||
|
nodePackages.prettier
|
||||||
multimarkdown
|
multimarkdown
|
||||||
nix-diff
|
nix-diff
|
||||||
nix-init
|
nix-init
|
||||||
nix-output-monitor
|
|
||||||
nix-prefetch
|
nix-prefetch
|
||||||
nix-prefetch-docker
|
nix-prefetch-docker
|
||||||
nix-prefetch-github
|
nix-prefetch-github
|
||||||
nix-prefetch-scripts
|
nix-prefetch-scripts
|
||||||
nix-tree
|
nix-tree
|
||||||
nix-top
|
nix-top
|
||||||
nix-update
|
|
||||||
nixfmt-rfc-style
|
nixfmt-rfc-style
|
||||||
nodejs
|
|
||||||
nodePackages.typescript-language-server
|
|
||||||
nodePackages.yaml-language-server
|
|
||||||
nodePackages.vscode-css-languageserver-bin
|
|
||||||
nodePackages.prettier
|
|
||||||
openssl
|
openssl
|
||||||
pciutils
|
pciutils
|
||||||
pkgs.sops
|
pkgs.sops
|
||||||
|
|
|
@ -109,7 +109,6 @@ in
|
||||||
core = {
|
core = {
|
||||||
editor = "${config.eboskma.programs.emacs.package}/bin/emacsclient";
|
editor = "${config.eboskma.programs.emacs.package}/bin/emacsclient";
|
||||||
pager = "${pkgs.bat}/bin/bat";
|
pager = "${pkgs.bat}/bin/bat";
|
||||||
fsmonitor = true;
|
|
||||||
};
|
};
|
||||||
merge = {
|
merge = {
|
||||||
ff = "only";
|
ff = "only";
|
||||||
|
@ -125,7 +124,6 @@ in
|
||||||
rebase = {
|
rebase = {
|
||||||
autoStash = true;
|
autoStash = true;
|
||||||
};
|
};
|
||||||
rerere.enabled = true;
|
|
||||||
color = {
|
color = {
|
||||||
ui = "auto";
|
ui = "auto";
|
||||||
status = {
|
status = {
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
handle @local {
|
handle @local {
|
||||||
rewrite /ssh_info /assets/ssh_info
|
|
||||||
reverse_proxy 127.0.0.1:3000
|
reverse_proxy 127.0.0.1:3000
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue