Fix on new file and content

This commit is contained in:
Laurent Gueret
2026-02-11 13:23:11 +01:00
parent e75b09a750
commit 6456c71f20
5 changed files with 21 additions and 22 deletions
Generated
+4 -4
View File
@@ -110,16 +110,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770736414, "lastModified": 1767634391,
"narHash": "sha256-x5xdJgUxNflO9j2sJHIHnPujDy6eAWJPCMQml5y9XB4=", "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=",
"owner": "nix-darwin", "owner": "nix-darwin",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "7c952d9a524ffbbd5b5edca38fe6d943499585cc", "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-darwin", "owner": "nix-darwin",
"ref": "master", "ref": "nix-darwin-25.11",
"repo": "nix-darwin", "repo": "nix-darwin",
"type": "github" "type": "github"
} }
+3 -5
View File
@@ -10,7 +10,7 @@
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# Nix Darwin # Nix Darwin
nix-darwin.url = "github:nix-darwin/nix-darwin/master"; nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-25.11";
nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
# Home manager # Home manager
@@ -68,9 +68,8 @@
++ [ ++ [
(import-tree ./hosts/common) (import-tree ./hosts/common)
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
(import /hosts/nixos/overlays.nix { inherit nixpkgs nixpkgs-unstable; }) (import ./hosts/nixos/overlays.nix { inherit nixpkgs nixpkgs-unstable; })
(import-tree ./modules/home/common)
(import-tree ./modules/home/nixos) (import-tree ./modules/home/nixos)
(import-tree ./hosts/darwin/home) (import-tree ./hosts/darwin/home)
]; ];
@@ -96,9 +95,8 @@
++ [ ++ [
(import-tree ./hosts/common) (import-tree ./hosts/common)
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
(import /hosts/nixos/overlays.nix { inherit nixpkgs nixpkgs-unstable; }) (import ./hosts/nixos/overlays.nix { inherit nixpkgs nixpkgs-unstable; })
(import-tree ./modules/home/common)
(import-tree ./modules/home/darwin) (import-tree ./modules/home/darwin)
(import-tree ./hosts/darwin/home) (import-tree ./hosts/darwin/home)
]; ];
+9 -5
View File
@@ -1,16 +1,16 @@
{ ... }: { import-tree, ... }:
{ {
home-manager.users.alistreaza = { home-manager.users.alistreaza = {
imports = [
(import-tree ../../common)
];
home = { home = {
username = "alistreaza"; username = "alistreaza";
homeDirectory = /Users/alistreaza; homeDirectory = /Users/alistreaza;
}; };
# No Home Application Folders
targets.darwin.linkApps.enable = false;
targets.darwin.copyApps.enable = false;
# Apps # Apps
home.shell.zsh = true; home.shell.zsh = true;
home.shell.git = true; home.shell.git = true;
@@ -27,6 +27,10 @@
home.homebrew.keka = true; home.homebrew.keka = true;
# No Home Application Folders
targets.darwin.linkApps.enable = false;
targets.darwin.copyApps.enable = false;
# The state version is required and should stay at the version you # The state version is required and should stay at the version you
# originally installed. # originally installed.
home.stateVersion = "25.11"; home.stateVersion = "25.11";
+1 -6
View File
@@ -1,9 +1,4 @@
{ import-tree, ... }: { ... }:
{ {
imports = [
./partials/users.nix
(import-tree ./apps)
];
nixpkgs.hostPlatform = "aarch64-darwin"; nixpkgs.hostPlatform = "aarch64-darwin";
} }
@@ -3,8 +3,7 @@
home-manager.users.alistreaza = { home-manager.users.alistreaza = {
imports = [ imports = [
(import-tree ./options) (import-tree ../../common)
(import-tree ./partials)
]; ];
home = { home = {
@@ -12,6 +11,7 @@
homeDirectory = "/home/alistreaza"; homeDirectory = "/home/alistreaza";
}; };
# Apps
home.shell.zsh = true; home.shell.zsh = true;
home.shell.git = true; home.shell.git = true;
@@ -31,6 +31,8 @@
# Markdown Editor # Markdown Editor
home.editor.obsidian.enable = false; home.editor.obsidian.enable = false;
# The state version is required and should stay at the version you
# originally installed.
home.stateVersion = "25.11"; home.stateVersion = "25.11";
}; };
} }