Skip to content

sync #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Vanderscycle merged 2 commits into from
Mar 27, 2025
Merged

sync #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35856ec
sync
vancycles-knak Mar 27, 2025
f4eb8c0
Merge branch 'Vanderscycle:main' into main
vancycles-knak Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 34 additions & 19 deletions .config/spacemacs/.spacemacs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <nixpkgs> { }")) ;; 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 <nixpkgs> { }"))
(sops
:recipe (:type git :host github :repo "djgoku/sops"))
catppuccin-theme
Expand Down Expand Up @@ -689,6 +703,7 @@ before packages are loaded."
"\\*vterm.*\\*$" vterm-mode
"\\*Messages.*\\*$"
))
;; --- vue ---
;; --- maggit ---
;; smerge
(defhydra hydra/smerge
Expand All @@ -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)
Expand Down
25 changes: 25 additions & 0 deletions nix-darwin/home-modules/programs/codium.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
];
};
};
}
1 change: 1 addition & 0 deletions nix-darwin/home-modules/programs/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
./brave.nix
./btop.nix
./cloud.nix
./codium.nix
./cowsay.nix
./devops.nix
./discord.nix
Expand Down
3 changes: 3 additions & 0 deletions nix-darwin/users/henri.vandersleyen/home.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions nix-darwin/users/henri/configuration.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
pkgs,
inputs,
username,
hostname,
hosts,
system,
...
}:
{
Expand Down
1 change: 1 addition & 0 deletions nix-darwin/users/henri/home.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down