jordan/nix-config
1
1
Fork 0
Code Issues 10 Pull Requests Actions Projects 3 Wiki Activity

treewide: use inputs instead of self

Browse Source
This commit is contained in:
Jordan Holt
2025-03-16 15:45:04 +00:00
parent 130197eeb8
commit 22232f7a84
28 changed files with 67 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
hosts/common.nix
View File

@ -1,21 +1,22 @@
{
inputs,
config,
pkgs,
self,
...
}:
{
imports = [
self.inputs.agenix.nixosModules.age
self.inputs.home-manager.nixosModule
inputs.agenix.nixosModules.age
inputs.home-manager.nixosModule
../modules/nixos
];
nixpkgs.overlays = [
self.inputs.agenix.overlays.default
inputs.agenix.overlays.default
(import ../overlays/default.nix)
(final: prev: {
unstable = import self.inputs.nixpkgs-unstable { system = final.system; };
unstable = import inputs.nixpkgs-unstable { system = final.system; };
})
];
@ -106,8 +107,14 @@
useGlobalPkgs = true;
useUserPackages = true;
sharedModules = [
self.inputs.nixvim.homeManagerModules.nixvim
inputs.nixvim.homeManagerModules.nixvim
{
home.stateVersion = config.system.stateVersion;
}
];
extraSpecialArgs = {
inherit inputs;
};
};
environment.systemPackages = with pkgs; [

4
hosts/hypnos/default.nix
View File

@ -1,13 +1,13 @@
{
inputs,
lib,
self,
pkgs,
...
}:
{
imports = [
self.inputs.disko.nixosModules.disko
inputs.disko.nixosModules.disko
./hardware-configuration.nix
./disko-config.nix
../desktop.nix

4
hosts/mail/default.nix
View File

@ -1,12 +1,12 @@
{
inputs,
lib,
self,
...
}:
{
imports = [
self.inputs.disko.nixosModules.disko
inputs.disko.nixosModules.disko
./hardware-configuration.nix
./disko-config.nix
./mail.nix

4
hosts/mail/mail.nix
View File

@ -1,6 +1,6 @@
{
inputs,
config,
self,
...
}:
@ -20,7 +20,7 @@ let
in
{
imports = [
self.inputs.nixos-mailserver.nixosModule
inputs.nixos-mailserver.nixosModule
];
services.roundcube = {

4
hosts/odyssey/gitea-runner.nix
View File

@ -1,7 +1,7 @@
{
inputs,
pkgs,
config,
self,
...
}:
@ -179,7 +179,7 @@ in
users.groups.nix-ci-user = { };
age.secrets."files/services/gitea-runner/${hostname}-token" = {
file = "${self.inputs.secrets}/files/services/gitea-runner/${hostname}-token.age";
file = "${inputs.secrets}/files/services/gitea-runner/${hostname}-token.age";
group = "podman";
};

4
hosts/pi/default.nix
View File

@ -1,12 +1,12 @@
{
inputs,
pkgs,
self,
...
}:
{
imports = [
self.inputs.nixos-hardware.nixosModules.raspberry-pi-4
inputs.nixos-hardware.nixosModules.raspberry-pi-4
./hardware-configuration.nix
./home-assistant
../server.nix

4
hosts/pi/home-assistant/default.nix
View File

@ -1,7 +1,7 @@
{
inputs,
config,
pkgs,
self,
...
}:
@ -12,7 +12,7 @@
];
age.secrets."files/services/home-assistant/secrets.yaml" = {
file = "${self.inputs.secrets}/files/services/home-assistant/secrets.yaml.age";
file = "${inputs.secrets}/files/services/home-assistant/secrets.yaml.age";
path = "${config.services.home-assistant.configDir}/secrets.yaml";
owner = "hass";
group = "hass";

4
hosts/pi/home-assistant/mqtt.nix
View File

@ -1,8 +1,8 @@
{
inputs,
config,
lib,
pkgs,
self,
...
}:
@ -22,7 +22,7 @@
};
age.secrets."files/services/zigbee2mqtt/secret.yaml" = {
file = "${self.inputs.secrets}/files/services/zigbee2mqtt/secret.yaml.age";
file = "${inputs.secrets}/files/services/zigbee2mqtt/secret.yaml.age";
path = "${config.services.zigbee2mqtt.dataDir}/secret.yaml";
owner = "zigbee2mqtt";
group = "zigbee2mqtt";

4
hosts/skycam/default.nix
View File

@ -1,14 +1,14 @@
{
inputs,
config,
lib,
pkgs,
self,
...
}:
{
imports = [
self.inputs.nixos-hardware.nixosModules.raspberry-pi-4
inputs.nixos-hardware.nixosModules.raspberry-pi-4
./hardware-configuration.nix
../server.nix
];

6
hosts/vps1/coturn.nix
View File

@ -1,7 +1,7 @@
{
inputs,
config,
lib,
self,
...
}:
@ -43,7 +43,7 @@ in
age.secrets =
{
"passwords/services/coturn/static-auth-secret" = {
file = "${self.inputs.secrets}/passwords/services/coturn/static-auth-secret.age";
file = "${inputs.secrets}/passwords/services/coturn/static-auth-secret.age";
owner = "turnserver";
group = "turnserver";
};
@ -52,7 +52,7 @@ in
if matrixIntegration then
{
"passwords/services/coturn/matrix-turn-config.yml" = {
file = "${self.inputs.secrets}/passwords/services/coturn/matrix-turn-config.yml.age";
file = "${inputs.secrets}/passwords/services/coturn/matrix-turn-config.yml.age";
owner = "matrix-synapse";
group = "matrix-synapse";
};

8
hosts/vps1/gitea.nix
View File

@ -1,8 +1,8 @@
{
inputs,
config,
lib,
pkgs,
self,
...
}:
let
@ -37,9 +37,9 @@ in
systemd.tmpfiles.rules = [
"d '${config.services.gitea.customDir}/public/assets/css' 0750 ${config.services.gitea.user} ${config.services.gitea.group} - -"
"L+ '${config.services.gitea.customDir}/public/assets/css/theme-github.css' - - - - ${self.inputs.gitea-github-theme}/theme-github.css"
"L+ '${config.services.gitea.customDir}/public/assets/css/theme-github-auto.css' - - - - ${self.inputs.gitea-github-theme}/theme-github-auto.css"
"L+ '${config.services.gitea.customDir}/public/assets/css/theme-github-dark.css' - - - - ${self.inputs.gitea-github-theme}/theme-github-dark.css"
"L+ '${config.services.gitea.customDir}/public/assets/css/theme-github.css' - - - - ${inputs.gitea-github-theme}/theme-github.css"
"L+ '${config.services.gitea.customDir}/public/assets/css/theme-github-auto.css' - - - - ${inputs.gitea-github-theme}/theme-github-auto.css"
"L+ '${config.services.gitea.customDir}/public/assets/css/theme-github-dark.css' - - - - ${inputs.gitea-github-theme}/theme-github-dark.css"
];
services.gitea = rec {

4
hosts/vps1/outline.nix
View File

@ -1,6 +1,6 @@
{
inputs,
config,
self,
...
}:
let
@ -31,7 +31,7 @@ in
};
age.secrets."passwords/services/outline/oidc-client-secret" = {
file = "${self.inputs.secrets}/passwords/services/outline/oidc-client-secret.age";
file = "${inputs.secrets}/passwords/services/outline/oidc-client-secret.age";
owner = "outline";
group = "outline";
};

4
hosts/vps1/photoprism.nix
View File

@ -1,6 +1,6 @@
{
inputs,
config,
self,
...
}:
let
@ -29,7 +29,7 @@ in
};
age.secrets."passwords/services/photoprism/admin" = {
file = "${self.inputs.secrets}/passwords/services/photoprism/admin.age";
file = "${inputs.secrets}/passwords/services/photoprism/admin.age";
};
services.photoprism = {