From dfc75a57bdaccb6a5c01ceee2dcad9fbc4a52e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.dev>
Date: Tue, 8 Nov 2022 17:06:20 +0000
Subject: [PATCH] fix statix checks

---
 nixos/boxes/vpsfree1/fossil.nix     | 2 +-
 nixos/boxes/vpsfree1/gitea.nix      | 5 ++---
 nixos/boxes/vpsfree1/rss.nix        | 8 ++++----
 nixos/boxes/yoga/default.nix        | 2 +-
 nixos/i3/openweathermap-secrets.nix | 2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/boxes/vpsfree1/fossil.nix b/nixos/boxes/vpsfree1/fossil.nix
index eb25a209..386533bd 100644
--- a/nixos/boxes/vpsfree1/fossil.nix
+++ b/nixos/boxes/vpsfree1/fossil.nix
@@ -39,10 +39,10 @@ in {
         users.groups = { "${group}" = { }; };
         users.users = {
           fossil = {
+            inherit group;
             description = "Fossil Service";
             home = path;
             useDefaultShell = true;
-            group = group;
             isSystemUser = true;
           };
         };
diff --git a/nixos/boxes/vpsfree1/gitea.nix b/nixos/boxes/vpsfree1/gitea.nix
index e5acc574..e3b370bb 100644
--- a/nixos/boxes/vpsfree1/gitea.nix
+++ b/nixos/boxes/vpsfree1/gitea.nix
@@ -28,8 +28,8 @@ in {
     autoStart = true;
     forwardPorts = [
       {
+        inherit httpPort;
         containerPort = httpPort;
-        hostPort = httpPort;
       }
       {
         containerPort = sshPort;
@@ -45,10 +45,9 @@ in {
     config = { config, pkgs, lib, ... }: {
       system.stateVersion = "22.05";
       services.gitea = {
+        inherit domain httpPort;
         enable = true;
-        domain = domain;
         rootUrl = baseurl;
-        httpPort = httpPort;
         disableRegistration = true;
         stateDir = path;
         settings = {
diff --git a/nixos/boxes/vpsfree1/rss.nix b/nixos/boxes/vpsfree1/rss.nix
index 2b51a3af..790b55d3 100644
--- a/nixos/boxes/vpsfree1/rss.nix
+++ b/nixos/boxes/vpsfree1/rss.nix
@@ -23,9 +23,9 @@ in {
     }];
     config = { config, pkgs, ... }:
       let
-        root = config.services.tt-rss.root;
-        pool = config.services.tt-rss.pool;
-      in rec {
+        inherit (config.services.tt-rss) pool;
+        inherit (config.services.tt-rss) root;
+      in {
         system.stateVersion = "22.05";
         services.tt-rss = {
           enable = true;
@@ -38,8 +38,8 @@ in {
           virtualHosts = {
             "${domain}" = {
               listen = [{
+                inherit port;
                 addr = "0.0.0.0";
-                port = port;
               }];
               root = "${root}/www";
               locations."/" = { index = "index.php"; };
diff --git a/nixos/boxes/yoga/default.nix b/nixos/boxes/yoga/default.nix
index 8bcf1e68..4ef9d32c 100644
--- a/nixos/boxes/yoga/default.nix
+++ b/nixos/boxes/yoga/default.nix
@@ -10,7 +10,7 @@
 
   services.fprintd = { enable = true; };
 
-  home-manager.users.cyryl = { ... }: {
+  home-manager.users.cyryl = { _ }: {
     home.packages = with pkgs; [ firefox vim gnome3.gedit git ];
   };
 
diff --git a/nixos/i3/openweathermap-secrets.nix b/nixos/i3/openweathermap-secrets.nix
index 83fa0924..f7c70f39 100644
--- a/nixos/i3/openweathermap-secrets.nix
+++ b/nixos/i3/openweathermap-secrets.nix
@@ -2,9 +2,9 @@
 
 {
   sops.secrets.openweathermap-api-key = {
+    inherit (config.users.users.cyryl) group;
     mode = "0440";
     owner = config.users.users.cyryl.name;
-    group = config.users.users.cyryl.group;
     sopsFile = ./openweathermap.sops.yaml;
   };
   home-manager.users.cyryl = { home.sessionVariables = { }; };