fix nix config for darwin

4 files changed, 7 insertions, 6 deletions

diff --git a/profiles/core/home.nix b/profiles/core/home.nix
index b50e54b..c494339 100644
--- a/profiles/core/home.nix
+++ b/profiles/core/home.nix
@@ -301,7 +301,7 @@
           k             = "kubectl ";
           d             = "docker ";
           ls            = "ls --color=auto";
-          s             = "${if machine.isDarwin then "darwin-rebuild" else "sudo nixos-rebuild"} switch --flake /nix-config#${config.networking.hostName}";
+          s             = "${if machine.isDarwin then "darwin-rebuild" else "sudo nixos-rebuild"} switch --flake ${config.lib.meta.configPath}#${config.networking.hostName}";
           b             = "/run/current-system/bin/switch-to-configuration boot";
           v             = "vi ";
           e             = "vi ";
diff --git a/profiles/core/lf.nix b/profiles/core/lf.nix
index ab7d686..c21a0d7 100644
--- a/profiles/core/lf.nix
+++ b/profiles/core/lf.nix
@@ -1,5 +1,4 @@
 {pkgs,...}: {
-  hm.home.packages = [pkgs.ueberzugpp pkgs.lf pkgs.nsxiv];
   hm.xdg.configFile = {
     # "lf/cleaner".source = config.lib.meta.mkMutableSymlink /mut/lf/cleaner;
     # "lf/scope".source = config.lib.meta.mkMutableSymlink /mut/lf/scope;
diff --git a/profiles/core/meta.nix b/profiles/core/meta.nix
index 0cf0c1c..439b678 100644
--- a/profiles/core/meta.nix
+++ b/profiles/core/meta.nix
@@ -1,6 +1,6 @@
-{inputs,lib,config, ...}: with lib; {
+{machine, inputs,lib,config, ...}: with lib; {
   lib.meta = {
-    configPath = "/nix-config";
+    configPath = if hasAttrByPath ["configPath"] machine then machine.configPath else "/nix-config";
     mkMutableSymlink = path:
       config.hm.lib.file.mkOutOfStoreSymlink
         (config.lib.meta.configPath + removePrefix (toString inputs.self) (toString path));
diff --git a/profiles/core/packages.nix b/profiles/core/packages.nix
index 7793c95..4350680 100644
--- a/profiles/core/packages.nix
+++ b/profiles/core/packages.nix
@@ -32,14 +32,16 @@ with lib;
     # gcc
     gnumake
     file
-    psmisc
+    # psmisc
     bc
-    mediainfo
+    # mediainfo
     bat
     openpomodoro-cli
     coreutils
     killall
   ] ++ (optionals (!machine.isDarwin) [
+    nsxiv
+    ueberzugpp
     man-pages
     man-pages-posix
     # pkgsi686Linux.glibc