kylekrein/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moved mac imports to hosts

Browse source
This commit is contained in:
Aleksandr Lebedev 2024-12-19 08:43:27 +01:00
parent 5e05a1e5c1
commit 87ef397bec
4 changed files with 15 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
flake.lock generated
View file

@ -524,11 +524,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1734563337, "lastModified": 1734573361,
"narHash": "sha256-0nOMDLi0aldc7VUfy/aBBL+4QLizccuSRG/MsBCrLQk=", "narHash": "sha256-OE3lMafu66zn71F90NFZPU7ejwdMC8JhRBjNB7wC7Tk=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "23e7d8f6a7d4e25c2dc6be33af07249570e66940", "rev": "5b714f05f87831e3e930af04649f853d5efb9902",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -860,11 +860,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1734563049, "lastModified": 1734567959,
"narHash": "sha256-P/103iUx75XPXeX21M20kzttGaZJ6+c8xp9yo3fx3Zg=", "narHash": "sha256-ghNQlnI/r6cnknY58x60695sFrYnI6ZUMg65bmoNGqw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "79a637d1962e725218ff46f5234cb3d5617ed36b", "rev": "37608b462772e35220e02bfbd9045d0946564436",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -113,9 +113,6 @@
inputs.impermanence.nixosModules.impermanence inputs.impermanence.nixosModules.impermanence
./nixos/configuration.nix ./nixos/configuration.nix
./nixos/modules/impermanence ./nixos/modules/impermanence
inputs.apple-silicon-support.nixosModules.default
./nixos/hosts/kylekrein-mac/mac-hardware-conf.nix
./nixos/hardware/macos/configuration.nix
] ++ general-modules; ] ++ general-modules;
}; };
}; };

9
nixos/home.nix
View file

@ -1,14 +1,6 @@
{ config, pkgs, stylix, hwconfig, first-nixos-install, username, inputs, ... }: { config, pkgs, stylix, hwconfig, first-nixos-install, username, inputs, ... }:
let let
#nur = import (builtins.fetchTarball {
# Get the revision by choosing a version from https://github.com/nix-community/NUR/commits/master
#url = "https://github.com/nix-community/NUR/archive/e7fee426abaf126e6bfb6c84f710f57f0e83491c.tar.gz";
# Get the hash by running `nix-prefetch-url --unpack <url>` on the above url
#sha256 = "01wx2il71dnsvviqphpdykr6h0hazf6x28ml7xrpr8fdkg1lvpjs";
#}) pkgs {};
# gruvboxPlus = import ./gruvbox-plus.nix {inherit pkgs;};
in in
{ {
imports = imports =
@ -17,7 +9,6 @@
./modules/nixvim ./modules/nixvim
./modules/fastfetch ./modules/fastfetch
./homes/${username} ./homes/${username}
#"${if hostname != "nixosbtw" then ./macos/homemac.nix else ./empty.nix }"
] ++ (if hwconfig.useImpermanence then [ (import ./modules/impermanence/home.nix { inherit username; inherit inputs; } ) ] else []); ] ++ (if hwconfig.useImpermanence then [ (import ./modules/impermanence/home.nix { inherit username; inherit inputs; } ) ] else []);
# Home Manager needs a bit of information about you and the paths it should # Home Manager needs a bit of information about you and the paths it should
# manage. # manage.

10
nixos/hosts/kylekrein-mac/default.nix
View file

@ -1,6 +1,14 @@
{ pkgs, lib, hwconfig, ... }: { pkgs, lib, hwconfig, inputs, ... }:
{ {
imports = [ imports = [
inputs.apple-silicon-support.nixosModules.default
./mac-hardware-conf.nix
../../hardware/macos/configuration.nix
../../users/kylekrein ../../users/kylekrein
]; ];
facter.reportPath = lib.mkForce null; #fails to generate
} }