modules/ly: Don't enable for the nixos_shell

4 files changed, 7 insertions, 5 deletions

diff --git a/hosts/by-name/apzu/configuration.nix b/hosts/by-name/apzu/configuration.nix
index 479d7e50..e238882d 100644
--- a/hosts/by-name/apzu/configuration.nix
+++ b/hosts/by-name/apzu/configuration.nix
@@ -25,6 +25,7 @@
     ];
 
     programs = {
+      ly.batteryName = "BAT0";
       river.init = {
         mappings = {
           layout = "dvorak-modified";
@@ -43,7 +44,6 @@
     services = {
       unison.foreign.address = "tiamat.fritz.box";
       upower.enable = true;
-      ly.batteryName = "BAT0";
     };
 
     nixpkgs = {
diff --git a/modules/by-name/ly/ly/module.nix b/modules/by-name/ly/ly/module.nix
index 6d9a2d0a..376f6e61 100644
--- a/modules/by-name/ly/ly/module.nix
+++ b/modules/by-name/ly/ly/module.nix
@@ -10,13 +10,13 @@
 {
   lib,
   config,
-  libraries,
+  pkgs,
   ...
 }: let
-  cfg = config.soispha.services.ly;
+  cfg = config.soispha.programs.ly;
 in {
-  options.soispha.services.ly = {
-    enable = libraries.base.options.mkEnable "ly";
+  options.soispha.programs.ly = {
+    enable = lib.mkEnableOption "ly";
 
     batteryName = lib.mkOption {
       type = lib.types.nullOr lib.types.str;
diff --git a/modules/common/default.nix b/modules/common/default.nix
index f9831351..ef8d33f7 100644
--- a/modules/common/default.nix
+++ b/modules/common/default.nix
@@ -200,6 +200,7 @@
       imv.enable = true;
       less.enable = true;
       lf.enable = true;
+      ly.enable = lib.mkDefault true;
       gpg.enable = true;
       river = {
         enable = lib.mkDefault true;
diff --git a/modules/common/nixos_shell_configuration.nix b/modules/common/nixos_shell_configuration.nix
index 1bec0145..d37efbb3 100644
--- a/modules/common/nixos_shell_configuration.nix
+++ b/modules/common/nixos_shell_configuration.nix
@@ -32,6 +32,7 @@
 
     programs = {
       river.enable = false;
+      ly.enable = false;
 
       # We don't have access to the age secrets.
       atuin.enableAge = false;