flake reorg

flake.nix

@@ -1,109 +1,46 @@
 {
   inputs = {
+    nixpkgs.url = "nixpkgs/nixos-23.11";
     flake-utils.url = "github:numtide/flake-utils";
-    naersk.url = "github:nix-community/naersk";
   };
 
   outputs = {
     self,
     nixpkgs,
     flake-utils,
-    naersk,
   }:
     flake-utils.lib.eachDefaultSystem (
       system: let
-        pkgs = nixpkgs.legacyPackages."${system}";
-        naersk-lib = naersk.lib."${system}";
+        overlays = [
+          (import ./overlay.nix)
+        ];
+        pkgs = (import nixpkgs) {
+          inherit system overlays;
+        };
       in rec {
-        # `nix build`
-        packages.tasproxy = naersk-lib.buildPackage {
-          pname = "tasproxy";
-          root = ./.;
+        packages = rec {
+          tasproxy = pkgs.tasproxy;
+          docker = pkgs.callPackage ./docker.nix {};
+          default = tasproxy;
         };
-        defaultPackage = packages.tasproxy;
-        defaultApp = packages.tasproxy;
-
-        # `nix develop`
         devShell = pkgs.mkShell {
-          nativeBuildInputs = with pkgs; [rustc cargo bacon cargo-edit cargo-outdated];
+          nativeBuildInputs = with pkgs; [rustc cargo bacon cargo-edit cargo-outdated clippy];
         };
       }
     )
     // {
-      nixosModule = {
+      overlays.default = import ./overlay.nix;
+      nixosModules.default = {
+        pkgs,
         config,
         lib,
-        pkgs,
         ...
-      }:
-        with lib; let
-          cfg = config.services.tasproxy;
-        in {
-          options.services.tasproxy = {
-            enable = mkEnableOption "Log archiver";
-
-            port = mkOption {
-              type = types.int;
-              default = 3000;
-              description = "port to listen on";
-            };
-
-            mqttCredentailsFile = mkOption {
-              type = types.str;
-              description = "file containg MQTT_HOSTNAME, MQTT_USERNAME and MQTT_PASSWORD variables";
-            };
-
-            enableUnixSocket = mkOption {
-              type = types.bool;
-              default = false;
-              description = "listen to a unix socket instead of TCP";
-            };
-          };
-
-          config = mkIf cfg.enable {
-            systemd.services."tasproxy" = let
-              pkg = self.defaultPackage.${pkgs.system};
-            in {
-              wantedBy = ["multi-user.target"];
-              script = "${pkg}/bin/tasproxy";
-              environment = if cfg.enableUnixSocket then {
-                SOCKET = "/run/tasproxy/tasproxy.sock";
-              } else {
-                PORT = cfg.port;
-              };
-
-              serviceConfig = {
-                EnvironmentFile = cfg.mqttCredentailsFile;
-                Restart = "on-failure";
-                DynamicUser = true;
-                PrivateTmp = true;
-                ProtectSystem = "strict";
-                ProtectHome = true;
-                NoNewPrivileges = true;
-                PrivateDevices = true;
-                ProtectClock = true;
-                CapabilityBoundingSet = true;
-                ProtectKernelLogs = true;
-                ProtectControlGroups = true;
-                SystemCallArchitectures = "native";
-                ProtectKernelModules = true;
-                RestrictNamespaces = true;
-                MemoryDenyWriteExecute = true;
-                ProtectHostname = true;
-                LockPersonality = true;
-                ProtectKernelTunables = true;
-                RestrictAddressFamilies = "AF_INET AF_INET6 AF_UNIX";
-                RestrictRealtime = true;
-                ProtectProc = "noaccess";
-                SystemCallFilter = ["@system-service" "~@resources" "~@privileged"];
-                IPAddressDeny = "multicast";
-                PrivateUsers = true;
-                ProcSubset = "pid";
-                RuntimeDirectory = "tasproxy";
-                RestrictSUIDSGID = true;
-              };
-            };
-          };
+      }: {
+        imports = [./module.nix];
+        config = lib.mkIf config.services.tasproxy.enable {
+          nixpkgs.overlays = [self.overlays.default];
+          services.tasproxy.package = lib.mkDefault pkgs.tasproxy;
         };
+      };
     };
 }