martin/dot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Martin Pander
2026-07-17 13:35:25 +02:00
parent 784ea6bcea
commit 6ab4c60360
2 changed files with 33 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
flake.lock generated
View File

@@ -197,11 +197,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1784601628, "lastModified": 1784815837,
"narHash": "sha256-crcorpWHo3WxScdmuSw68QjhBt2FCSYws/uNmh1Lt1g=", "narHash": "sha256-fVBvarngVvsCS1QaKU2LSa/YmZn2l8oOkXI+EYWlURc=",
"owner": "modem-dev", "owner": "modem-dev",
"repo": "hunk", "repo": "hunk",
"rev": "b94aab6b127bc5af0faec94e0e231a4c64251acf", "rev": "b358e0c92eabaa35529d3f3d9afaad2944c825e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -254,15 +254,14 @@
"locked": { "locked": {
"lastModified": 1784500460, "lastModified": 1784500460,
"narHash": "sha256-UvORnAxTRHax7RG74W8Z2t4GvIkX6AjJ5kk0QlwZomo=", "narHash": "sha256-UvORnAxTRHax7RG74W8Z2t4GvIkX6AjJ5kk0QlwZomo=",
"owner": "LnL7", "owner": "nix-darwin",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "57a3171f94705599a2499248ca5758d5eb47c0e0", "rev": "57a3171f94705599a2499248ca5758d5eb47c0e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "LnL7", "id": "nix-darwin",
"repo": "nix-darwin", "type": "indirect"
"type": "github"
} }
}, },
"nixos-vscode-server": { "nixos-vscode-server": {

54
flake.nix
View File

@@ -24,9 +24,9 @@
inputs.nixpkgs.follows = "nixpkgs-wsl-stable"; inputs.nixpkgs.follows = "nixpkgs-wsl-stable";
}; };
nix-darwin = { # nix-darwin = {
url = "github:LnL7/nix-darwin"; # url = "github:LnL7/nix-darwin";
}; # };
# individual packages # individual packages
sops-nix = { sops-nix = {
@@ -52,11 +52,11 @@
let let
linuxSystem = "x86_64-linux"; linuxSystem = "x86_64-linux";
linuxAarchSystem = "aarch64-linux"; linuxAarchSystem = "aarch64-linux";
darwinSystem = "aarch64-darwin"; # darwinSystem = "aarch64-darwin";
pkgsLinux = nixpkgs.legacyPackages.${linuxSystem}; pkgsLinux = nixpkgs.legacyPackages.${linuxSystem};
pkgsLinuxAarch = nixpkgs.legacyPackages.${linuxAarchSystem}; pkgsLinuxAarch = nixpkgs.legacyPackages.${linuxAarchSystem};
pkgsDarwin = nixpkgs.legacyPackages.${darwinSystem}; # pkgsDarwin = nixpkgs.legacyPackages.${darwinSystem};
in in
{ {
@@ -113,17 +113,17 @@
}; };
}; };
# --- Darwin Systems (Mac) --- # # --- Darwin Systems (Mac) ---
darwinConfigurations."Martins-MacBook-Pro" = nix-darwin.lib.darwinSystem { # darwinConfigurations."Martins-MacBook-Pro" = nix-darwin.lib.darwinSystem {
specialArgs = { inherit self inputs; }; # specialArgs = { inherit self inputs; };
modules = [ # modules = [
./hosts/home/darwin/configuration.nix # ./hosts/home/darwin/configuration.nix
{ # {
nixpkgs.hostPlatform = darwinSystem; # nixpkgs.hostPlatform = darwinSystem;
} # }
]; # ];
}; # };
#
# --- Standalone Home Manager --- # --- Standalone Home Manager ---
homeConfigurations = { homeConfigurations = {
"nix@work" = home-manager.lib.homeManagerConfiguration { "nix@work" = home-manager.lib.homeManagerConfiguration {
@@ -138,17 +138,17 @@
]; ];
}; };
"nix@home" = home-manager.lib.homeManagerConfiguration { # "nix@home" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs-stable.legacyPackages.${darwinSystem}; # pkgs = nixpkgs-stable.legacyPackages.${darwinSystem};
extraSpecialArgs = { inherit self inputs; }; # extraSpecialArgs = { inherit self inputs; };
modules = [ # modules = [
./hosts/home/nix/home.nix # ./hosts/home/nix/home.nix
{ # {
nixpkgs.config.allowUnfree = true; # nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ]; # nixpkgs.overlays = [ (import ./modules/overlays/unstable.nix nixpkgs) ];
} # }
]; # ];
}; # };
}; };
}; };
} }