refactor: fit structure of main directories

README.md

@@ -1,15 +1,15 @@
 # My NixOS configs
 
 TODO: add directory structure info and enforce it
-    - every root folder in the repo represents a flake output except inputs
+    - [x] every root folder in the repo represents a flake output except inputs
-    - every root folder only has a `default.nix` and subfolders for each
+    - [] every root folder only has an optional `default.nix` and subfolders for each
-      of its attrs
+         of its attrs
-    - in a subfolder, there should always be a `default.nix`
+    - [] in a subfolder, there should always be a `default.nix`
-    - if there is non nix code, it will be in a `config` folder
+    - [] if there is non nix code, it will be in a `config` folder
-    - redo docs
+    - [] redo docs
-    - every module should not do anything if imported
+    - [] every module should not do anything if imported
-    - all nix files that represent a module should be `default.nix` (a nix file
+    - [] all nix files that represent a module should be `default.nix` (a nix file
-      which is imported directly can be called anything alongside `default.nix`)
+         which is imported directly can be called anything alongside `default.nix`)
 
 ## AGS
 

apps/buildApp.nix

@@ -22,7 +22,7 @@ in
 
     prePatch = ''
       mv ./tsconfig.json ./project.json
-      sed 's/^ *\/\/.*//' ${../config/tsconfig.json} > ./base.json
+      sed 's/^ *\/\/.*//' ${./config/tsconfig.json} > ./base.json
       ${jq}/bin/jq -sr '.[0] * .[1] | del(.extends)' ./project.json ./base.json > ./tsconfig.json
       rm base.json project.json
     '';

apps/default.nix

@@ -5,7 +5,7 @@
 }: let
   inherit (pkgs.lib) getExe listToAttrs nameValuePair;
 
