Regenerated
This commit is contained in:
+285
-299
File diff suppressed because it is too large
Load Diff
+5
-19
@@ -136,17 +136,11 @@ The Nix flake definition for Droidnix.
|
|||||||
|
|
||||||
let
|
let
|
||||||
hostname = "traveldroid";
|
hostname = "traveldroid";
|
||||||
|
|
||||||
modulesPath = "${flakeRoot}/generated/modules/${hostname}";
|
modulesPath = "${flakeRoot}/generated/modules/${hostname}";
|
||||||
hostModules = import-tree modulesPath;
|
hostModules = import-tree modulesPath;
|
||||||
allModules = hostModules.imports;
|
allModules = hostModules.imports;
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
#################################
|
|
||||||
# Core system config
|
|
||||||
#################################
|
|
||||||
|
|
||||||
networking.hostName = hostname;
|
networking.hostName = hostname;
|
||||||
system.stateVersion = "26.05";
|
system.stateVersion = "26.05";
|
||||||
|
|
||||||
@@ -154,18 +148,12 @@ in
|
|||||||
# Locale
|
# Locale
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
# Ensure glibc actually builds nl_NL.UTF-8
|
|
||||||
nixpkgs.overlays = [
|
|
||||||
(self: super: {
|
|
||||||
glibcLocales = super.glibcLocales.overrideAttrs (old: {
|
|
||||||
locales = old.locales ++ [ "nl_NL.UTF-8" "en_US.UTF-8" ];
|
|
||||||
});
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
i18n = {
|
i18n = {
|
||||||
defaultLocale = "nl_NL.UTF-8";
|
defaultLocale = "nl_NL.UTF-8";
|
||||||
supportedLocales = [ "nl_NL.UTF-8" "en_US.UTF-8" ];
|
extraLocales = [
|
||||||
|
"nl_NL.UTF-8/UTF-8"
|
||||||
|
"en_US.UTF-8/UTF-8"
|
||||||
|
];
|
||||||
consoleKeyMap = "us";
|
consoleKeyMap = "us";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -181,7 +169,7 @@ in
|
|||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
]
|
]
|
||||||
++ allModules
|
++ allModules
|
||||||
++ [ home-manager.nixosModules.home-manager ]; # import HM last
|
++ [ home-manager.nixosModules.home-manager ];
|
||||||
|
|
||||||
#################################
|
#################################
|
||||||
# Home Manager integration
|
# Home Manager integration
|
||||||
@@ -190,12 +178,10 @@ in
|
|||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
|
|
||||||
# Install dconf for the system/user
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.dconf
|
pkgs.dconf
|
||||||
];
|
];
|
||||||
|
|
||||||
# Ensure Home Manager writes dconf safely
|
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
}
|
}
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|||||||
@@ -2,17 +2,11 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
hostname = "traveldroid";
|
hostname = "traveldroid";
|
||||||
|
|
||||||
modulesPath = "${flakeRoot}/generated/modules/${hostname}";
|
modulesPath = "${flakeRoot}/generated/modules/${hostname}";
|
||||||
hostModules = import-tree modulesPath;
|
hostModules = import-tree modulesPath;
|
||||||
allModules = hostModules.imports;
|
allModules = hostModules.imports;
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
#################################
|
|
||||||
# Core system config
|
|
||||||
#################################
|
|
||||||
|
|
||||||
networking.hostName = hostname;
|
networking.hostName = hostname;
|
||||||
system.stateVersion = "26.05";
|
system.stateVersion = "26.05";
|
||||||
|
|
||||||
@@ -20,18 +14,12 @@ in
|
|||||||
# Locale
|
# Locale
|
||||||
#################################
|
#################################
|
||||||
|
|
||||||
# Ensure glibc actually builds nl_NL.UTF-8
|
|
||||||
nixpkgs.overlays = [
|
|
||||||
(self: super: {
|
|
||||||
glibcLocales = super.glibcLocales.overrideAttrs (old: {
|
|
||||||
locales = old.locales ++ [ "nl_NL.UTF-8" "en_US.UTF-8" ];
|
|
||||||
});
|
|
||||||
})
|
|
||||||
];
|
|
||||||
|
|
||||||
i18n = {
|
i18n = {
|
||||||
defaultLocale = "nl_NL.UTF-8";
|
defaultLocale = "nl_NL.UTF-8";
|
||||||
supportedLocales = [ "nl_NL.UTF-8" "en_US.UTF-8" ];
|
extraLocales = [
|
||||||
|
"nl_NL.UTF-8/UTF-8"
|
||||||
|
"en_US.UTF-8/UTF-8"
|
||||||
|
];
|
||||||
consoleKeyMap = "us";
|
consoleKeyMap = "us";
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -47,7 +35,7 @@ in
|
|||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
]
|
]
|
||||||
++ allModules
|
++ allModules
|
||||||
++ [ home-manager.nixosModules.home-manager ]; # import HM last
|
++ [ home-manager.nixosModules.home-manager ];
|
||||||
|
|
||||||
#################################
|
#################################
|
||||||
# Home Manager integration
|
# Home Manager integration
|
||||||
@@ -56,11 +44,9 @@ in
|
|||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
home-manager.useUserPackages = true;
|
home-manager.useUserPackages = true;
|
||||||
|
|
||||||
# Install dconf for the system/user
|
|
||||||
environment.systemPackages = [
|
environment.systemPackages = [
|
||||||
pkgs.dconf
|
pkgs.dconf
|
||||||
];
|
];
|
||||||
|
|
||||||
# Ensure Home Manager writes dconf safely
|
|
||||||
programs.dconf.enable = true;
|
programs.dconf.enable = true;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user