templates/nixos: simplify

3 files changed, 3 insertions, 65 deletions

diff --git a/templates/nixos/flake.nix b/templates/nixos/flake.nix
index 54a19bf..7c3e15d 100644
--- a/templates/nixos/flake.nix
+++ b/templates/nixos/flake.nix
@@ -9,17 +9,11 @@
     };
   };
 
-  outputs = {
-    nixpkgs,
-    self,
-    ...
-  } @ inputs: {
+  outputs = {nixpkgs, ...} @ inputs: {
     nixosConfigurations."myHostname" = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
-      modules = [./configuration.nix self.nixosModules.default];
-      specialArgs = {inherit inputs;} // inputs;
+      modules = [./configuration.nix];
+      specialArgs = {inherit inputs;};
     };
-
-    nixosModules.default = import ./modules;
   };
 }
diff --git a/templates/nixos/modules/basic.nix b/templates/nixos/modules/basic.nix
deleted file mode 100644
index fb67701..0000000
--- a/templates/nixos/modules/basic.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  config,
-  lib,
-  inputs,
-  ...
-}: let
-  inherit (builtins) attrNames map;
-  inherit (lib) filterAttrs mapAttrs mkDefault mkEnableOption mkIf mkOption optionals types;
-  cfg = config.getchoo.basicConfig;
-
-  mapInputs = fn: map fn (attrNames inputs);
-in {
-  options.getchoo.basicConfig = {
-    enable = mkEnableOption "getchoo's basic config" // {default = true;};
-    channelPath = {
-      enable =
-        mkEnableOption "enable channel path management"
-        // {default = true;};
-      dirname = mkOption {
-        type = types.str;
-        default = "/etc/nix/channels";
-        description = "directory where channels are saved";
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    nix =
-      {
-        gc = {
-          automatic = mkDefault true;
-          options = mkDefault "-d --delete-older-than 2d";
-        };
-
-        registry =
-          {n.flake = inputs.nixpkgs;}
-          // (mapAttrs (_: flake: {inherit flake;})
-            (filterAttrs (n: _: n != "nixpkgs") inputs));
-
-        settings = {
-          auto-optimise-store = true;
-          experimental-features = ["nix-command" "flakes" "auto-allocate-uids" "repl-flake"];
-        };
-      }
-      // mkIf cfg.channelPath.enable {
-        nixPath = mapInputs (i: "${i}=${cfg.channelPath.dirname}/${i}");
-      };
-
-    systemd.tmpfiles.rules = optionals cfg.channelPath.enable (mapInputs (i: "L+ ${cfg.channelPath.dirname}/${i}     - - - - ${inputs.${i}.outPath}"));
-  };
-}
diff --git a/templates/nixos/modules/default.nix b/templates/nixos/modules/default.nix
deleted file mode 100644
index ae107c1..0000000
--- a/templates/nixos/modules/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-_: {
-  imports = [
-    ./basic.nix
-  ];
-}