-  buildApp = attrs: (pkgs.callPackage ./nix/buildApp.nix ({} // inputs // attrs));
+  buildApp = attrs: (pkgs.callPackage ./buildApp.nix ({} // inputs // attrs));
 
   mkApp = file: {
     program = getExe (pkgs.callPackage file ({inherit buildApp;} // inputs));

configurations/homie/modules/music/default.nix

@@ -32,7 +32,7 @@
       after = ["spotifyd.service"];
       path = builtins.attrValues {
         inherit (pkgs) bluez;
-        inherit (config.hardware.pulseaudio) package;
+        inherit (config.services.pulseaudio) package;
       };
       script = ''
         if [[ "$(pactl get-default-sink)" == "auto_null" ]]; then

devShells/default.nix

@@ -5,7 +5,7 @@
 }: let
   inherit (builtins) attrValues;
 
-  langsShells = import ./langs.nix {inherit pkgs self;};
+  neovimShells = import ./neovim-shells {inherit pkgs self;};
 
   bumpNpmDeps = pkgs.writeShellApplication {
     name = "bumpNpmDeps";
@@ -24,91 +24,13 @@
   };
 in
   {
-    default = pkgs.mkShell {
+    flake = pkgs.callPackage ./flake {};
-      packages = [
+    default = self.devShells.${pkgs.system}.flake;
-        (pkgs.writeShellApplication {
-          name = "mkIso";
 
-          runtimeInputs = attrValues {
+    netdaemon = pkgs.callPackage ./netdaemon {};
-            inherit
-              (pkgs)
-              nix-output-monitor
-              ;
-          };
 
-          text = ''
+    node = pkgs.callPackage ./node {inherit bumpNpmDeps;};
-            isoConfig="nixosConfigurations.live-image.config.system.build.isoImage"
-            nom build "$FLAKE#$isoConfig"
-          '';
-        })
 
-        (pkgs.writeShellApplication {
+    subtitles-dev = pkgs.callPackage ./subtitle-dev {inherit bumpNpmDeps;};
-          name = "fixUidChange";
-
-          runtimeInputs = attrValues {
-            inherit
-              (pkgs)
-              findutils
-              gnused
-              ;
-          };
-
-          text = ''
-            GROUP="$1"
-            OLD_GID="$2"
-            NEW_GID="$3"
-
-            # Remove generated group entry
-            sudo sed -i -e "/^$GROUP:/d" /etc/group
-
-            # Change GID on existing files
-            sudo find / -gid "$OLD_GID" -exec chgrp "$NEW_GID" {} +
-          '';
-        })
-      ];
-    };
-
-    netdaemon = pkgs.mkShell {
-      packages = attrValues {
-        inherit
-          (pkgs.dotnetCorePackages)
-          sdk_9_0
-          ;
-      };
-    };
-
-    node = pkgs.mkShell {
-      packages = attrValues {
-        inherit
-          (pkgs)
-          nodejs_latest
-          typescript
-          ;
-
-        inherit
-          bumpNpmDeps
-          ;
-      };
-    };
-
-    subtitles-dev = pkgs.mkShell {
-      packages = attrValues {
-        inherit
-          (pkgs)
-          nodejs_latest
-          typescript
-          ffmpeg-full
-          ;
-
-        inherit
-          (pkgs.nodePackages)
-          ts-node
-          ;
-
-        inherit
-          bumpNpmDeps
-          ;
-      };
-    };
   }
-  // langsShells
+  // neovimShells

devShells/flake/default.nix

@@ -0,0 +1,46 @@
+{
+  mkShell,
+  writeShellApplication,
+  # deps
+  findutils,
+  gnused,
+  nix-output-monitor,
+  ...
+}:
+mkShell {
+  packages = [
+    (writeShellApplication {
+      name = "mkIso";
+
+      runtimeInputs = [
+        nix-output-monitor
+      ];
+
+      text = ''
+        isoConfig="nixosConfigurations.live-image.config.system.build.isoImage"
+        nom build "$FLAKE#$isoConfig"
+      '';
+    })
+
+    (writeShellApplication {
+      name = "fixUidChange";
+
+      runtimeInputs = [
+        findutils
+        gnused
+      ];
+
+      text = ''
+        GROUP="$1"
+        OLD_GID="$2"
+        NEW_GID="$3"
+
+        # Remove generated group entry
+        sudo sed -i -e "/^$GROUP:/d" /etc/group
+
+        # Change GID on existing files
+        sudo find / -gid "$OLD_GID" -exec chgrp "$NEW_GID" {} +
+      '';
+    })
+  ];
+}

devShells/neovim-shells/default.nix

@@ -6,7 +6,7 @@
   inherit (pkgs.lib) listToAttrs nameValuePair;
   mkLangsShells = langs:
     listToAttrs (map (l:
-      nameValuePair l (pkgs.callPackage ../homeManagerModules/neovim/langs/${l}/shell.nix {inherit self;}))
+      nameValuePair l (pkgs.callPackage "${self}/homeManagerModules/neovim/langs/${l}/shell.nix" {inherit self;}))
     langs);
 in
   mkLangsShells [

devShells/netdaemon/default.nix

@@ -0,0 +1,10 @@
+{
+  mkShell,
+  dotnetCorePackages,
+  ...
+}:
+mkShell {
+  packages = [
+    dotnetCorePackages.sdk_9_0
+  ];
+}

devShells/node/default.nix

@@ -0,0 +1,14 @@
+{
+  mkShell,
+  bumpNpmDeps,
+  nodejs_latest,
+  typescript,
+  ...
+}:
+mkShell {
+  packages = [
+    bumpNpmDeps
+    nodejs_latest
+    typescript
+  ];
+}

devShells/subtitle-dev/default.nix

@@ -0,0 +1,19 @@
+{
+  mkShell,
+  bumpNpmDeps,
+  ffmpeg-full,
+  nodejs_latest,
+  nodePackages,
+  typescript,
+  ...
+}:
+mkShell {
+  packages = [
+    nodejs_latest
+    typescript
+    ffmpeg-full
+    nodePackages.ts-node
+
+    bumpNpmDeps
+  ];
+}

outputs.nix

@@ -137,7 +137,7 @@
 
     appsPackages =
       perSystem (pkgs:
-        import ./apps/nix/packages.nix {inherit pkgs self;});
+        import ./apps/packages.nix {inherit pkgs self;});
 
     devShells =
       perSystem (pkgs: