Compare commits
No commits in common. "e7b937da943b816b86f2a7db7ffbdbdc9475e370" and "8291210b5dc1077180f7d123942ea664129a7a8d" have entirely different histories.
e7b937da94
...
8291210b5d
5 changed files with 26 additions and 4 deletions
|
@ -2,11 +2,13 @@
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
config,
|
config,
|
||||||
|
catppuccin,
|
||||||
lanzaboote,
|
lanzaboote,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
|
catppuccin.nixosModules.catppuccin
|
||||||
lanzaboote.nixosModules.lanzaboote
|
lanzaboote.nixosModules.lanzaboote
|
||||||
|
|
||||||
./client.nix
|
./client.nix
|
||||||
|
@ -75,6 +77,7 @@
|
||||||
|
|
||||||
hm = {
|
hm = {
|
||||||
imports = [
|
imports = [
|
||||||
|
catppuccin.homeManagerModules.catppuccin
|
||||||
../programs/java.nix
|
../programs/java.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
16
flake.lock
generated
16
flake.lock
generated
|
@ -70,6 +70,21 @@
|
||||||
"url": "https://git.uku3lig.net/uku/camasca"
|
"url": "https://git.uku3lig.net/uku/camasca"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"catppuccin": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1735028008,
|
||||||
|
"narHash": "sha256-crbQNRVQgPH0hX5vZk8xL9JStXo74Es7zDBjRcc4i+A=",
|
||||||
|
"owner": "Stonks3141",
|
||||||
|
"repo": "ctp-nix",
|
||||||
|
"rev": "bfd20bcf45f1de0e97b551be51495abf8a727f1a",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "Stonks3141",
|
||||||
|
"repo": "ctp-nix",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"crane": {
|
"crane": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1734808813,
|
"lastModified": 1734808813,
|
||||||
|
@ -282,6 +297,7 @@
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
"api-rs": "api-rs",
|
"api-rs": "api-rs",
|
||||||
"camasca": "camasca",
|
"camasca": "camasca",
|
||||||
|
"catppuccin": "catppuccin",
|
||||||
"crane": "crane",
|
"crane": "crane",
|
||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
|
|
|
@ -73,6 +73,8 @@
|
||||||
inputs.darwin.follows = "";
|
inputs.darwin.follows = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
catppuccin.url = "github:Stonks3141/ctp-nix";
|
||||||
|
|
||||||
crane.url = "github:ipetkov/crane";
|
crane.url = "github:ipetkov/crane";
|
||||||
|
|
||||||
flake-parts = {
|
flake-parts = {
|
||||||
|
|
6
justfile
6
justfile
|
@ -6,7 +6,7 @@ check:
|
||||||
|
|
||||||
switch *args:
|
switch *args:
|
||||||
@sudo -v
|
@sudo -v
|
||||||
nh os switch --no-nom --ask . -- --keep-going {{args}}
|
nh os switch --ask . -- --keep-going {{args}}
|
||||||
|
|
||||||
rollback:
|
rollback:
|
||||||
@sudo -v
|
@sudo -v
|
||||||
|
@ -14,7 +14,7 @@ rollback:
|
||||||
|
|
||||||
boot *args:
|
boot *args:
|
||||||
@sudo -v
|
@sudo -v
|
||||||
nh os boot --no-nom --ask . -- --keep-going {{args}}
|
nh os boot --ask . -- --keep-going {{args}}
|
||||||
|
|
||||||
deploy system user="leo":
|
deploy system user="leo":
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
@ -23,7 +23,7 @@ deploy system user="leo":
|
||||||
nix copy "$flake" --to "ssh://{{user}}@{{system}}"
|
nix copy "$flake" --to "ssh://{{user}}@{{system}}"
|
||||||
# -R/--bypass-root-check is needed because of a Git CVE regression in Nix 2.20
|
# -R/--bypass-root-check is needed because of a Git CVE regression in Nix 2.20
|
||||||
# See NixOS/nix#10202, viperML/nh#200
|
# See NixOS/nix#10202, viperML/nh#200
|
||||||
ssh -t "{{user}}@{{system}}" "sudo flock -w 60 /dev/shm/deploy-{{system}} nix run n#nh -- os switch --no-nom -R -H {{system}} --ask $flake"
|
ssh -t "{{user}}@{{system}}" "sudo flock -w 60 /dev/shm/deploy-{{system}} nix run n#nh -- os switch -R -H {{system}} --ask $flake"
|
||||||
|
|
||||||
lint *args:
|
lint *args:
|
||||||
statix check -i flake.nix **/hardware-configuration.nix {{args}}
|
statix check -i flake.nix **/hardware-configuration.nix {{args}}
|
||||||
|
|
|
@ -12,7 +12,8 @@ in
|
||||||
packages = [ pkgs.jetbrains.rider ];
|
packages = [ pkgs.jetbrains.rider ];
|
||||||
|
|
||||||
file = {
|
file = {
|
||||||
".dotnet/8".source = mkOutOfStoreSymlink "${pkgs.dotnet-sdk_8}/share/dotnet";
|
".dotnet/8".source =
|
||||||
|
mkOutOfStoreSymlink "${pkgs.dotnetCorePackages.dotnet_8.sdk.unwrapped}/share/dotnet";
|
||||||
".dotnet/mono".source = mkOutOfStoreSymlink pkgs.mono;
|
".dotnet/mono".source = mkOutOfStoreSymlink pkgs.mono;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue