Systemd fix (#56)

* fix: systemd is not a drv * vbump --------- Co-authored-by: Skarlett <[email protected]>
Skarlett · Mar 20, 2023 · a1e9c37 · a1e9c37
1 parent 0f3660d
commit a1e9c37
Show file tree

Hide file tree

Showing 8 changed files with 127 additions and 197 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "coggiebot"
-version = "1.3.8"
+version = "1.4.1"
 edition = "2021"
 
 [dependencies]
@@ -13,8 +13,7 @@ anyhow = "1.0"
 toml = "0.7"
 serde = "1.0"
 serde_derive = "*"
-confique = "0.2.2"
-
+serde_json = "*"
 songbird = { version = "0.3.0", optional=true, features=["builtin-queue"] }
 
 

diff --git a/flake.nix b/flake.nix
@@ -13,6 +13,7 @@
 
   outputs =
     { self, nixpkgs, flake-utils, naersk, crane }:
+
     rec {
       inherit (flake-utils.lib.eachDefaultSystem (system:
         let
@@ -31,20 +32,22 @@
             mockingbird
           ];
 
+          coggiebot-stable = cogpkgs.mkCoggiebot {
+            features-list = features;
+            # version = "1.4.0";
+          };
+
           config = {
             prefixes = [];
-            dj_room = [ 123456789 ];
             bookmark_emoji = "\u{1F516}";
-            rebuild-time = 1500;
-          };
-
-          coggiebot-stable = cogpkgs.mkCoggiebot {
-            features-list = features;
+            dj_room = [ 123456789 ];
+            features = (cogpkgs.which-features coggiebot-stable);
           };
 
-          vanilla-linux = (pkgs.callPackage ./iac/vanilla-linux/default.nix {
+          vanilla-linux = (pkgs.callPackage ./iac/vanilla-linux/default.nix) {
             inherit installDir;
-          });
+            coggiebot = coggiebot-stable;
+          } ;
 
           # Automatically adds a pre-release if able to
           # beta-features is hard coded with the purpose of
@@ -60,9 +63,10 @@
            else {} //
 
         rec {
+          # packages.systemd = vanilla-linux.systemd;
           packages.default = coggiebot-stable;
           packages.coggiebot-stable = coggiebot-stable;
-          packages.deploy = (vanilla-linux coggiebot-stable);
+          packages.deploy = vanilla-linux.deploy;
         }))) packages;
 
       nixosModules.coggiebot = {pkgs, lib, config, ...}:

diff --git a/iac/coggiebot/default.nix b/iac/coggiebot/default.nix
@@ -42,11 +42,16 @@ let
     # list of strings in the features
     , dependencies ? []
     , commands ? []
+    , config ? {}
   }:
     {
       ${name} = {
+        inherit dependencies
+          pkg-override
+          commands
+          maintainers
+          config;
         featureName = "${name}";
-        inherit dependencies pkg-override commands maintainers;
       };
     };
 
@@ -63,10 +68,10 @@ let
             name = "basic-cmds";
             commands = [
               mkCommand {
-                aliases = [ "help" ];
-                doc = "Displays this help message";
-                examples = [ "help" ];
-            }];
+                aliases = [ "rev" ];
+                doc = "display the current revision";
+                default = "canary build";
+              }];
           }
           {
             name = "pre-release";
@@ -127,7 +132,7 @@ let
                 { aliases = ["stop"];
                   doc = "stops the current song"; }
                 { aliases = ["mute"];
-                  doc = "self mutes the bot (discord action)"; }
+                  doc = "self mutes the bot (discord vc action)"; }
                 { aliases = ["deafen"];
                   doc = "self deafens the bot (discord action)"; }
                 { aliases = ["unmute"];
@@ -182,7 +187,6 @@ let
                 };
               }];
           }
-          # { name = "fake"; dependencies = [ "nonexist" ]; }
         ])
       );
 

diff --git a/iac/coggiebot/meta.nix b/iac/coggiebot/meta.nix
@@ -1,21 +1,19 @@
 { config, lib, pkgs, ... }:
 let
   mkDeveloper = {
-    discord-id
+    discordid
     , github ? null
-    , desc ? "NA"
     , languages ? []
   }:
   {
-    inherit github discord-id desc languages;
+    inherit github discordid languages;
   };
 in
 {
   maintainers = {
     lunarix = (mkDeveloper {
         github = "Skarlett";
-        discord-id = 10293123910391039;
-        desc = "leading shipwreck";
+        discordid = 10293123910391039;
         languages = ["nix" "rust" "python"];
     });
   };