nix-os/account.nix

@@ -4,7 +4,6 @@
   imports = [
     ./unstable-packages.nix
   ];
-  config = {
   users.users.wroclaw = {
     isNormalUser = true;
     description = "Rafał";
@@ -45,5 +44,4 @@
     dataDir = "/home/wroclaw";
     configDir = "/home/wroclaw/.config/syncthing";
   };
-  };
 }

nix-os/core.nix

@@ -10,7 +10,6 @@
     ./module-overrides.nix
     ./nix.nix
   ];
-  config = {
 
   # kernel
   boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -85,5 +84,4 @@
       8022
     ];
   };
-  };
 }

nix-os/docker.nix

@@ -1,8 +1,7 @@
 { lib, config, pkgs, ... }:
 
 {
-  config = {
+  config.virtualisation.docker = {
-    virtualisation.docker = {
     enable = true;
     enableOnBoot = true;
     storageDriver = if config.fileSystems."/".fsType == "btrfs" then "btrfs" else null;
@@ -15,27 +14,26 @@
       bip = "10.127.0.1/16";
     };
   };
-    users.users.indocker = {
+  config.users.users.indocker = {
     isSystemUser = true;
     hashedPassword = "!";
     uid = 900;
     group = "indocker";
   };
-    users.groups.indocker = {
+  config.users.groups.indocker = {
     gid = 900;
   };
-    environment.systemPackages = with pkgs; [
+  config.environment.systemPackages = with pkgs; [
     docker-compose
   ];
 
   # Docker enables firewall anyway, let's enable the firewall for it if it's disabled
   # TODO: Apply only when config.networking.firewall is false
-    networking.firewall = {
+  config.networking.firewall = {
     enable = lib.mkOverride 90 true;
     allowedTCPPorts = lib.mkOverride 90 [];
     allowedUDPPorts = lib.mkOverride 90 [];
     allowedTCPPortRanges = lib.mkOverride 90 [{ from = 0; to = 65535;}];
     allowedUDPPortRanges = lib.mkOverride 90 [{ from = 0; to = 65535;}];
   };
-  };
 }

nix-os/locale.nix

@@ -1,3 +1,5 @@
+{ ... }:
+
 {
   config = {
     # Set your time zone.

nix-os/module-overrides.nix

@@ -1,33 +1,17 @@
-{
+{ lib, ... }:
-  lib,
-  modulesPath,
-  ...
-}:
-
 let
   moduleOverrides = [
-    # NIXPKGS-PR: 359882
+    # TODO: Remove after updating to nixos 25.05
     {
+      # https://github.com/NixOS/nixpkgs/pull/359882
       disabledModules = [
-        "${modulesPath}/system/boot/luksroot.nix"
+        "system/boot/luksroot.nix"
       ];
       replacementModules = [(builtins.fetchurl {
           url = "https://raw.githubusercontent.com/amozeo/nixpkgs/728d5806fe6f975ba3843297332d12e13119fe86/nixos/modules/system/boot/luksroot.nix";
           sha256 = "0s2k8k6rrlwn2zb02q6fkvswln8w4hvh02hm4krqvkh46amyasyy";
       })];
     }
-    # NIXPKGS-PR: 394300
-    {
-      disabledModules = [
-        "${modulesPath}/hardware/openrazer.nix"
-      ];
-      replacementModules = [
-        (builtins.fetchurl {
-          url = "https://raw.githubusercontent.com/NixOS/nixpkgs/4a11562c20fbe7af7d5ac139dbf0f8d50ce276f6/nixos/modules/hardware/openrazer.nix";
-          sha256 = "0n6kzrcwlmxgws4pmffyqagp2rxpfxmfjl11vgvlkjcbglg6fs7y";
-        })
-      ];
-    }
   ];
 
   toModule = entry: {

nix-os/nix.nix

@@ -28,7 +28,8 @@ let
     };
   };
 
-  # NIXPKGS-PR: 389487
+  # nixpkgs PR389487
+  # https://github.com/NixOS/nixpkgs/pull/389487
   futureNixosExecutables = let
     nixpkgs = builtins.fetchTarball {
       url = "https://github.com/NixOS/nixpkgs/archive/e8f4dba5135ce202c7ef77118f145ef8b3803088.tar.gz";
@@ -45,8 +46,7 @@ let
     postBuild = ''
       wrapProgram $out/bin/nixos-rebuild \
         --add-flags "--log-format" \
-        --add-flags "bar" \
+        --add-flags "bar"
-        --add-flags "--use-remote-sudo"
     '';
   };
 in {

nix-os/nvidia.nix

@@ -1,7 +1,6 @@
 { config, lib, pkgs, ...}:
 
 {
-  config = {
   hardware.graphics = {
     enable = true;
     enable32Bit = true;
@@ -26,5 +25,4 @@
     };
   };
   nixpkgs.config.nvidia.acceptLicense = true;
-  };
 }

nix-os/polkit/disable-shutdown.nix

@@ -1,5 +1,6 @@
+{ ... }:
+
 {
-  config = {
   security.polkit.extraConfig = ''
     polkit.addRule(function(action, subject) {
       polkit.log("action=" + action);
@@ -40,5 +41,4 @@
       };
     });
   '';
-  };
 }

nix-os/razer.nix

@@ -1,12 +1,23 @@
 {
   config,
   lib,
+  modulesPath,
   pkgs,
   ...
 }:
 
 {
-  config = {
+  # NIXPKGS-PR: 394300
+  disabledModules = [
+    "${modulesPath}/hardware/openrazer.nix"
+  ];
+  imports = [
+    (builtins.fetchurl {
+      url = "https://raw.githubusercontent.com/NixOS/nixpkgs/4a11562c20fbe7af7d5ac139dbf0f8d50ce276f6/nixos/modules/hardware/openrazer.nix";
+      sha256 = "0n6kzrcwlmxgws4pmffyqagp2rxpfxmfjl11vgvlkjcbglg6fs7y";
+    })
+  ];
+
   hardware.openrazer = {
     enable = true;
     users = [
@@ -32,5 +43,4 @@
   environment.systemPackages = with pkgs; [
     polychromatic
   ];
-  };
 }

nix-os/shell.nix

@@ -25,8 +25,6 @@ in
   imports = [
     ./unstable-packages.nix
   ];
-
-  config = {
   environment.systemPackages = with pkgs; [
     aliasDrag
     rangerGit
@@ -160,5 +158,4 @@ in
       };
     };
   };
-  };
 }

nix-os/virtualization.nix

@@ -2,7 +2,6 @@
 { lib, config, pkgs, ... }:
 
 {
-  config = {
   #virtualisation.waydroid.enable = true;
   programs.virt-manager.enable = true;
   virtualisation.libvirtd = {
@@ -14,5 +13,4 @@
       ];
     };
   };
-  };
 }

nix-os/xdg-default-apps.nix

@@ -1,5 +1,6 @@
+{ ... }:
+
 {
-  config = {
   xdg.mime.enable = true;
   xdg.mime.defaultApplications = {
     # Browser
@@ -133,5 +134,4 @@
     "image/xbm" = "qimgv.desktop";
     "image/xpm" = "qimgv.desktop";
   };
-  };
 }