updated flake structure
This commit is contained in:
parent
fdc0126f0f
commit
7cf7cd6a60
11 changed files with 59 additions and 14 deletions
|
|
@ -1,20 +1,22 @@
|
||||||
{ inputs, lib, ... }:
|
{ inputs, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|
||||||
|
## Not sure wei need the home-manager import here
|
||||||
inputs.home-manager.nixosModules.home-manager
|
inputs.home-manager.nixosModules.home-manager
|
||||||
|
|
||||||
## Semi-modularised config
|
## Semi-modularised config
|
||||||
./desktop-misc.nix # stuff that doesn't work in home-manager :(
|
|
||||||
./packages.nix # system-level packages here - needs tidying
|
./packages.nix # system-level packages here - needs tidying
|
||||||
./display.nix # declarations for display management
|
|
||||||
./gaming.nix # for gaming stuff, ideally would be in home/
|
|
||||||
./audio.nix # sound go bwuuuaaaahhhhhhhh
|
./audio.nix # sound go bwuuuaaaahhhhhhhh
|
||||||
../home/users # user-level packages here
|
../home/users # user-level packages here
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
## Crikey !
|
## Crikey !
|
||||||
time.timeZone = "Australia/Brisbane";
|
time.timeZone = "Australia/Brisbane";
|
||||||
i18n.defaultLocale = "en_GB.UTF-8";
|
i18n.defaultLocale = "en_AU.UTF-8";
|
||||||
|
|
||||||
## Genuinely dunno what these do hey, like isnt sudo
|
## Genuinely dunno what these do hey, like isnt sudo
|
||||||
## already restricted to @wheel only?
|
## already restricted to @wheel only?
|
||||||
|
|
|
||||||
15
core/modules/default.nix
Normal file
15
core/modules/default.nix
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
{ ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
|
||||||
|
imports = [
|
||||||
|
|
||||||
|
## Semi-modularised config
|
||||||
|
./jellyfin.nix
|
||||||
|
./regreet.nix
|
||||||
|
./desktop.nix # stuff that doesn't work in home-manager :(
|
||||||
|
./display.nix # declarations for display management
|
||||||
|
./gaming.nix # for gaming stuff, ideally would be in home/
|
||||||
|
];
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -1,11 +1,20 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
## Selected modules for import
|
|
||||||
./zfs.nix # zfs storage config
|
## Selected host modules for import
|
||||||
./hardware.nix # hardware config
|
./hardware.nix # hardware configuration
|
||||||
./network.nix # network/internet config
|
./network.nix # network configuration
|
||||||
|
./zfs.nix # zfs configuration
|
||||||
|
|
||||||
|
## Selected core modules for import
|
||||||
|
../../../core/modules/display.nix # display stuff
|
||||||
|
../../../core/modules/regreet.nix # regreet customisation
|
||||||
|
../../../core/modules/desktop.nix # didnt work in home-manager :(
|
||||||
|
../../../core/modules/gaming.nix # didnt work in home-manager :(
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,17 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|
||||||
## Selected modules for import
|
## Selected modules for import
|
||||||
#./zfs.nix # zfs storage config
|
|
||||||
./network.nix # network/internet config
|
./network.nix # network/internet config
|
||||||
|
|
||||||
|
## Selected core modules for import
|
||||||
|
../../../core/modules/display.nix # display stuff
|
||||||
|
../../../core/modules/regreet.nix # regreet customisation
|
||||||
|
../../../core/modules/desktop.nix # didnt work in home-manager :(
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,17 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|
||||||
## Selected modules for import
|
## Selected modules for import
|
||||||
./zfs.nix # zfs storage config
|
#./hardware.nix # hardware configuration
|
||||||
./network.nix # network/internet config
|
./network.nix # network configuration
|
||||||
|
./zfs.nix # zfs configuration
|
||||||
|
|
||||||
|
## Selected core modules for import
|
||||||
|
../../../core/modules/jellyfin.nix
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,17 @@
|
||||||
{ ... }:
|
{ ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
|
||||||
imports = [
|
imports = [
|
||||||
|
|
||||||
## Selected modules for import
|
## Selected host modules for import
|
||||||
#./disko.nix # disk/partition config
|
|
||||||
./network.nix # network/internet config
|
|
||||||
./hardware.nix # hardware configuration
|
./hardware.nix # hardware configuration
|
||||||
|
./network.nix # network configuration
|
||||||
|
|
||||||
|
## Selected core modules for import
|
||||||
|
../../../core/modules/display.nix # display stuff
|
||||||
|
../../../core/modules/regreet.nix # regreet customisation
|
||||||
|
../../../core/modules/desktop.nix # didnt work in home-manager :(
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue