about summary refs log tree commit diff stats
path: root/modules
diff options
context:
space:
mode:
authorBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-05-24 14:06:14 +0200
committerBenedikt Peetz <benedikt.peetz@b-peetz.de>2024-05-24 14:06:14 +0200
commit636478286139184ebfa1ffd3610ce0ca482e04fa (patch)
tree45e61147588ca73f0973ab410359f3d7c1f0e3d1 /modules
parentfix(modules/system/home-manager): Import soispha's hm config (diff)
downloadnixos-config-636478286139184ebfa1ffd3610ce0ca482e04fa.tar.gz
nixos-config-636478286139184ebfa1ffd3610ce0ca482e04fa.zip
feat(pkgs): Pull yambar-{cpu,memory} in tree
Diffstat (limited to 'modules')
-rw-r--r--modules/home/conf/yambar/default.nix6
-rw-r--r--modules/system/home-manager/default.nix12
2 files changed, 6 insertions, 12 deletions
diff --git a/modules/home/conf/yambar/default.nix b/modules/home/conf/yambar/default.nix
index 021dfbdd..125030af 100644
--- a/modules/home/conf/yambar/default.nix
+++ b/modules/home/conf/yambar/default.nix
@@ -3,8 +3,6 @@
   sysLib,
   system,
   pkgs,
-  yambar_cpu,
-  yambar_memory,
   ...
 }: let
   makeScript = {
@@ -40,9 +38,9 @@ in {
       name = "sound-volume";
     };
 
-    cpu_script = yambar_cpu.app.${system}.default.program;
+    cpu_script = pkgs.yambar-cpu;
 
-    memory_script = yambar_memory.app.${system}.default.program;
+    memory_script = pkgs.yambar-memory;
 
     disk_script = makeScript {
       dependencies = builtins.attrValues {inherit (pkgs) gawk btrfs-progs coreutils;};
diff --git a/modules/system/home-manager/default.nix b/modules/system/home-manager/default.nix
index 1b973d6c..23ba1a25 100644
--- a/modules/system/home-manager/default.nix
+++ b/modules/system/home-manager/default.nix
@@ -10,8 +10,6 @@
   # TODO: Integrate these <2024-05-22>
   river_init_lesser,
   shell_library,
-  yambar_cpu,
-  yambar_memory,
   # external deps
   user_js,
   # modules
@@ -36,19 +34,17 @@ in {
           nixpkgs_open_prs
           sysLib
           # extra information
-
+          
           system
           # bins
-
-          yambar_cpu
-          yambar_memory
+          
           river_init_lesser
           shell_library
           # external deps
-
+          
           user_js
           # modules
-
+          
           impermanence
           nixVim
           nix-index-database