Compare commits
3 commits
8291210b5d
...
e7b937da94
Author | SHA1 | Date | |
---|---|---|---|
e7b937da94 | |||
a2722c84ed | |||
0d8e2a2981 |
5 changed files with 4 additions and 26 deletions
|
@ -2,13 +2,11 @@
|
|||
lib,
|
||||
pkgs,
|
||||
config,
|
||||
catppuccin,
|
||||
lanzaboote,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [
|
||||
catppuccin.nixosModules.catppuccin
|
||||
lanzaboote.nixosModules.lanzaboote
|
||||
|
||||
./client.nix
|
||||
|
@ -77,7 +75,6 @@
|
|||
|
||||
hm = {
|
||||
imports = [
|
||||
catppuccin.homeManagerModules.catppuccin
|
||||
../programs/java.nix
|
||||
];
|
||||
|
||||
|
|
16
flake.lock
generated
16
flake.lock
generated
|
@ -70,21 +70,6 @@
|
|||
"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": {
|
||||
"locked": {
|
||||
"lastModified": 1734808813,
|
||||
|
@ -297,7 +282,6 @@
|
|||
"agenix": "agenix",
|
||||
"api-rs": "api-rs",
|
||||
"camasca": "camasca",
|
||||
"catppuccin": "catppuccin",
|
||||
"crane": "crane",
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-utils": "flake-utils",
|
||||
|
|
|
@ -73,8 +73,6 @@
|
|||
inputs.darwin.follows = "";
|
||||
};
|
||||
|
||||
catppuccin.url = "github:Stonks3141/ctp-nix";
|
||||
|
||||
crane.url = "github:ipetkov/crane";
|
||||
|
||||
flake-parts = {
|
||||
|
|
6
justfile
6
justfile
|
@ -6,7 +6,7 @@ check:
|
|||
|
||||
switch *args:
|
||||
@sudo -v
|
||||
nh os switch --ask . -- --keep-going {{args}}
|
||||
nh os switch --no-nom --ask . -- --keep-going {{args}}
|
||||
|
||||
rollback:
|
||||
@sudo -v
|
||||
|
@ -14,7 +14,7 @@ rollback:
|
|||
|
||||
boot *args:
|
||||
@sudo -v
|
||||
nh os boot --ask . -- --keep-going {{args}}
|
||||
nh os boot --no-nom --ask . -- --keep-going {{args}}
|
||||
|
||||
deploy system user="leo":
|
||||
#!/usr/bin/env bash
|
||||
|
@ -23,7 +23,7 @@ deploy system user="leo":
|
|||
nix copy "$flake" --to "ssh://{{user}}@{{system}}"
|
||||
# -R/--bypass-root-check is needed because of a Git CVE regression in Nix 2.20
|
||||
# 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 -R -H {{system}} --ask $flake"
|
||||
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"
|
||||
|
||||
lint *args:
|
||||
statix check -i flake.nix **/hardware-configuration.nix {{args}}
|
||||
|
|
|
@ -12,8 +12,7 @@ in
|
|||
packages = [ pkgs.jetbrains.rider ];
|
||||
|
||||
file = {
|
||||
".dotnet/8".source =
|
||||
mkOutOfStoreSymlink "${pkgs.dotnetCorePackages.dotnet_8.sdk.unwrapped}/share/dotnet";
|
||||
".dotnet/8".source = mkOutOfStoreSymlink "${pkgs.dotnet-sdk_8}/share/dotnet";
|
||||
".dotnet/mono".source = mkOutOfStoreSymlink pkgs.mono;
|
||||
};
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue