[feat] Change stuff for mac

common/home.nix

@@ -15,7 +15,6 @@
       picat
       spotdl
       davis
-      music-player
       pandoc
       gnupg
       gpg-tui
@@ -47,7 +46,6 @@
       nil
       pkg-config
       lua-language-server
-      codelldb
       (nerdfonts.override { fonts = [ "Hasklig" ]; })
       pfetch-rs
       mpc-cli
@@ -87,7 +85,7 @@
 
   xdg.enable = true;
   xdg.userDirs = {
-    enable = true;
+    enable = device.isLinux;
     music = "${config.home.homeDirectory}/Nextcloud/Music";
   };
 

common/nvim.nix

@@ -212,12 +212,12 @@
     ];
     extraConfigLua =
       let
-        codelldb = pkgs.codelldb;
+        codelldb = if device.isLinux then pkgs.vscode-extensions.vadimcn.vscode-lldb.adapter else null;
         liblldb =
           if device.isLinux then
             "${codelldb}/lldb/lib/liblldb.so"
-          else if device.isMac then
+          # else if device.isMac then
-            "${codelldb}/lldb/lib/liblldb.dylib"
+          #   "${codelldb}/lldb/lib/liblldb.dylib"
           else null
         ;
       in
@@ -273,7 +273,10 @@
             },
             dap = {
                 autoload_configurations = false,
-                adapter = require'rustaceanvim.config'.get_codelldb_adapter("${codelldb}/bin/codelldb", "${codelldb}/lldb/lib/liblldb.so")
+                ${pkgs.lib.optionalString device.isLinux ''
+                adapter = require'rustaceanvim.config'.get_codelldb_adapter("${codelldb}/bin/codelldb", "${liblldb}")
+                ''
+                }
             },
         }
 

flake.lock

@@ -1331,11 +1331,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1710272261,
+        "lastModified": 1710451336,
-        "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
+        "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
+        "rev": "d691274a972b3165335d261cc4671335f5c67de9",
         "type": "github"
       },
       "original": {

modules/goread.nix

@@ -2,8 +2,15 @@
 
 with lib;
 
-let cfg = config.programs.goread;
+let
-in {
+  cfg = config.programs.goread;
+  # configDir =
+  #   if pkgs.stdenv.isDarwin then
+  #     "${config.home.homeDirectory}Library/Application Support/goread"
+  #   else
+  #     "${config.xdg.configHome}/goread";
+in
+{
   options = {
     programs.goread = {
       enable = mkEnableOption "goread - a terminal RSS/Atom reader";

overlays.nix

@@ -184,5 +184,5 @@ in
   inputs.neovim-nightly-overlay.overlay
   inputs.nixneovim.overlays.default
   inputs.nur.overlay
-  inputs.rustaceanvim.overlays.default
+  # inputs.rustaceanvim.overlays.default
 ]