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,11 +9,7 @@ in
       };
     };
 
-    config =
+    config = { pkgs, lib, ... }: {
-      { pkgs
-      , lib
-      , ...
-      }: {
       programs = {
         fish.enable = true;
         neovim.enable = true;

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,11 +22,7 @@ in
       };
     };
 
-    config =
+    config = { pkgs, lib, ... }: {
-      { pkgs
-      , lib
-      , ...
-      }: {
       programs = {
         fish.enable = true;
         neovim.enable = true;

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