odie
/
nixos-combined-flake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: odie:ee8e91a43ed4b7537ec00d774c7d97cbed70b5cd
Branches Tags
odie:develop
odie:wsl
..
compare: odie:2745f32d73e9736c122c035195f8bd5b884dc3e0
Branches Tags
odie:develop
odie:wsl

No commits in common. "ee8e91a43ed4b7537ec00d774c7d97cbed70b5cd" and "2745f32d73e9736c122c035195f8bd5b884dc3e0" have entirely different histories.
ee8e91a43e ... 2745f32d73

8 changed files with 19 additions and 29 deletions
Show Stats Expand all files Collapse all files

2
modules/home-manager/binary-cache/default.nix
View File

@ -3,7 +3,7 @@ _: {
# package = pkgs.nix; # package = pkgs.nix;
settings = { settings = {
substituters = [ substituters = [
"http://nixcache.odie.home.arpa" "http://nixcache.odie.intranet"
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
"https://cache.nixos.org/" "https://cache.nixos.org/"
]; ];

4
modules/nixos/base/binary-cache/default.nix
View File

@ -3,11 +3,11 @@
nix = { nix = {
settings = { settings = {
substituters = [ substituters = [
"http://nixcache.odie.home.arpa" "http://nixcache.odie.intranet"
"https://nix-community.cachix.org" "https://nix-community.cachix.org"
]; ];
trusted-public-keys = [ trusted-public-keys = [
"nixcache.odie.home.arpa:2j5qAVmtBUSZMPWlIRS8Gn0Il9tbotJ9c2y43N0RLKU=" "nixcache.odie.intranet:2j5qAVmtBUSZMPWlIRS8Gn0Il9tbotJ9c2y43N0RLKU="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
]; ];
}; };

2
modules/nixos/base/default.nix
View File

@ -8,7 +8,7 @@
./programs ./programs
./ssh ./ssh
./power-management ./power-management
#./binary-cache ./binary-cache
]; ];
config = { config = {

5
modules/nixos/home-manager/default.nix
View File

@ -1,9 +1,6 @@
moduleInputs @ {flakeLib, inputs, ...}: let moduleInputs @ {flakeLib, ...}: let
config = flakeLib.mkHomeManagerDefaults moduleInputs; config = flakeLib.mkHomeManagerDefaults moduleInputs;
in { in {
imports = [
inputs.home-manager.nixosModules.home-manager
];
home-manager = { home-manager = {
inherit (config) extraSpecialArgs useGlobalPkgs useUserPackages; inherit (config) extraSpecialArgs useGlobalPkgs useUserPackages;
}; };

2
modules/nixos/server/default.nix
View File

@ -1,6 +1,6 @@
{ {
imports = [ imports = [
./nginx ./nginx
#./binary-cache ./binary-cache
]; ];
} }

2
modules/nixos/wsl/default.nix
View File

@ -1,4 +1,4 @@
{ config, lib, vars, inputs, ... }: { config, lib, pkgs, vars, inputs, ... }:
let let
inherit (vars) username hostName; inherit (vars) username hostName;
in in

11
profiles/home-manager/odie@wsl-dev/home.nix
View File

@ -1,11 +0,0 @@
{
outputs,
...
}: {
imports = [
outputs.homeManagerModules.base
outputs.homeManagerModules.user
outputs.homeManagerModules.shell
outputs.homeManagerModules.development
];
}

20
profiles/nixos/wsl-dev/configuration.nix
View File

@ -6,10 +6,9 @@
... ...
}: { }: {
imports = [ imports = [
#inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
outputs.nixosModules.home-manager ../../../modules/nixos/base
outputs.nixosModules.base ../../../modules/nixos/wsl
outputs.nixosModules.wsl
]; ];
wsl.enable = true; wsl.enable = true;
@ -19,11 +18,16 @@
inherit (vars) hostName domain; inherit (vars) hostName domain;
}; };
home-manager.extraSpecialArgs = { home-manager = flakeLib.mkHomeNixosModule {
inherit inputs outputs vars; inherit inputs outputs vars flakeLib;
users.${vars.username} = {
imports = [
../../../modules/home-manager/base
../../../modules/home-manager/development
../../../modules/home-manager/shell
];
};
}; };
home-manager.users = flakeLib.mkNixosHomeConfiguration {inherit vars;};
system.stateVersion = "23.11"; system.stateVersion = "23.11";
} }