From 63994abc4b715a5d382eab1960fda57fbd2dd073 Mon Sep 17 00:00:00 2001 From: Alexey Shekhirin Date: Fri, 20 Feb 2026 14:12:06 +0000 Subject: [PATCH 1/5] fix: set git user email to match jj config Updated git configuration to use the same email address as jujutsu (github@shekhirin.com). Also migrated from deprecated userName/userEmail options to the newer settings.user format. Co-Authored-By: Claude Haiku 4.5 --- modules/shared/programs/git.nix | 4 ++++ 1 file changed, 4 insertions(+) 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"; }; From 9dfd6d0c0cd3b77a305d92404ca00ee360f7c0e9 Mon Sep 17 00:00:00 2001 From: Alexey Shekhirin Date: Fri, 20 Feb 2026 14:25:15 +0000 Subject: [PATCH 2/5] fix: add required jellarr config version Co-Authored-By: Claude Opus 4.6 --- modules/nixos/services/jellyfin.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/nixos/services/jellyfin.nix b/modules/nixos/services/jellyfin.nix index 5cf05f1..addf3df 100644 --- a/modules/nixos/services/jellyfin.nix +++ b/modules/nixos/services/jellyfin.nix @@ -40,6 +40,7 @@ in }; config = { + version = 1; base_url = "http://localhost:8096"; users = [ { From bf26ad7b56ff3f54b7b73eae5d0c7ca823d58362 Mon Sep 17 00:00:00 2001 From: Alexey Shekhirin Date: Fri, 20 Feb 2026 14:48:36 +0000 Subject: [PATCH 3/5] fix: use camelCase for jellarr policy option The jellarr module uses `isAdministrator`, not `IsAdministrator`. Co-Authored-By: Claude Opus 4.6 --- modules/nixos/services/jellyfin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/nixos/services/jellyfin.nix b/modules/nixos/services/jellyfin.nix index addf3df..ff83a2a 100644 --- a/modules/nixos/services/jellyfin.nix +++ b/modules/nixos/services/jellyfin.nix @@ -47,7 +47,7 @@ in name = "admin"; passwordFile = config.sops.secrets.jellyfin-password.path; policy = { - IsAdministrator = true; + isAdministrator = true; }; } ]; From f8a7341278d8fcbeeded33d29a1f9285bcf62995 Mon Sep 17 00:00:00 2001 From: Alexey Shekhirin Date: Fri, 20 Feb 2026 20:57:31 +0000 Subject: [PATCH 4/5] fix: resolve statix lint warnings - Use nested `inputs = { ... }` instead of repeated `inputs.X.follows` to fix W20 (repeated keys) in flake.nix - Replace empty pattern `{ ... }:` with `_:` in cargo.nix to fix W10 Co-Authored-By: Claude Opus 4.6 --- flake.nix | 24 +++++++++++++++--------- modules/shared/programs/cargo.nix | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) 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/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 = '' From 8c9b44dc33e55b76a209554ac930ab0c039b70f8 Mon Sep 17 00:00:00 2001 From: Alexey Shekhirin Date: Fri, 20 Feb 2026 21:28:38 +0000 Subject: [PATCH 5/5] fix: replace all empty patterns with _ for statix W10 Co-Authored-By: Claude Opus 4.6 --- modules/darwin/default.nix | 2 +- modules/darwin/programs/default.nix | 2 +- modules/nixos/default.nix | 2 +- modules/nixos/services/default.nix | 2 +- modules/shared/default.nix | 2 +- modules/shared/home.nix | 2 +- modules/shared/programs/amp.nix | 2 +- modules/shared/programs/default.nix | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) 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/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/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 = [