diff options
| author | Linnea Gräf <nea@nea.moe> | 2025-05-21 19:00:05 +0200 |
|---|---|---|
| committer | Linnea Gräf <nea@nea.moe> | 2025-05-21 19:00:05 +0200 |
| commit | 4626e4f71c445bf8264ab009a3375d2fe75823e5 (patch) | |
| tree | 9a1906b9e192217738894513d830e7d63f1638a5 | |
| parent | 4cf78578cc50073c2d6bea82981841967ed574d7 (diff) | |
| download | nix-infra-4626e4f71c445bf8264ab009a3375d2fe75823e5.tar.gz nix-infra-4626e4f71c445bf8264ab009a3375d2fe75823e5.tar.bz2 nix-infra-4626e4f71c445bf8264ab009a3375d2fe75823e5.zip | |
snapshot: Mi 21. Mai 19:00:05 CEST 2025
| -rw-r--r-- | modules/desktop/zerotierone/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/swayprop/default.nix | 4 | ||||
| -rw-r--r-- | srv/hadante/configuration.nix | 18 |
3 files changed, 26 insertions, 11 deletions
diff --git a/modules/desktop/zerotierone/default.nix b/modules/desktop/zerotierone/default.nix new file mode 100644 index 0000000..e8e834b --- /dev/null +++ b/modules/desktop/zerotierone/default.nix @@ -0,0 +1,15 @@ +{ + config, + lib, + pkgs, + modulesPath, + ... +}: +{ + services.zerotierone = { + enable = true; + joinNetworks = [ + "363c67c55a720f73" + ]; + }; +} diff --git a/pkgs/swayprop/default.nix b/pkgs/swayprop/default.nix index c0baf01..99f1719 100644 --- a/pkgs/swayprop/default.nix +++ b/pkgs/swayprop/default.nix @@ -13,7 +13,7 @@ let buildCommand = "${old.buildCommand}\n patchShebangs $out"; }); in -symlinkJoin rec { +symlinkJoin { name = script-name; paths = [ script @@ -23,5 +23,5 @@ symlinkJoin rec { coreutils ]; buildInputs = [ makeWrapper ]; - postBuild = "wrapProgram $out/bin/${name} --prefix PATH : $out/bin"; + postBuild = "wrapProgram $out/bin/${script-name} --prefix PATH : $out/bin"; } diff --git a/srv/hadante/configuration.nix b/srv/hadante/configuration.nix index f997232..c012b6f 100644 --- a/srv/hadante/configuration.nix +++ b/srv/hadante/configuration.nix @@ -15,6 +15,7 @@ in imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix + ../../modules/desktop/zerotierone inputs.home-manager.nixosModules.home-manager ]; @@ -197,15 +198,14 @@ in ) javas) // { ".gradle/gradle.properties".source = - (pkgs.formats.javaProperties { }).generate "gradle.properties" { - "org.gradle.java.installations.paths" = builtins.concatStringsSep "," ( - builtins.map (name: "/home/" + config.user + "/.jdks/" + name + "/lib/openjdk") ( - builtins.attrNames javas - ) - ); - } - - ; + (pkgs.formats.javaProperties { }).generate "gradle.properties" + { + "org.gradle.java.installations.paths" = builtins.concatStringsSep "," ( + builtins.map (name: "/home/" + config.user + "/.jdks/" + name + "/lib/openjdk") ( + builtins.attrNames javas + ) + ); + }; ".cargo/config.toml".source = (pkgs.formats.toml { }).generate "config.toml" { net.git-fetch-with-cli = true; }; |