Move modules folders

flake.nix

@@ -99,20 +99,20 @@
 
         # Nix rice
         inputs.nix-rice.modules.default
-        ./modules/nixos/rice.nix
+        ./nixos/rice.nix
 
         # # S3 cache read
-        # ./modules/nixos/s3_cache_read.nix
+        # ./nixos/s3_cache_read.nix
 
         # Agenix configuration
         inputs.ragenix.nixosModules.default
         # inputs.agenix.nixosModules.default
 
         # { services.userborn.enable = true; }
-        ./modules/nixos/users/bertof.nix
+        ./nixos/users/bertof.nix
 
         # Some basic defaults
-        ./modules/nixos/basics
+        ./nixos/basics
 
         {
           age.secrets = {
@@ -121,7 +121,7 @@
         }
       ];
 
-      installerModules = commonModules ++ [ ./modules/nixos/installer.nix ];
+      installerModules = commonModules ++ [ ./nixos/installer.nix ];
     in
     inputs.flake-parts.lib.mkFlake { inherit inputs; } {
       systems = import inputs.systems;
@@ -254,20 +254,20 @@
               ./instances/thor/configuration.nix
 
               # # S3 cache write
-              # ./modules/nixos/s3_cache_write.nix
+              # ./nixos/s3_cache_write.nix
 
-              ./modules/nixos/plasma6.nix
-              # ./modules/nixos/cuda_support.nix
-              # ./modules/nixos/ollama.nix
-              ./modules/nixos/pro_audio.nix
-              ./modules/nixos/kdeconnect.nix
-              ./modules/nixos/steam.nix
-              # ./modules/nixos/minio_local.nix
+              ./nixos/plasma6.nix
+              # ./nixos/cuda_support.nix
+              # ./nixos/ollama.nix
+              ./nixos/pro_audio.nix
+              ./nixos/kdeconnect.nix
+              ./nixos/steam.nix
+              # ./nixos/minio_local.nix
 
-              ./modules/nixos/hyprland.nix
-              { home-manager.users.bertof.imports = [ ./hm/modules/hyprland.nix ]; }
+              ./nixos/hyprland.nix
+              { home-manager.users.bertof.imports = [ ./hm/hyprland.nix ]; }
 
-              ./modules/nixos/musa.nix
+              ./nixos/musa.nix
             ] ++ homeManagerUModules ++ [{
               age.secrets = {
                 minio_bertof = { file = ./secrets/minio_bertof.age; owner = "bertof"; };
@@ -286,20 +286,20 @@
               ./instances/sif/configuration.nix
 
               # S3 cache write
-              # ./modules/nixos/s3_cache_write.nix
+              # ./nixos/s3_cache_write.nix
               # { age.secrets.s3_sif = { file = ./secrets/s3_sif.age; owner = "bertof"; }; }
 
-              # ./modules/nixos/plasma6.nix
-              # ./modules/nixos/ollama.nix
-              ./modules/nixos/pro_audio.nix
-              ./modules/nixos/kdeconnect.nix
-              ./modules/nixos/steam.nix
-              # ./modules/nixos/minio_local.nix
+              # ./nixos/plasma6.nix
+              # ./nixos/ollama.nix
+              ./nixos/pro_audio.nix
+              ./nixos/kdeconnect.nix
+              ./nixos/steam.nix
+              # ./nixos/minio_local.nix
 
-              ./modules/nixos/hyprland.nix
-              { home-manager.users.bertof.imports = [ ./hm/modules/hyprland.nix ]; }
+              ./nixos/hyprland.nix
+              { home-manager.users.bertof.imports = [ ./hm/hyprland.nix ]; }
 
-              ./modules/nixos/musa.nix
+              ./nixos/musa.nix
             ] ++ homeManagerUModules ++ [{
               age.secrets = {
                 minio_bertof = { file = ./secrets/minio_bertof.age; owner = "bertof"; };
@@ -317,12 +317,12 @@
               ./instances/odin/hardware-configuration.nix
               ./instances/odin/configuration.nix
 
-              ./modules/nixos/users/tiziano.nix
+              ./nixos/users/tiziano.nix
 
-              ./modules/nixos/server
-              ./modules/nixos/ip_forwarding.nix
-              # ./modules/nixos/plasma6.nix
-              ./modules/nixos/steam.nix
+              ./nixos/server
+              ./nixos/ip_forwarding.nix
+              # ./nixos/plasma6.nix
+              ./nixos/steam.nix
             ] ++ homeManagerUModules ++ [{
               home-manager.users.bertof = import ./instances/odin/hm.nix;
               home-manager.users.tiziano = import ./instances/odin/hm_tiziano.nix;
@@ -339,24 +339,24 @@
               inputs.nixos-hardware.nixosModules.common-cpu-amd
               inputs.nixos-hardware.nixosModules.common-gpu-amd
               inputs.nixos-hardware.nixosModules.common-pc-ssd
-              ./modules/nixos/server
+              ./nixos/server
 
               ./instances/heimdall/hardware-configuration.nix
               ./instances/heimdall/configuration.nix
 
-              ./modules/nixos/users/tiziano.nix
+              ./nixos/users/tiziano.nix
 
-              ./modules/nixos/ip_forwarding.nix
-              ./modules/nixos/torrentbox.nix
-              ./modules/nixos/minio_server.nix
-              ./modules/nixos/nextcloud.nix
-              ./modules/nixos/immich.nix
+              ./nixos/ip_forwarding.nix
+              ./nixos/torrentbox.nix
+              ./nixos/minio_server.nix
+              ./nixos/nextcloud.nix
+              ./nixos/immich.nix
               inputs.cute-api.nixosModules.default
               { services.cute-api = { enable = true; host = "0.0.0.0"; }; }
-              # ./modules/nixos/garage.nix
-              # ./modules/nixos/ntfy.nix
+              # ./nixos/garage.nix
+              # ./nixos/ntfy.nix
               # S3 cache read
-              # ./modules/nixos/s3_cache_read.nix
+              # ./nixos/s3_cache_read.nix
             ] ++ homeManagerUModules ++ [{
               age.secrets = {
                 minio_bertof = { file = ./secrets/minio_bertof.age; owner = "bertof"; };
@@ -383,17 +383,17 @@
                   "cifs"
                 ];
               })
-              ./modules/nixos/server
+              ./nixos/server
 
               ./instances/freya/hardware-configuration.nix
               ./instances/freya/configuration.nix
 
-              ./modules/nixos/torrentbox.nix
-              ./modules/nixos/minio_server.nix
-              # ./modules/nixos/nextcloud.nix
-              ./modules/nixos/ntfy.nix
+              ./nixos/torrentbox.nix
+              ./nixos/minio_server.nix
+              # ./nixos/nextcloud.nix
+              ./nixos/ntfy.nix
               # S3 cache read
-              # ./modules/nixos/s3_cache_read.nix
+              # ./nixos/s3_cache_read.nix
             ] ++ homeManagerModules ++ [{
               home-manager.users.bertof = import ./instances/freya/hm.nix;
             }];
@@ -402,14 +402,14 @@
           baldur = inputs.nixpkgs-u.lib.nixosSystem {
             system = "x86_64-linux";
             modules = commonModules ++ [
-              ./modules/nixos/server
+              ./nixos/server
               ./instances/baldur/hardware-configuration.nix
               ./instances/baldur/configuration.nix
-              # ./modules/nixos/digitalocean.nix
+              # ./nixos/digitalocean.nix
 
-              # ./modules/nixos/users/tiziano.nix
+              # ./nixos/users/tiziano.nix
               # S3 cache read
-              # ./modules/nixos/s3_cache_read.nix
+              # ./nixos/s3_cache_read.nix
             ] ++ homeManagerUModules ++ [{
               home-manager.users.bertof = import ./instances/baldur/hm.nix;
               #   home-manager.users.tiziano = import ./instances/baldur/hm_tiziano.nix;
@@ -419,16 +419,16 @@
           loki = inputs.nixpkgs.lib.nixosSystem {
             system = "x86_64-linux";
             modules = commonModules ++ [
-              ./modules/nixos/server
+              ./nixos/server
 
               inputs.nixos-hardware.nixosModules.common-cpu-intel
               inputs.nixos-hardware.nixosModules.common-pc-ssd
               ./instances/loki/hardware-configuration.nix
               ./instances/loki/configuration.nix
 
-              ./modules/nixos/users/tiziano.nix
+              ./nixos/users/tiziano.nix
               # S3 cache read
-              # ./modules/nixos/s3_cache_read.nix
+              # ./nixos/s3_cache_read.nix
             ] ++ homeManagerModules ++ [{
               home-manager.users.bertof = import ./instances/odin/hm.nix;
               home-manager.users.tiziano = import ./instances/odin/hm_tiziano.nix;

hm/hyprland.nix

@@ -79,8 +79,8 @@ in
     hyprpaper = {
       enable = true;
       settings = {
-        preload = "${../../wallpapers/n8ca4obsys991.png}";
-        wallpaper = [ ",${../../wallpapers/n8ca4obsys991.png}" ];
+        preload = "${../wallpapers/n8ca4obsys991.png}";
+        wallpaper = [ ",${../wallpapers/n8ca4obsys991.png}" ];
       };
     };
   };