Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions nix-darwin/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
Henris-MacBook-Pro = darwin.lib.darwinSystem {
system = "aarch64-darwin";
specialArgs = {
username = "henri.vandersleyen";
inherit inputs;
};
modules = [
Expand All @@ -81,6 +82,8 @@
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = {
username = "henri.vandersleyen";
system = "aarch64-darwin";
inherit inputs;
};
home-manager.users."henri.vandersleyen" = {
Expand Down
62 changes: 39 additions & 23 deletions nix-darwin/users/henri.vandersleyen/configuration.nix
Original file line number Diff line number Diff line change
@@ -1,39 +1,55 @@
{ pkgs, inputs, ... }:
{
pkgs,
username,
inputs,
...
}:
{
imports = [
# ./modules/services/appleTouchId.nix
];
services.nix-daemon.enable = true;
nix.settings.experimental-features = "nix-command flakes";
# Optimize storage and automatic scheduled GC running
# If you want to run GC manually, use commands:
# `nix-store --optimize` for finding and eliminating redundant copies of identical store paths
# `nix-store --gc` for optimizing the nix store and removing unreferenced and obsolete store paths
# `nix-collect-garbage -d` for deleting old generations of user profiles
nix.optimise.automatic = true;
nix.gc = {
automatic = true;
# interval = "weekly";
options = "--delete-older-than 14d";

nix = {
settings.experimental-features = "nix-command flakes";
# Optimize storage and automatic scheduled GC running
# If you want to run GC manually, use commands:
# `nix-store --optimize` for finding and eliminating redundant copies of identical store paths
# `nix-store --gc` for optimizing the nix store and removing unreferenced and obsolete store paths
# `nix-collect-garbage -d` for deleting old generations of user profiles
optimise.automatic = true;
gc = {
automatic = true;
# interval = "weekly";
options = "--delete-older-than 14d";
};
configureBuildUsers = true;
useDaemon = true;
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; # for nix.nix
};

nixpkgs = {
hostPlatform = "aarch64-darwin";
config.allowUnfree = true;
config.allowUnsupportedSystem = true;
};

services.nix-daemon.enable = true;
# system.configurationRevision = self.rev or self.dirtyRev or null;
system.stateVersion = 5;
nixpkgs.hostPlatform = "aarch64-darwin";
nixpkgs.config.allowUnfree = true;

users.users."henri.vandersleyen".home = "/Users/henri.vandersleyen";
users.users."henri.vandersleyen".shell = pkgs.nushell;
users.users.${username} = {
home = "/Users/${username}";
shell = pkgs.nushell;
};
home-manager.backupFileExtension = "backup";
nix.configureBuildUsers = true;
nix.useDaemon = true;
nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; # for nix.nix
# fonts.enableFontDir = true;
fonts.packages = with pkgs; [
jetbrains-mono
nerd-font-patcher
recursive
(nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
# nerd-font-patcher
# recursive
# (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
];

environment.variables = {
# XDG_CONFIG_HOME = "/users/henri.vandersleyen"; # issue with nushell
};
Expand Down
33 changes: 25 additions & 8 deletions nix-darwin/users/henri.vandersleyen/home.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
# home.nix
# home-manager switch

{ config, pkgs, ... }:
{
config,
username,
pkgs,
...
}:

{
imports = [
Expand Down Expand Up @@ -31,27 +36,39 @@
# ./home-modules/services/appleTouchId.nix

];
home.username = "henri.vandersleyen";
home.homeDirectory = "/Users/henri.vandersleyen";
home.stateVersion = "23.05"; # Please read the comment before changing.
# languages
python.lsp.enable = true;
jsts.lsp.enable = true;

fish.enable = true;
zsh.enable = true;
nh.flakeLocation = "/home/${username}/Documents/dotFiles/nix-darwin";
keychain.enable = true;
keychain.keys = "/home/henri/.ssh/knak";

git.userEmail = "henri-vandersleyen@protonmail.com";
git.userName = "vanderscycle";
git.signingKey = "~/.ssh/knak.pub";

home = {
username = "henri.vandersleyen";
homeDirectory = "/Users/henri.vandersleyen";
stateVersion = "23.05"; # Please read the comment before changing.
};

# Makes sense for user specific applications that shouldn't be available system-wide
home.packages = [ ];

home.file = { };

home.sessionVariables = {

# for nh
FLAKE = "~/Documents/dotFiles/nix-darwin";
};

home.sessionPath = [
"/run/current-system/sw/bin"
"$HOME/.nix-profile/bin"
];
programs.home-manager.enable = true;
# shells

# theme
catppuccin.flavor = "mocha";
Expand Down
Loading