mjallen/nix-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

darwin updates

Browse Source
This commit is contained in:
mjallen18
2025-10-23 20:33:53 -05:00
parent b77f2a3c45
commit 57c5926dac
7 changed files with 55 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
flake.lock generated
View File

@@ -497,23 +497,6 @@
"type": "github"
}
},
"home-manager_3": {
"inputs": {
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1760295538,
"narHash": "sha256-SgnrSgyWj2ezIftKRpf+C6AdYqTkXN4iJA+JRQtdjrk=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "904fa32d77609f281ef32d5209926d81848b687a",
"type": "github"
},
"original": {
"id": "home-manager",
"type": "indirect"
}
},
"homebrew-cask": {
"flake": false,
"locked": {
@@ -755,28 +738,9 @@
"type": "github"
}
},
"nix-plist-manager": {
"inputs": {
"home-manager": "home-manager_3",
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1760306020,
"narHash": "sha256-g3DprDmL6QEiYv49ISB3d86Gn/Au9WaHHRHP5DvqO/g=",
"owner": "sushydev",
"repo": "nix-plist-manager",
"rev": "aa9ffa8b7ce07d398f98543dae527ba28d4902d7",
"type": "github"
},
"original": {
"owner": "sushydev",
"repo": "nix-plist-manager",
"type": "github"
}
},
"nix-vscode-extensions": {
"inputs": {
"nixpkgs": "nixpkgs_9"
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1761098495,
@@ -795,7 +759,7 @@
"nixai": {
"inputs": {
"flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_10"
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1755942173,
@@ -814,7 +778,7 @@
"nixos-apple-silicon": {
"inputs": {
"flake-compat": "flake-compat_4",
"nixpkgs": "nixpkgs_11"
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1760946398,
@@ -877,7 +841,7 @@
"argononed": "argononed",
"flake-compat": "flake-compat_5",
"nixos-images": "nixos-images",
"nixpkgs": "nixpkgs_12"
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1760627567,
@@ -973,38 +937,6 @@
}
},
"nixpkgs_10": {
"locked": {
"lastModified": 1751271578,
"narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_11": {
"locked": {
"lastModified": 1760878510,
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_12": {
"locked": {
"lastModified": 1760455578,
"narHash": "sha256-qWdXMNF/wSVsRSIIFE3GMtaIzwlCbgqNPGPPzz/OZNk=",
@@ -1020,7 +952,7 @@
"type": "github"
}
},
"nixpkgs_13": {
"nixpkgs_11": {
"locked": {
"lastModified": 1761164809,
"narHash": "sha256-3uM91Lx9WZomE6MMEBorJyEyBNiHWRIxza/GganDxew=",
@@ -1036,7 +968,7 @@
"type": "github"
}
},
"nixpkgs_14": {
"nixpkgs_12": {
"locked": {
"lastModified": 1759070547,
"narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=",
@@ -1052,7 +984,7 @@
"type": "github"
}
},
"nixpkgs_15": {
"nixpkgs_13": {
"locked": {
"lastModified": 1760596604,
"narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
@@ -1149,38 +1081,6 @@
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1759831965,
"narHash": "sha256-vgPm2xjOmKdZ0xKA6yLXPJpjOtQPHfaZDRtH+47XEBo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c9b6fb798541223bbb396d287d16f43520250518",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1757068644,
"narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1759770925,
"narHash": "sha256-CZwkCtzTNclqlhuwDsVtGoRumTpqCUK0xSnFIMgd8ls=",
@@ -1196,6 +1096,38 @@
"type": "github"
}
},
"nixpkgs_8": {
"locked": {
"lastModified": 1751271578,
"narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_9": {
"locked": {
"lastModified": 1760878510,
"narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"pre-commit-hooks-nix": {
"inputs": {
"flake-compat": [
@@ -1227,7 +1159,7 @@
"inputs": {
"flake-compat": "flake-compat_6",
"gitignore": "gitignore_2",
"nixpkgs": "nixpkgs_14"
"nixpkgs": "nixpkgs_12"
},
"locked": {
"lastModified": 1760663237,
@@ -1309,13 +1241,12 @@
"lsfg-vk": "lsfg-vk",
"nix-homebrew": "nix-homebrew",
"nix-index-database": "nix-index-database",
"nix-plist-manager": "nix-plist-manager",
"nix-vscode-extensions": "nix-vscode-extensions",
"nixai": "nixai",
"nixos-apple-silicon": "nixos-apple-silicon",
"nixos-hardware": "nixos-hardware",
"nixos-raspberrypi": "nixos-raspberrypi",
"nixpkgs": "nixpkgs_13",
"nixpkgs": "nixpkgs_11",
"nixpkgs-stable": "nixpkgs-stable_3",
"pre-commit-hooks-nix": "pre-commit-hooks-nix_2",
"snowfall-lib": "snowfall-lib",
@@ -1411,7 +1342,7 @@
},
"sops-nix": {
"inputs": {
"nixpkgs": "nixpkgs_15"
"nixpkgs": "nixpkgs_13"
},
"locked": {
"lastModified": 1760998189,

4
flake.nix
View File

@@ -85,7 +85,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
nix-plist-manager.url = "github:sushydev/nix-plist-manager";
# nix-plist-manager.url = "github:sushydev/nix-plist-manager";
};
# We will handle this in the next section.
@@ -117,7 +117,7 @@
modules.darwin = with inputs; [
nix-homebrew.darwinModules.nix-homebrew
home-manager.darwinModules.home-manager
nix-plist-manager.darwinModules.default
# nix-plist-manager.darwinModules.default
];
# Host config

4
homes/aarch64-darwin/mattjallen@macbook-pro/default.nix
View File

@@ -31,7 +31,7 @@ in
homeDirectory = "/Users/mattjallen";
packages = lib.mkForce packages;
sessionVariables = {
NH_DARWIN_FLAKE = "${home.homeDirectory}/nix-config";
NH_DARWIN_FLAKE = lib.mkForce "/Users/mattjallen/nix-config";
};
};
@@ -49,7 +49,7 @@ in
mangohud.enable = lib.mkForce false;
nh = {
flake = "${home.homeDirectory}/nix-config";
flake = lib.mkForce "/Users/mattjallen/nix-config";
};
};

2
modules/home/home/default.nix
View File

@@ -2,7 +2,7 @@
config,
lib,
pkgs,
hasDestopEnvironment,
hasDestopEnvironment ? true,
...
}:
{

2
modules/home/programs/code/default.nix
View File

@@ -3,7 +3,7 @@
pkgs,
system,
namespace,
hasDestopEnvironment,
hasDestopEnvironment ? true,
...
}:
let

7
modules/home/programs/onlyoffice/default.nix
View File

@@ -1,4 +1,9 @@
{ lib, system, hasDestopEnvironment, ... }:
{
lib,
system,
hasDestopEnvironment ? true,
...
}:
let
isArm = builtins.match "aarch64*" system != null;
in

2
systems/aarch64-darwin/macbook-pro/default.nix
View File

@@ -14,7 +14,7 @@
# $ nix-env -qaP | grep wget
environment = {
variables = {
NH_OS_FLAKE = "nix-config";
NH_OS_FLAKE = "/Users/mattjallen/nix-config";
};
systemPackages = with pkgs; [
asitop