nix: Simplify

containers/rar.nix

@@ -1,7 +1,4 @@
-let
+let VARIABLES = import ../src/variables.nix; in {
-  VARIABLES = import ../src/variables.nix;
-in
-{
   containers.rar = {
     privateNetwork = true;
 
@@ -12,51 +9,47 @@ in
       };
     };
 
-    config =
+    config = { pkgs, lib, ... }: {
-      { pkgs
+      programs = {
-      , lib
+        fish.enable = true;
-      , ...
+        neovim.enable = true;
-      }: {
+        starship.enable = true;
-        programs = {
+      };
-          fish.enable = true;
+
-          neovim.enable = true;
+      users = {
-          starship.enable = true;
+        defaultUserShell = pkgs.fish;
+        mutableUsers = false;
+        allowNoPasswordLogin = true;
+
+        users.user = {
+          isNormalUser = true;
+          home = "/home/user";
+        };
+      };
+
+      environment = {
+        shells = with pkgs; [ fish ];
+
+        variables = {
+          TERM = "xterm-kitty";
         };
 
-        users = {
+        defaultPackages = [ ];
-          defaultUserShell = pkgs.fish;
+      };
-          mutableUsers = false;
-          allowNoPasswordLogin = true;
 
-          users.user = {
+      environment.systemPackages = with pkgs; [
-            isNormalUser = true;
+        kitty
-            home = "/home/user";
+        rar
-          };
+        unrar
-        };
+      ];
 
-        environment = {
+      nixpkgs.config.allowUnfreePredicate = pkg:
-          shells = with pkgs; [ fish ];
+        builtins.elem (lib.getName pkg) [
-
+          "rar"
-          variables = {
+          "unrar"
-            TERM = "xterm-kitty";
-          };
-
-          defaultPackages = [ ];
-        };
-
-        environment.systemPackages = with pkgs; [
-          kitty
-          rar
-          unrar
         ];
 
-        nixpkgs.config.allowUnfreePredicate = pkg:
+      system.stateVersion = VARIABLES.stateVersion;
-          builtins.elem (lib.getName pkg) [
+    };
-            "rar"
-            "unrar"
-          ];
-
-        system.stateVersion = VARIABLES.stateVersion;
-      };
   };
 }

containers/wine.nix

@@ -1,9 +1,6 @@
 { config, ... }:
-let
+
-  VARIABLES = import ../src/variables.nix;
+let VARIABLES = import ../src/variables.nix; hostCfg = config; in {
-  hostCfg = config;
-in
-{
   containers.wine = {
     privateNetwork = true;
 
@@ -25,64 +22,60 @@ in
       };
     };
 
-    config =
+    config = { pkgs, lib, ... }: {
-      { pkgs
+      programs = {
-      , lib
+        fish.enable = true;
-      , ...
+        neovim.enable = true;
-      }: {
+        starship.enable = true;
-        programs = {
-          fish.enable = true;
-          neovim.enable = true;
-          starship.enable = true;
-        };
-
-        users = {
-          defaultUserShell = pkgs.fish;
-          mutableUsers = false;
-          allowNoPasswordLogin = true;
-
-          users.user = {
-            isNormalUser = true;
-            home = "/home/user";
-          };
-        };
-
-        environment = {
-          shells = with pkgs; [ fish ];
-
-          variables = {
-            TERM = "xterm-kitty";
-          };
-
-          defaultPackages = [ ];
-        };
-
-        environment.systemPackages = with pkgs; [
-          kitty
-          wine-staging
-          winetricks
-        ];
-
-        environment.sessionVariables = {
-          WAYLAND_DISPLAY = "wayland-1";
-          QT_QPA_PLATFORM = "wayland";
-          QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
-          SDL_VIDEODRIVER = "wayland";
-          CLUTTER_BACKEND = "wayland";
-          MOZ_ENABLE_WAYLAND = "1";
-          XDG_RUNTIME_DIR = "/run/user/1000";
-          DISPLAY = ":0";
-        };
-
-        services.xserver.enable = true;
-
-        hardware.opengl = {
-          enable = true;
-          extraPackages = hostCfg.hardware.opengl.extraPackages;
-          driSupport32Bit = true;
-        };
-
-        system.stateVersion = VARIABLES.stateVersion;
       };
+
+      users = {
+        defaultUserShell = pkgs.fish;
+        mutableUsers = false;
+        allowNoPasswordLogin = true;
+
+        users.user = {
+          isNormalUser = true;
+          home = "/home/user";
+        };
+      };
+
+      environment = {
+        shells = with pkgs; [ fish ];
+
+        variables = {
+          TERM = "xterm-kitty";
+        };
+
+        defaultPackages = [ ];
+      };
+
+      environment.systemPackages = with pkgs; [
+        kitty
+        wine-staging
+        winetricks
+      ];
+
+      environment.sessionVariables = {
+        WAYLAND_DISPLAY = "wayland-1";
+        QT_QPA_PLATFORM = "wayland";
+        QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
+        SDL_VIDEODRIVER = "wayland";
+        CLUTTER_BACKEND = "wayland";
+        MOZ_ENABLE_WAYLAND = "1";
+        XDG_RUNTIME_DIR = "/run/user/1000";
+        DISPLAY = ":0";
+      };
+
+      services.xserver.enable = true;
+
+      hardware.opengl = {
+        enable = true;
+        extraPackages = hostCfg.hardware.opengl.extraPackages;
+        driSupport32Bit = true;
+      };
+
+      system.stateVersion = VARIABLES.stateVersion;
+    };
   };
 }

modules/fish-starship/default.nix

@@ -1,8 +1,6 @@
 { pkgs, ... }:
-let
+
-  VARIABLES = import ../../src/variables.nix;
+let VARIABLES = import ../../src/variables.nix; in {
-in
-{
   users.defaultUserShell = pkgs.fish;
   environment.shells = [ pkgs.fish ];
 

modules/git/default.nix

@@ -1,8 +1,6 @@
 { pkgs, ... }:
-let
+
-  VARIABLES = import ../../src/variables.nix;
+let VARIABLES = import ../../src/variables.nix; in {
-in
-{
   environment.systemPackages = with pkgs; [ tig git ];
 
   home-manager.sharedModules = [

modules/hyprland/default.nix

@@ -1,8 +1,6 @@
 { pkgs, ... }:
-let
+
-  VARIABLES = import ../../src/variables.nix;
+let VARIABLES = import ../../src/variables.nix; in {
-in
-{
   programs.hyprland.enable = true;
   services.udisks2 = {
     enable = true;

modules/kitty/default.nix

@@ -1,7 +1,4 @@
-let
+let VARIABLES = import ../../src/variables.nix; in {
-  VARIABLES = import ../../src/variables.nix;
-in
-{
   home-manager.sharedModules = [
     {
       programs.kitty = {

modules/mime-apps/default.nix

@@ -1,7 +1,4 @@
-let
+let VARIABLES = import ../../src/variables.nix; in {
-  VARIABLES = import ../../src/variables.nix;
-in
-{
   home-manager.sharedModules = [
     {
       xdg.mimeApps = {

modules/ncmpcpp/default.nix

@@ -1,8 +1,6 @@
 { pkgs, ... }:
-let
+
-  VARIABLES = import ../../src/variables.nix;
+let VARIABLES = import ../../src/variables.nix; in {
-in
-{
   home-manager.sharedModules = [
     {
       services.mpd = {

modules/xdg-user-dirs/default.nix

@@ -1,7 +1,4 @@
-let
+let VARIABLES = import ../../src/variables.nix; in {
-  VARIABLES = import ../../src/variables.nix;
-in
-{
   home-manager.sharedModules = [
     {
       xdg.userDirs = {

packages/go-thumbnailer/default.nix

@@ -3,8 +3,8 @@
 , fetchFromGitHub
 , pkg-config
 , vips
-,
 }:
+
 buildGoModule rec {
   pname = "go-thumbnailer";
   version = "0.1.0";

src/main.nix

@@ -7,10 +7,8 @@
 , nixpkgs-srb2
 , ...
 }:
-let
+
-  VARIABLES = import ./variables.nix;
+let VARIABLES = import ./variables.nix; in {
-in
-{
   imports = [
     "${VARIABLES.hostHardwareConfiguration}"
     ../overlays