feat(nix): remove nix modules, bump version and format nix files

akshettrj · Nov 25, 2024 · c3e75b9 · c3e75b9
1 parent cf79538
commit c3e75b9
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 218 deletions.
diff --git a/flake.nix b/flake.nix
@@ -6,20 +6,29 @@
     flake-utils.url = "github:numtide/flake-utils";
     nix-filter.url = "github:numtide/nix-filter";
     gomod2nix = {
-        url = "github:nix-community/gomod2nix";
-        inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/gomod2nix";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
   };
 
-  outputs = { self, nixpkgs, flake-utils, gomod2nix, nix-filter }:
-    flake-utils.lib.eachDefaultSystem (system:
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+      gomod2nix,
+      nix-filter,
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
       let
         pkgs = import nixpkgs {
-         inherit system;
-         overlays = [ gomod2nix.overlays.default ];
+          inherit system;
+          overlays = [ gomod2nix.overlays.default ];
         };
       in
-      with pkgs; {
+      with pkgs;
+      rec {
 
         devShells.default = mkShell {
           name = "watgbridge-dev";
@@ -34,6 +43,11 @@
           hardeningDisable = [ "fortify" ];
         };
 
+        apps.default = {
+          type = "app";
+          program = "${packages.default}/bin/watgbridge";
+        };
+
         packages = rec {
           watgbridge = (pkgs.callPackage ./nix/pkgs/watgbridge-dev.nix { inherit nix-filter; });
           default = watgbridge;
@@ -43,14 +57,13 @@
           watgbridge = (pkgs.callPackage ./nix/pkgs/watgbridge-dev.nix { inherit nix-filter; });
         };
 
-        nixosModules.default = import ./nix/modules/nixos self;
-        homeManagerModules.default = import ./nix/modules/home-manager self;
-
       }
     );
 
   nixConfig = {
     extra-substituters = [ "https://watgbridge.cachix.org" ];
-    extra-trusted-public-keys = [ "watgbridge.cachix.org-1:KSfgmbSBvXQTpUnoCj21vST7zgwpy3SbNfk0/nesR1Y=" ];
+    extra-trusted-public-keys = [
+      "watgbridge.cachix.org-1:KSfgmbSBvXQTpUnoCj21vST7zgwpy3SbNfk0/nesR1Y="
+    ];
   };
 }
diff --git a/nix/modules/commonOptions.nix b/nix/modules/commonOptions.nix
diff --git a/nix/modules/home-manager/default.nix b/nix/modules/home-manager/default.nix
diff --git a/nix/modules/nixos/default.nix b/nix/modules/nixos/default.nix
diff --git a/nix/pkgs/watgbridge-dev.nix b/nix/pkgs/watgbridge-dev.nix
@@ -1,10 +1,7 @@
-{ lib
-, buildGoApplication
-, enableFfmpeg ? true
-, enableLibWebPTools ? true
-, ffmpeg
-, libwebp
-, nix-filter
+{
+  lib,
+  buildGoApplication,
+  nix-filter,
 }:
 
 let
@@ -28,22 +25,19 @@ let
     ];
   };
 
-in buildGoApplication rec {
+in
+buildGoApplication rec {
   pname = "watgbridge";
-  version = "1.10.1";
+  version = "1.11.0";
 
   pwd = localSrc;
   src = localSrc;
 
-  buildInputs = [
-  ] ++ lib.optionals enableFfmpeg [
-    ffmpeg
-  ] ++ lib.optionals enableLibWebPTools [
-    libwebp
+  ldflags = [
+    "-s"
+    "-w"
   ];
 
-  ldflags = [ "-s" "-w" ];
-
   meta = with lib; rec {
     description = "A bridge between WhatsApp and Telegram written in Golang";
     homepage = "https://github.com/watgbridge/watgbridge";