From d912b2ae4926df9e062c29b9ee7f1d3511b4fadf Mon Sep 17 00:00:00 2001 From: Uttarayan Mondal Date: Mon, 18 Mar 2024 12:15:37 +0530 Subject: [PATCH] [feat] Change stuff for mac --- common/home.nix | 4 +--- common/nvim.nix | 11 +++++++---- flake.lock | 6 +++--- modules/goread.nix | 11 +++++++++-- overlays.nix | 2 +- 5 files changed, 21 insertions(+), 13 deletions(-) diff --git a/common/home.nix b/common/home.nix index a59c6022..37b54a6b 100644 --- a/common/home.nix +++ b/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"; }; diff --git a/common/nvim.nix b/common/nvim.nix index 546b6454..689d531d 100644 --- a/common/nvim.nix +++ b/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 - "${codelldb}/lldb/lib/liblldb.dylib" + # else if device.isMac then + # "${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}") + '' + } }, } diff --git a/flake.lock b/flake.lock index 07a58c16..79dae9f6 100644 --- a/flake.lock +++ b/flake.lock @@ -1331,11 +1331,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1710272261, - "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=", + "lastModified": 1710451336, + "narHash": "sha256-pP86Pcfu3BrAvRO7R64x7hs+GaQrjFes+mEPowCfkxY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2", + "rev": "d691274a972b3165335d261cc4671335f5c67de9", "type": "github" }, "original": { diff --git a/modules/goread.nix b/modules/goread.nix index 0be4173b..1a97ae4f 100644 --- a/modules/goread.nix +++ b/modules/goread.nix @@ -2,8 +2,15 @@ with lib; -let cfg = config.programs.goread; -in { +let + 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"; diff --git a/overlays.nix b/overlays.nix index 03b6de52..3d23b209 100644 --- a/overlays.nix +++ b/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 ]