larssonmartin1998/.dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Format flake.nix, rename local files, fix some paths

Browse source
This commit is contained in:
Martin Larsson 2025-05-11 15:18:05 +02:00
parent d32ba1b498
commit 8db7fef98b
2 changed files with 43 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

52
flake.nix
View file

@ -61,12 +61,15 @@
}: }:
let let
lib = nixpkgs.lib; lib = nixpkgs.lib;
get_pkgs = { system }: import nixpkgs {
inherit system; get_pkgs =
config = { { system }:
allowUnfree = true; import nixpkgs {
inherit system;
config = {
allowUnfree = true;
};
}; };
};
makeSystemConfig = makeSystemConfig =
{ {
@ -78,7 +81,8 @@
}: }:
let let
pkgs = get_pkgs { inherit system; }; pkgs = get_pkgs { inherit system; };
in builder { in
builder {
inherit system; inherit system;
pkgs = pkgs; pkgs = pkgs;
modules = [ modules = [
@ -86,9 +90,9 @@
nix.settings.experimental-features = "nix-command flakes"; nix.settings.experimental-features = "nix-command flakes";
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
vim vim
]; ];
} }
./nix/local_system.nix ./nix/system/local.nix
] ++ extraModules; ] ++ extraModules;
specialArgs = specialArgs; specialArgs = specialArgs;
@ -99,13 +103,15 @@
name, name,
system, system,
extraModules ? [ ], extraModules ? [ ],
}: let }:
let
pkgs = get_pkgs { inherit system; }; pkgs = get_pkgs { inherit system; };
in home-manager.lib.homeManagerConfiguration { in
home-manager.lib.homeManagerConfiguration {
pkgs = pkgs; pkgs = pkgs;
modules = [ modules = [
./nix/pkgs/home.nix ./nix/home/home.nix
./nix/local_home.nix ./nix/home/local.nix
] ++ extraModules; ] ++ extraModules;
extraSpecialArgs = { extraSpecialArgs = {
@ -133,7 +139,7 @@
extraModules = [ extraModules = [
./nix/system/linux.nix ./nix/system/linux.nix
./nix/system/linux_x86.nix ./nix/system/linux_x86.nix
]; ];
}; };
"linux-aarch" = makeSystemConfig { "linux-aarch" = makeSystemConfig {
@ -206,27 +212,33 @@
"wsl" = makeHomeConfig { "wsl" = makeHomeConfig {
name = "wsl"; name = "wsl";
system = "x86_64-linux"; system = "x86_64-linux";
extraModules = [ ./nix/pkgs/wsl.nix ]; extraModules = [ ./nix/home/wsl.nix ];
}; };
"linux-x86" = makeHomeConfig { "linux-x86" = makeHomeConfig {
name = "linux-x86"; name = "linux-x86";
system = "x86_64-linux"; system = "x86_64-linux";
extraModules = [ ./nix/pkgs/linux.nix ]; extraModules = [
./nix/home/linux.nix
./nix/home/linux_x86.nix
];
}; };
"linux-aarch" = makeHomeConfig { "linux-aarch" = makeHomeConfig {
name = "linux-aarch"; name = "linux-aarch";
system = "aarch64-linux"; system = "aarch64-linux";
extraModules = [ ./nix/pkgs/linux.nix ]; extraModules = [
./nix/home/linux.nix
./nix/home/linux_aarch.nix
];
}; };
"darwin" = makeHomeConfig { "darwin" = makeHomeConfig {
name = "darwin"; name = "darwin";
system = "aarch64-darwin"; system = "aarch64-darwin";
extraModules = [ extraModules = [
./nix/pkgs/darwin.nix ./nix/home/darwin.nix
./nix/pkgs/darwin_personal.nix ./nix/home/darwin_personal.nix
]; ];
}; };
@ -234,8 +246,8 @@
name = "work"; name = "work";
system = "aarch64-darwin"; system = "aarch64-darwin";
extraModules = [ extraModules = [
./nix/pkgs/darwin.nix ./nix/home/darwin.nix
./nix/pkgs/darwin_work.nix ./nix/home/darwin_work.nix
]; ];
}; };
}; };

10
nix/system/local.nix Normal file
View file

@ -0,0 +1,10 @@
{
...
}:
{
system = {
stateVersion = 5;
};
nix-homebrew.user = "martin.larsson";
}