From 35856ec0cc1dd6d87d900eab948e7988d1ea525d Mon Sep 17 00:00:00 2001 From: vancycles-knak Date: Thu, 27 Mar 2025 11:56:35 -0700 Subject: [PATCH] sync --- .config/spacemacs/.spacemacs | 53 +++++++++++++------- nix-darwin/home-modules/programs/codium.nix | 25 +++++++++ nix-darwin/home-modules/programs/default.nix | 1 + nix-darwin/users/henri.vandersleyen/home.nix | 3 ++ nix-darwin/users/henri/configuration.nix | 2 - nix-darwin/users/henri/home.nix | 1 + 6 files changed, 64 insertions(+), 21 deletions(-) create mode 100644 nix-darwin/home-modules/programs/codium.nix diff --git a/.config/spacemacs/.spacemacs b/.config/spacemacs/.spacemacs index 28da9639..b8404ed4 100644 --- a/.config/spacemacs/.spacemacs +++ b/.config/spacemacs/.spacemacs @@ -126,9 +126,23 @@ This function should only modify configuration layer settings." (nix-ts-mode :mode "\\.nix\\'" :config - (setq lsp-nix-nixd-home-manager-options-expr "(builtins.getFlake "/Users/henri.vandersleyen/Documents/dotFiles/nix-darwin").darwinConfigurations."henri-MacBook-Pro".options.home-manager") - (setq lsp-nix-nixd-nixos-options-expr "(builtins.getFlake "/Users/henri.vandersleyen/Documents/dotFiles/nix-darwin").darwinConfigurations."henri-MacBook-Pro".options") - (setq lsp-nix-nixd-nixpkgs-expr "import { }")) ;; declaring linux isn't enough + (let ((system-name (if (eq system-type 'darwin) + "henri-MacBook-Pro" + "desktop")) + (config-type (if (eq system-type 'darwin) + "darwinConfigurations" + "nixosConfigurations"))) + (setq lsp-nix-nixd-home-manager-options-expr + (format "(builtins.getFlake \"%s/Documents/dotFiles/nix-darwin\").%s.\"%s\".options.home-manager" + (getenv "HOME") + config-type + system-name)) + (setq lsp-nix-nixd-nixos-options-expr + (format "(builtins.getFlake \"%s/Documents/dotFiles/nix-darwin\").%s.\"%s\".options" + (getenv "HOME") + config-type + system-name))) + (setq lsp-nix-nixd-nixpkgs-expr "import { }")) (sops :recipe (:type git :host github :repo "djgoku/sops")) catppuccin-theme @@ -689,6 +703,7 @@ before packages are loaded." "\\*vterm.*\\*$" vterm-mode "\\*Messages.*\\*$" )) + ;; --- vue --- ;; --- maggit --- ;; smerge (defhydra hydra/smerge @@ -702,22 +717,22 @@ _p_rev _u_pper _=_: upper/lower _r_esolve ^^ _a_ll _R_efine ^^ _RET_: current _E_diff " - ("n" smerge-next :color blue) - ("p" smerge-prev :color blue) - ("b" smerge-keep-base :color blue) - ("u" smerge-keep-upper :color blue) - ("l" smerge-keep-lower :color blue) - ("a" smerge-keep-all :color blue) - ("RET" smerge-keep-current :color blue) - ("\C-m" smerge-keep-current :color blue) - ("<" smerge-diff-base-upper :color blue) - ("=" smerge-diff-upper-lower :color blue) - (">" smerge-diff-base-lower :color blue) - ("R" smerge-refine :color blue) - ("E" smerge-ediff :color blue) - ("C" smerge-combine-with-next :color blue) - ("r" smerge-resolve :color blue) - ("k" smerge-kill-current :color blue) + ("n" smerge-next :red) + ("p" smerge-prev :red) + ("b" smerge-keep-base) + ("u" smerge-keep-upper) + ("l" smerge-keep-lower) + ("a" smerge-keep-all) + ("RET" smerge-keep-current) + ("\C-m" smerge-keep-current) + ("<" smerge-diff-base-upper) + ("=" smerge-diff-upper-lower) + (">" smerge-diff-base-lower) + ("R" smerge-refine) + ("E" smerge-ediff) + ("C" smerge-combine-with-next) + ("r" smerge-resolve) + ("k" smerge-kill-current) ("q" nil "cancel" :color blue)) (spacemacs/set-leader-keys "ogm" 'hydra/smerge/body) diff --git a/nix-darwin/home-modules/programs/codium.nix b/nix-darwin/home-modules/programs/codium.nix new file mode 100644 index 00000000..e50f0dcd --- /dev/null +++ b/nix-darwin/home-modules/programs/codium.nix @@ -0,0 +1,25 @@ +{ + pkgs, + lib, + config, + ... +}: +{ + options = { + codium.enable = lib.mkOption { + type = lib.types.bool; + description = "Enables the open source vscode"; + default = false; + }; + }; + + # common issue on MacOs when getting ="Creating pipe" "too many open files"= + # https://gist.github.com/tombigel/d503800a282fcadbee14b537735d202c + config = lib.mkIf config.codium.enable { + home = { + packages = with pkgs; [ + vscodium + ]; + }; + }; +} diff --git a/nix-darwin/home-modules/programs/default.nix b/nix-darwin/home-modules/programs/default.nix index 34f2cdb3..b96dcb75 100644 --- a/nix-darwin/home-modules/programs/default.nix +++ b/nix-darwin/home-modules/programs/default.nix @@ -7,6 +7,7 @@ ./brave.nix ./btop.nix ./cloud.nix + ./codium.nix ./cowsay.nix ./devops.nix ./discord.nix diff --git a/nix-darwin/users/henri.vandersleyen/home.nix b/nix-darwin/users/henri.vandersleyen/home.nix index 3586f4ef..0dc6f32d 100644 --- a/nix-darwin/users/henri.vandersleyen/home.nix +++ b/nix-darwin/users/henri.vandersleyen/home.nix @@ -20,6 +20,7 @@ ../../home-modules/programs/fzf.nix # ../../home-modules/programs/ghostty.nix # INFO:broken ../../home-modules/programs/btop.nix + ../../home-modules/programs/codium.nix ../../home-modules/programs/fish.nix ../../home-modules/programs/zsh.nix ../../home-modules/programs/nushell.nix @@ -56,11 +57,13 @@ enable = false; configPath = Users/${username}/Documents/dotfiles/.config/aerospace; }; + # languages python.lsp.enable = true; jsts.lsp.enable = true; # programs + codium.enable = true; arc-browser.enable = true; fish.enable = true; zsh.enable = true; diff --git a/nix-darwin/users/henri/configuration.nix b/nix-darwin/users/henri/configuration.nix index 235a3963..9b029c8d 100644 --- a/nix-darwin/users/henri/configuration.nix +++ b/nix-darwin/users/henri/configuration.nix @@ -2,9 +2,7 @@ pkgs, inputs, username, - hostname, hosts, - system, ... }: { diff --git a/nix-darwin/users/henri/home.nix b/nix-darwin/users/henri/home.nix index a1920483..88760487 100644 --- a/nix-darwin/users/henri/home.nix +++ b/nix-darwin/users/henri/home.nix @@ -55,6 +55,7 @@ }; # ssh.authorizedSshKeys = /home/henri/.ssh/endeavourGit; # TODO: move to nix-modules # languages + codium.enable = true; go.lsp.enable = true; python.lsp.enable = true; jsts = {