michael/nix-dots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'main' of https://git.thomasfmly.org/michael/nix-dots

Browse Source
This commit is contained in:
Michael Thomas 2024-05-15 22:36:21 -04:00
commit 33866181e7
2 changed files with 32 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
flake.lock generated
View File

@ -10,11 +10,11 @@
"systems": "systems"
},
"locked": {
"lastModified": 1714136352,
"narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=",
"lastModified": 1715101957,
"narHash": "sha256-fs5uVQFTfgb4L9pnhldeyTHNcYwn1U4nKYoCBJ6W3W4=",
"owner": "ryantm",
"repo": "agenix",
"rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e",
"rev": "07479c2e7396acaaaac5925483498154034ea80a",
"type": "github"
},
"original": {
@ -219,11 +219,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1714267526,
"narHash": "sha256-92vUWmEZgINBgC2uT39Ihpbc/Ok86iOT2DjPrmrnFnA=",
"lastModified": 1715130616,
"narHash": "sha256-pWwzSphfGbeg/2lmfFo15b2Ykv/JtTXAWydy8dfHv9I=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "6be0c88ffc813c82a6d3c99129c5cdaed5499468",
"rev": "f0219364cbf407c76993996a9242b8eda0406b9a",
"type": "github"
},
"original": {
@ -241,11 +241,11 @@
]
},
"locked": {
"lastModified": 1714134704,
"narHash": "sha256-jgTn20s3qzar/IqhjQcEO+dIQbT4hBFIloVntiCURkA=",
"lastModified": 1715114695,
"narHash": "sha256-Pw81Wkm8RhCZr17ltsDabFpat1lRltRAszkppBmmdaI=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "4fb773cffed9bf1efdabcc01b25637eaeb4e8e9c",
"rev": "19c7ae9034389f5a7bbc6b17a7b72289c1c52272",
"type": "github"
},
"original": {
@ -272,11 +272,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1714272655,
"narHash": "sha256-3/ghIWCve93ngkx5eNPdHIKJP/pMzSr5Wc4rNKE1wOc=",
"lastModified": 1714971268,
"narHash": "sha256-IKwMSwHj9+ec660l+I4tki/1NRoeGpyA2GdtdYpAgEw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "12430e43bd9b81a6b4e79e64f87c624ade701eaf",
"rev": "27c13997bf450a01219899f5a83bd6ffbfc70d3c",
"type": "github"
},
"original": {
@ -303,11 +303,11 @@
},
"nur": {
"locked": {
"lastModified": 1714340308,
"narHash": "sha256-2uX/VxxNTvxa0FZ5yY2BZDmMCtQVocqa6wdOC8YmzDE=",
"lastModified": 1715211950,
"narHash": "sha256-//YbMDEYB9O8ugYN1nsUQUhbBDFizhdnfHzkRIoc2MM=",
"owner": "nix-community",
"repo": "NUR",
"rev": "53a8759e2675301db38ae5cc17aa9b954a936e9c",
"rev": "6580e34800c76147aa5d61cf598123f0de72971c",
"type": "github"
},
"original": {
@ -337,11 +337,11 @@
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1714270637,
"narHash": "sha256-sq/0YEupY9yoRpg9ft8r2sjoRo84MQipionTuk4w1YI=",
"lastModified": 1715134005,
"narHash": "sha256-oujsCgNiQnZoQntNkkNkA7BhCmUvf9FLWj+2oGT2Jvc=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "44f8738f4b9805f7c60118c48f85da835839311a",
"rev": "a8bfc2569a1965c0da8711d289d973f0011b441a",
"type": "github"
},
"original": {
@ -442,11 +442,11 @@
},
"unstable": {
"locked": {
"lastModified": 1714253743,
"narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=",
"lastModified": 1715087517,
"narHash": "sha256-CLU5Tsg24Ke4+7sH8azHWXKd0CFd4mhLWfhYgUiDBpQ=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994",
"rev": "b211b392b8486ee79df6cdfb1157ad2133427a29",
"type": "github"
},
"original": {

35
flake.nix
View File

@ -73,19 +73,6 @@
};
nixosConfigurations = {
loft = nixpkgs.lib.nixosSystem {
system = utils.lib.system.x86_64-linux;
modules =
defaultModules
++ [
./modules/common.nix
./modules/containers.nix
./machines/loft/configuration.nix
];
specialArgs = {inherit inputs;};
};
kitchen = nixpkgs.lib.nixosSystem {
system = utils.lib.system.x86_64-linux;
modules =
@ -198,18 +185,18 @@
mac = darwin.lib.darwinSystem {
system = "aarch64-darwin";
specialArgs = {inherit inputs;};
modules =
defaultModules
++ [
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.michael = import ./user/environments/mac/home.nix;
}
modules = [
self.overlaysModule
home-manager.darwinModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.michael = import ./user/environments/mac/home.nix;
}
./modules/yabai.nix
./machines/mac/configuration.nix
];
./modules/yabai.nix
./machines/mac/configuration.nix
];
};
};