Compare commits

...

3 commits

Author SHA1 Message Date
uku
e7b937da94
chore(dotnet): avoid using two different dotnet versions
rider uses dotnet-sdk_8 for reshaper, but dotnetCorePackages has a
different version
2024-12-28 17:38:17 +01:00
uku
a2722c84ed
fix(just): use --no-nom on nh 2024-12-28 17:37:10 +01:00
uku
0d8e2a2981
chore: remove catppuccin input 2024-12-28 17:36:49 +01:00
5 changed files with 4 additions and 26 deletions

View file

@ -2,13 +2,11 @@
lib, lib,
pkgs, pkgs,
config, config,
catppuccin,
lanzaboote, lanzaboote,
... ...
}: }:
{ {
imports = [ imports = [
catppuccin.nixosModules.catppuccin
lanzaboote.nixosModules.lanzaboote lanzaboote.nixosModules.lanzaboote
./client.nix ./client.nix
@ -77,7 +75,6 @@
hm = { hm = {
imports = [ imports = [
catppuccin.homeManagerModules.catppuccin
../programs/java.nix ../programs/java.nix
]; ];

16
flake.lock generated
View file

@ -70,21 +70,6 @@
"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,
@ -297,7 +282,6 @@
"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",

View file

@ -73,8 +73,6 @@
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 = {

View file

@ -6,7 +6,7 @@ check:
switch *args: switch *args:
@sudo -v @sudo -v
nh os switch --ask . -- --keep-going {{args}} nh os switch --no-nom --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 --ask . -- --keep-going {{args}} nh os boot --no-nom --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 -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: lint *args:
statix check -i flake.nix **/hardware-configuration.nix {{args}} statix check -i flake.nix **/hardware-configuration.nix {{args}}

View file

@ -12,8 +12,7 @@ in
packages = [ pkgs.jetbrains.rider ]; packages = [ pkgs.jetbrains.rider ];
file = { file = {
".dotnet/8".source = ".dotnet/8".source = mkOutOfStoreSymlink "${pkgs.dotnet-sdk_8}/share/dotnet";
mkOutOfStoreSymlink "${pkgs.dotnetCorePackages.dotnet_8.sdk.unwrapped}/share/dotnet";
".dotnet/mono".source = mkOutOfStoreSymlink pkgs.mono; ".dotnet/mono".source = mkOutOfStoreSymlink pkgs.mono;
}; };
}; };