From 92792ea0e0cb1b820d938abdd021a1a0bae6ff46 Mon Sep 17 00:00:00 2001
From: Tristan Druyen <tristan@vault81.de>
Date: Mon, 22 Jan 2024 21:09:28 +0100
Subject: [PATCH] Fix statix suggestions

---
 flake.nix                   |  8 ++++----
 os-mods/common/default.nix  | 16 +++++++++-------
 os-mods/desktop/default.nix | 10 ++++++----
 users/admin-fat.nix         |  2 +-
 users/admin-shell.nix       |  2 +-
 users/admin-thin.nix        |  2 +-
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/flake.nix b/flake.nix
index b04abdb..341988c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -137,7 +137,7 @@
       };
       nixosConfigurations = {
         nixos-he4 = nixpkgs.lib.nixosSystem {
-          system = system;
+          inherit system;
           specialArgs = args;
           modules =
             [
@@ -152,7 +152,7 @@
             ++ osModules;
         };
         nixos-pulse = nixpkgs.lib.nixosSystem {
-          system = system;
+          inherit system;
           specialArgs = args;
           modules =
             [
@@ -167,7 +167,7 @@
             ++ osModules;
         };
         nixos-desk = nixpkgs.lib.nixosSystem {
-          system = system;
+          inherit system;
           specialArgs = args;
           modules =
             [
@@ -191,7 +191,7 @@
             ++ osModules;
         };
         nixos-karl-kvm-guest = nixpkgs.lib.nixosSystem {
-          system = system;
+          inherit system;
           specialArgs = args;
           modules =
             [
diff --git a/os-mods/common/default.nix b/os-mods/common/default.nix
index f877968..6d370f6 100644
--- a/os-mods/common/default.nix
+++ b/os-mods/common/default.nix
@@ -20,9 +20,6 @@
     '';
   };
 
-  security.pki.certificates = [
-    (lib.readFile ../../ext/internal-ca.crt)
-  ];
   home-manager.backupFileExtension = "bak";
 
   # locale
@@ -49,11 +46,16 @@
   };
   ####################
 
-  security.rtkit.enable = true;
+  security = {
+    pki.certificates = [
+      (lib.readFile ../../ext/internal-ca.crt)
+    ];
+    rtkit.enable = true;
 
-  security.sudo = {
-    wheelNeedsPassword = false;
-    execWheelOnly = true;
+    sudo = {
+      wheelNeedsPassword = false;
+      execWheelOnly = true;
+    };
   };
 
   environment.sessionVariables = {
diff --git a/os-mods/desktop/default.nix b/os-mods/desktop/default.nix
index 83251f5..9913abf 100644
--- a/os-mods/desktop/default.nix
+++ b/os-mods/desktop/default.nix
@@ -11,10 +11,12 @@
     fontconfig = {
       antialias = true;
 
-      defaultFonts.serif = [ "Iosevka Nerd Font Propo" ];
-      defaultFonts.sansSerif = [ "Iosevka Nerd Font Propo" ];
-      defaultFonts.monospace = [ "Iosevka Nerd Font Mono" ];
-      defaultFonts.emoji = [ "Noto Color Emoji" ];
+      defaultFonts = {
+        serif = [ "Iosevka Nerd Font Propo" ];
+        sansSerif = [ "Iosevka Nerd Font Propo" ];
+        monospace = [ "Iosevka Nerd Font Mono" ];
+        emoji = [ "Noto Color Emoji" ];
+      };
 
       hinting.enable = true;
       hinting.style = "slight";
diff --git a/users/admin-fat.nix b/users/admin-fat.nix
index 903806f..b40d25b 100644
--- a/users/admin-fat.nix
+++ b/users/admin-fat.nix
@@ -17,7 +17,7 @@
 
   config = {
     home = {
-      username = username;
+      inherit username;
       homeDirectory = "/home/${username}";
 
       stateVersion = "23.05";
diff --git a/users/admin-shell.nix b/users/admin-shell.nix
index 1fdf865..8f317cd 100644
--- a/users/admin-shell.nix
+++ b/users/admin-shell.nix
@@ -10,7 +10,7 @@
   ];
 
   config.home = {
-    username = username;
+    inherit username;
     homeDirectory = "/home/${username}";
 
     stateVersion = "23.05";
diff --git a/users/admin-thin.nix b/users/admin-thin.nix
index 4e9f149..ffe08c4 100644
--- a/users/admin-thin.nix
+++ b/users/admin-thin.nix
@@ -14,7 +14,7 @@
   ];
 
   config.home = {
-    username = username;
+    inherit username;
     homeDirectory = "/home/${username}";
 
     stateVersion = "23.05";