diff --git a/flake.nix b/flake.nix index 06492ef..985e3fd 100644 --- a/flake.nix +++ b/flake.nix @@ -34,18 +34,22 @@ # Ethereum.nix for blockchain node configurations ethereum-nix = { url = "github:nix-community/ethereum.nix"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-utils.follows = "flake-utils"; - inputs.flake-parts.follows = "flake-parts"; - inputs.systems.follows = "systems"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + flake-parts.follows = "flake-parts"; + systems.follows = "systems"; + }; }; # Declarative Jellyfin configuration jellarr = { url = "github:venkyr77/jellarr"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.follows = "flake-parts"; - inputs.systems.follows = "systems"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-parts.follows = "flake-parts"; + systems.follows = "systems"; + }; }; # Secret management @@ -63,8 +67,10 @@ # Zed Editor preview builds zed-editor-flake = { url = "github:shekhirin/zed-editor-flake"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.follows = "flake-parts"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-parts.follows = "flake-parts"; + }; }; # AeroSpace custom fork with tabs support diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index f0b196f..4796e27 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -1,4 +1,4 @@ -{ ... }: +_: { imports = [ diff --git a/modules/darwin/programs/default.nix b/modules/darwin/programs/default.nix index e8d3243..1bc64a3 100644 --- a/modules/darwin/programs/default.nix +++ b/modules/darwin/programs/default.nix @@ -1,4 +1,4 @@ -{ ... }: +_: { imports = [ diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index ad89e85..c9fc061 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -1,4 +1,4 @@ -{ ... }: +_: { imports = [ diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index cc99eaa..65e624a 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -1,4 +1,4 @@ -{ ... }: +_: { imports = [ diff --git a/modules/nixos/services/jellyfin.nix b/modules/nixos/services/jellyfin.nix index 5cf05f1..ff83a2a 100644 --- a/modules/nixos/services/jellyfin.nix +++ b/modules/nixos/services/jellyfin.nix @@ -40,13 +40,14 @@ in }; config = { + version = 1; base_url = "http://localhost:8096"; users = [ { name = "admin"; passwordFile = config.sops.secrets.jellyfin-password.path; policy = { - IsAdministrator = true; + isAdministrator = true; }; } ]; diff --git a/modules/shared/default.nix b/modules/shared/default.nix index 09d2e3e..f32f6fb 100644 --- a/modules/shared/default.nix +++ b/modules/shared/default.nix @@ -1,4 +1,4 @@ -{ ... }: +_: { # System-level shared configuration diff --git a/modules/shared/home.nix b/modules/shared/home.nix index 075f87d..96d47e1 100644 --- a/modules/shared/home.nix +++ b/modules/shared/home.nix @@ -1,4 +1,4 @@ -{ ... }: +_: { # Home-Manager-level shared configuration diff --git a/modules/shared/programs/amp.nix b/modules/shared/programs/amp.nix index a0fbdff..c9accc5 100644 --- a/modules/shared/programs/amp.nix +++ b/modules/shared/programs/amp.nix @@ -1,4 +1,4 @@ -{ ... }: +_: { home.file.".config/amp/settings.json".text = builtins.toJSON { diff --git a/modules/shared/programs/cargo.nix b/modules/shared/programs/cargo.nix index bf2640d..88fc2ea 100644 --- a/modules/shared/programs/cargo.nix +++ b/modules/shared/programs/cargo.nix @@ -1,4 +1,4 @@ -{ ... }: +_: { home.file.".cargo/config.toml".text = '' diff --git a/modules/shared/programs/default.nix b/modules/shared/programs/default.nix index 29416f3..0e74076 100644 --- a/modules/shared/programs/default.nix +++ b/modules/shared/programs/default.nix @@ -1,4 +1,4 @@ -{ ... }: +_: { imports = [ diff --git a/modules/shared/programs/git.nix b/modules/shared/programs/git.nix index 9d8d2db..6aef7c8 100644 --- a/modules/shared/programs/git.nix +++ b/modules/shared/programs/git.nix @@ -4,6 +4,10 @@ _: programs.git = { enable = true; settings = { + user = { + name = "Alexey Shekhirin"; + email = "github@shekhirin.com"; + }; core = { editor = "vim"; };