Skip to content

fixed a few bugs #22

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 1 commit into from
Sep 8, 2025
Merged

fixed a few bugs #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
84 changes: 42 additions & 42 deletions nix-darwin/flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 13 additions & 4 deletions nix-darwin/flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,24 @@
{
darwinConfigurations = {
#nix run nix-darwin -- switch --flake ./nix-darwin
#nh darwin switch
Henris-MacBook-Pro = darwin.lib.darwinSystem {
system = "aarch64-darwin";
specialArgs = {
inherit inputs;
meta = darwinMeta;
};
modules = [
{
nixpkgs = {
config = {
allowUnfree = true;
permittedInsecurePackages = [
"arc-browser-1.109.0-67185"
];
};
};
}
./users/henri.vandersleyen/configuration.nix
home-manager.darwinModules.home-manager
{
Expand Down Expand Up @@ -116,8 +127,7 @@
specialArgs = {
inherit inputs;
meta = linuxMeta;
}
// inputs;
} // inputs;
modules = [
{
nixpkgs = {
Expand Down Expand Up @@ -157,8 +167,7 @@
specialArgs = {
inherit inputs;
meta = mediaMeta;
}
// inputs;
} // inputs;
modules = [
./users/medialab/configuration.nix
home-manager.nixosModules.home-manager
Expand Down
9 changes: 7 additions & 2 deletions nix-darwin/home-modules/programs/spotify.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
description = "Enables paid music";
default = true;
};
program.spicetify.enable = lib.mkOption {
type = lib.types.bool;
description = "pretty";
default = true;
};
};

imports = [ inputs.spicetify-nix.homeManagerModules.default ];
Expand All @@ -23,9 +28,9 @@
];
programs.spicetify =
let
spicetifyPkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};
spicetifyPkgs = inputs.spicetify-nix.homeManager.${pkgs.system};
in
{
lib.mkIf config.program.spicetify.enable {
theme = spicetifyPkgs.themes.catppuccin;
colorScheme = "mocha";
enable = true;
Expand Down
3 changes: 2 additions & 1 deletion nix-darwin/users/henri.vandersleyen/configuration.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
};
home-manager.backupFileExtension = "backup";
fonts.packages = with pkgs; [
jetbrains-mono
# jetbrains-mono
];

environment = {
Expand All @@ -70,6 +70,7 @@
"rectangle"
"iterm2"
"postman"
"arc"
# "nikitabobko/tap/aerospace" # not vetted on work laptop
];
brews = [
Expand Down
5 changes: 3 additions & 2 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 @@ -60,13 +60,14 @@

# languages
languages = {
python.lsp.enable = true;
python.lsp.enable = false;
jsts.lsp.enable = true;
};

# programs
program = {
arc-browser.enable = true;
spicetify.enable = false;
arc-browser.enable = false; # INFO unmaintained
codium.enable = false;
fish.enable = true;
zsh.enable = true;
Expand Down